trunk/gcc220/vcs_diff_scripts.patch results

File details

./trunk/gcc220/vcs_diff_scripts.patch 2026-11-09-15:00

Used binaries

Binaries version

> uname -a
OpenBSD cfarm220.cfarm.net 8.0 GENERIC.MP#2 amd64

Full file content

 
diff --git a/scripts/check-all-rtl.sh b/scripts/check-all-rtl.sh
index bc3d73f..29ae781 100755
--- a/scripts/check-all-rtl.sh
+++ b/scripts/check-all-rtl.sh
@@ -921,6 +921,10 @@ elif [ "X$machine_host" == "Xgcc220" ] ; then
   ULIMIT_TIME=2500
   REPORT_ULIMIT=1
   TRUNK_FPMAKEOPT="-T 4"
+  # cron job limits memory to 1Gb o that machine
+  # This leads to native cycle failure
+  # remove -gl option to try to cycle successfully
+  NO_GL_CYCLE_OPT=1
 ## gcc430 is a x86_64-freebsd VM
 elif [ "X$machine_host" == "Xgcc430" ] ; then
   set_home_bindir_first=1
@@ -2085,14 +2089,19 @@ function start_script ()
       $MV -f "$cyclelog" "${cyclelog}.prev"
     fi
     mecho "Recompiling native compiler"
-    mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
-    ${MAKE} distclean cycle OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA > $cyclelog 2>&1
+    if [ "${NO_GL_CYCLE_OPT:-0}" == "0" ] ; then
+      GL_OPT="-gl"
+    else
+      GL_OPT=""
+    fi
+    mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
+    ${MAKE} distclean cycle OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA > $cyclelog 2>&1
     makeres=$?
     mecho ", res=$makeres"
     if [ $makeres -eq 0 ] ; then
       # installsymlink requires the new version as FPC variable to
       # avoid having a lib/fpc/releaseversion/ directory instead of lib/fpc/fpcversion
-      ${MAKE} installsymlink FPC=`pwd`/$FPC OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
+      ${MAKE} installsymlink FPC=`pwd`/$FPC OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
       makeres=$?
     fi
     if [ $makeres -ne 0 ] ; then
@@ -2100,20 +2109,20 @@ function start_script ()
       RELEASE_FPC="$INSTALLRELEASEDIR/bin/$FPC"
       if [ -f "$RELEASE_FPC" ] ; then
         mecho "Second try for native compiler, using release FPC=\"$RELEASE_FPC\""
-        mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
-        ${MAKE} distclean cycle OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=$RELEASE_FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
+        mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
+        ${MAKE} distclean cycle OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=$RELEASE_FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
 
         makeres=$?
 	mecho ", res=$makeres"
         if [ $makeres -eq 0 ] ; then
-          ${MAKE} installsymlink OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=`pwd`/$FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
+          ${MAKE} installsymlink OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=`pwd`/$FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
           makeres=$?
         fi
       elif [ -n "${RECOMPILE_FULL_OPT_O:-}" ] ;then
         mecho "iSecond attempt to eecompiling native compiler, after resetting RECOMPILE_FULL_OPT_O"
         RECOMPILE_FULL_OPT_O=""
-        mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
-        ${MAKE} distclean cycle OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
+        mecho -n "${MAKE} distclean cycle installsymlink OPT=\"-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
+        ${MAKE} distclean cycle OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $cyclelog 2>&1
         makeres=$?
         mecho ", res=$makeres"
       else
@@ -2134,14 +2143,14 @@ function start_script ()
       $MV -f "$fullcyclelog" "${fullcyclelog}.prev"
     fi
     if [ $COMPILE_EACH_CPU -eq 0 ]; then
-      mecho -n "Recompiling cross-compilers, using OPT=\"-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
-      ${MAKE} rtlclean rtl fullinstallsymlink OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=$LOCAL_INSTALL_PREFIX/bin/$FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA > $fullcyclelog 2>&1
+      mecho -n "Recompiling cross-compilers, using OPT=\"-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
+      ${MAKE} rtlclean rtl fullinstallsymlink OPT="-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=$LOCAL_INSTALL_PREFIX/bin/$FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA > $fullcyclelog 2>&1
       makeres=$?
       mecho ", res=$makeres"
       if [ $makeres -ne 0 ] ; then
-        mecho "Generating all cross-compilers, using OPT=\"-n -gl ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" failed, makeres=$makeres, see $fullcyclelog for details"
+        mecho "Generating all cross-compilers, using OPT=\"-n ${GL_OPT} ${RECOMPILE_FULL_OPT} ${RECOMPILE_FULL_OPT_O}\" failed, makeres=$makeres, see $fullcyclelog for details"
         RECOMPILE_FULL_OPT_O=""
-        mecho -n "Second try for cross-compilers, using OPT=\"-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} -O-\" $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
+        mecho -n "Second try for cross-compilers, using OPT=\"-n ${GL_OPT} ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} -O-\" $ECHO_COMPILER_COMPILATION_MAKE_EXTRA"
         ${MAKE} rtlclean rtl fullinstallsymlink OPT="-n -gl ${NATIVE_OPT} ${RECOMPILE_FULL_OPT} -O-" INSTALL_PREFIX=$LOCAL_INSTALL_PREFIX FPC=$LOCAL_INSTALL_PREFIX/bin/$FPC BINUTILSPREFIX=$NATIVE_BINUTILSPREFIX $COMPILER_COMPILATION_MAKE_EXTRA >> $fullcyclelog 2>&1
         makeres=$?
 	mecho ", res=$makeres"