cvs commit: patches/gcc gcc-3.5-posix-1.patch

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Fri May 21 22:26:19 PDT 2004


tushar      04/05/21 23:26:19

  Added:       gcc      gcc-3.5-posix-1.patch
  Log:
  Added: gcc/gcc-3.5-posix-1.patch
  
  Revision  Changes    Path
  1.1                  patches/gcc/gcc-3.5-posix-1.patch
  
  Index: gcc-3.5-posix-1.patch
  ===================================================================
  Submitted By: Uwe Düffert (lfs at uwe-dueffert dot de)
  Date: 2004-05-16
  Initial Package Version: 3.4.0
  Origin: Jim Gifford (3.4.0), adapted to 3.5 (http://www.uwe-dueffert.de/lfs/ownpatches/gcc-3.5-20040502-posix-1.patch)
  Upstream Status: not reported
  Description: use POSIX head and tail syntax
   
  diff -Naur gcc-3.5-20040502.orig/ChangeLog gcc-3.5-20040502/ChangeLog
  --- gcc-3.5-20040502.orig/ChangeLog	2004-05-16 14:45:27.000000000 +0000
  +++ gcc-3.5-20040502/ChangeLog	2004-05-16 14:51:15.516547824 +0000
  @@ -9840,7 +9840,7 @@
   	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
   	(all-cygnus, native, build-cygnus): Make
   	$(canonhost)-stamp-3stage-done, not $(host)....
  -	* test-build.mk (stamp-3stage-compared): Use tail +10c for
  +	* test-build.mk (stamp-3stage-compared): Use tail -c +10 for
   	i386-sco3.2v4.  Added else true to if command.
   
   Mon Dec 28 12:08:56 1992  Ken Raeburn  (raeburn at cygnus.com)
  diff -Naur gcc-3.5-20040502.orig/config/acx.m4 gcc-3.5-20040502/config/acx.m4
  --- gcc-3.5-20040502.orig/config/acx.m4	2004-05-16 14:45:29.000000000 +0000
  +++ gcc-3.5-20040502/config/acx.m4	2004-05-16 14:51:43.843241512 +0000
  @@ -204,7 +204,7 @@
   [AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
   [ echo abfoo >t1
     echo cdfoo >t2
  -  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
  +  gcc_cv_prog_cmp_skip='tail -c +16 $$f1 > tmp-foo1; tail -c +16 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
     if cmp t1 t2 2 2 > /dev/null 2>&1; then
       if cmp t1 t2 1 1 > /dev/null 2>&1; then
         :
  diff -Naur gcc-3.5-20040502.orig/configure gcc-3.5-20040502/configure
  --- gcc-3.5-20040502.orig/configure	2004-05-16 14:45:27.000000000 +0000
  +++ gcc-3.5-20040502/configure	2004-05-16 14:52:14.760541368 +0000
  @@ -2183,7 +2183,7 @@
   else
      echo abfoo >t1
     echo cdfoo >t2
  -  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
  +  gcc_cv_prog_cmp_skip='tail -c +16 $$f1 > tmp-foo1; tail -c +16 $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
     if cmp t1 t2 2 2 > /dev/null 2>&1; then
       if cmp t1 t2 1 1 > /dev/null 2>&1; then
         :
  diff -Naur gcc-3.5-20040502.orig/contrib/test_summary gcc-3.5-20040502/contrib/test_summary
  --- gcc-3.5-20040502.orig/contrib/test_summary	2004-05-16 14:45:29.000000000 +0000
  +++ gcc-3.5-20040502/contrib/test_summary	2004-05-16 14:46:59.936401912 +0000
  @@ -106,7 +106,7 @@
       srcdir = configflags;
       sub(/\/configure .*/, "", srcdir);
       printf "LAST_UPDATED: ";
  -    system("tail -1 " srcdir "/LAST_UPDATED");
  +    system("tail -n 1 " srcdir "/LAST_UPDATED");
       print "";
   
       sub(/^[^ ]*\/configure */, " ", configflags);
  diff -Naur gcc-3.5-20040502.orig/gcc/Makefile.in gcc-3.5-20040502/gcc/Makefile.in
  --- gcc-3.5-20040502.orig/gcc/Makefile.in	2004-05-16 14:44:48.000000000 +0000
  +++ gcc-3.5-20040502/gcc/Makefile.in	2004-05-16 14:52:49.716227296 +0000
  @@ -3587,8 +3587,8 @@
   	    for file in $$dir/*$(objext); do \
   	      case "$@" in \
   		slowcompare* ) \
  -		  tail +16c ./$$file > tmp-foo1; \
  -		  tail +16c stage$$stage/$$file > tmp-foo2 \
  +		  tail -c +16 ./$$file > tmp-foo1; \
  +		  tail -c +16 stage$$stage/$$file > tmp-foo2 \
   		    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
   		  ;; \
   		fastcompare* ) \
  diff -Naur gcc-3.5-20040502.orig/gcc/configure gcc-3.5-20040502/gcc/configure
  --- gcc-3.5-20040502.orig/gcc/configure	2004-05-16 14:44:50.000000000 +0000
  +++ gcc-3.5-20040502/gcc/configure	2004-05-16 14:47:00.062382760 +0000
  @@ -10798,7 +10798,7 @@
     # and we got the correct data, then succeed.
     if test x$gcc_cv_objdump != x \
     && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
  -     | tail -3 > conftest.got \
  +     | tail -n 3 > conftest.got \
     && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
       || cmp conftest.big conftest.got > /dev/null 2>&1; }
     then
  diff -Naur gcc-3.5-20040502.orig/gcc/configure.ac gcc-3.5-20040502/gcc/configure.ac
  --- gcc-3.5-20040502.orig/gcc/configure.ac	2004-05-16 14:44:50.000000000 +0000
  +++ gcc-3.5-20040502/gcc/configure.ac	2004-05-16 14:47:00.447324240 +0000
  @@ -2141,7 +2141,7 @@
     # and we got the correct data, then succeed.
     if test x$gcc_cv_objdump != x \
     && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
  -     | tail -3 > conftest.got \
  +     | tail -n 3 > conftest.got \
     && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
       || cmp conftest.big conftest.got > /dev/null 2>&1; }
     then
  diff -Naur gcc-3.5-20040502.orig/gcc/testsuite/ada/acats/run_all.sh gcc-3.5-20040502/gcc/testsuite/ada/acats/run_all.sh
  --- gcc-3.5-20040502.orig/gcc/testsuite/ada/acats/run_all.sh	2004-05-16 14:45:04.000000000 +0000
  +++ gcc-3.5-20040502/gcc/testsuite/ada/acats/run_all.sh	2004-05-16 14:55:09.000000000 +0000
  @@ -229,7 +229,7 @@
         ls ${i}?.adb > ${i}.lst 2> /dev/null
         ls ${i}*m.adb >> ${i}.lst 2> /dev/null
         ls ${i}.adb >> ${i}.lst 2> /dev/null
  -      main=`tail -1 ${i}.lst`
  +      main=`tail -n 1 ${i}.lst`
         binmain=`echo $main | sed -e 's/\(.*\)\..*/\1/g'`
         echo "BUILD $main" >> $dir/acats.log
         EXTERNAL_OBJECTS=""
  diff -Naur gcc-3.5-20040502.orig/libjava/acinclude.m4 gcc-3.5-20040502/libjava/acinclude.m4
  --- gcc-3.5-20040502.orig/libjava/acinclude.m4	2004-05-16 14:45:34.000000000 +0000
  +++ gcc-3.5-20040502/libjava/acinclude.m4	2004-05-16 14:47:00.000000000 +0000
  @@ -250,8 +250,8 @@
   AC_MSG_CHECKING(whether 'ld' is at least 2.13)
   LD_PROG=`$CC --print-prog-name=ld`
   LD_VERSION=`$LD_PROG --version`
  -LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  -LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
  +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
   if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
     LD_OK="ok"
   else
  diff -Naur gcc-3.5-20040502.orig/libjava/aclocal.m4 gcc-3.5-20040502/libjava/aclocal.m4
  --- gcc-3.5-20040502.orig/libjava/aclocal.m4	2004-05-16 14:45:34.000000000 +0000
  +++ gcc-3.5-20040502/libjava/aclocal.m4	2004-05-16 14:47:00.000000000 +0000
  @@ -262,8 +262,8 @@
   AC_MSG_CHECKING(whether 'ld' is at least 2.13)
   LD_PROG=`$CC --print-prog-name=ld`
   LD_VERSION=`$LD_PROG --version`
  -LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  -LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
  +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
   if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
     LD_OK="ok"
   else
  diff -Naur gcc-3.5-20040502.orig/libjava/configure gcc-3.5-20040502/libjava/configure
  --- gcc-3.5-20040502.orig/libjava/configure	2004-05-16 14:45:34.000000000 +0000
  +++ gcc-3.5-20040502/libjava/configure	2004-05-16 14:47:00.000000000 +0000
  @@ -3005,8 +3005,8 @@
   echo "configure:3006: checking whether 'ld' is at least 2.13" >&5
   LD_PROG=`$CC --print-prog-name=ld`
   LD_VERSION=`$LD_PROG --version`
  -LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  -LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
  +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
  +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
   if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
     LD_OK="ok"
   else
  diff -Naur gcc-3.5-20040502.orig/libstdc++-v3/acinclude.m4 gcc-3.5-20040502/libstdc++-v3/acinclude.m4
  --- gcc-3.5-20040502.orig/libstdc++-v3/acinclude.m4	2004-05-16 14:45:52.000000000 +0000
  +++ gcc-3.5-20040502/libstdc++-v3/acinclude.m4	2004-05-16 14:48:12.000000000 +0000
  @@ -273,7 +273,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
     changequote(,)
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
     changequote([,])
     glibcxx_gnu_ld_version=`echo $ldver | \
  diff -Naur gcc-3.5-20040502.orig/libstdc++-v3/configure gcc-3.5-20040502/libstdc++-v3/configure
  --- gcc-3.5-20040502.orig/libstdc++-v3/configure	2004-05-16 14:45:52.000000000 +0000
  +++ gcc-3.5-20040502/libstdc++-v3/configure	2004-05-16 14:47:50.000000000 +0000
  @@ -8280,7 +8280,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -53795,7 +53795,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -56163,7 +56163,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -58404,7 +58404,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -61244,7 +61244,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -63441,7 +63441,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -65529,7 +65529,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  @@ -69580,7 +69580,7 @@
     # Start by getting the version number.  I think the libtool test already
     # does some of this, but throws away the result.
   
  -  ldver=`$LD --version 2>/dev/null | head -1 | \
  +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
            sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
     glibcxx_gnu_ld_version=`echo $ldver | \
  diff -Naur gcc-3.5-20040502.orig/libstdc++-v3/scripts/check_survey.in gcc-3.5-20040502/libstdc++-v3/scripts/check_survey.in
  --- gcc-3.5-20040502.orig/libstdc++-v3/scripts/check_survey.in	2004-05-16 14:45:58.000000000 +0000
  +++ gcc-3.5-20040502/libstdc++-v3/scripts/check_survey.in	2004-05-16 14:47:00.000000000 +0000
  @@ -182,9 +182,9 @@
       function size_command()
       {
         case $1 in
  -        TEXT)  TEXT=$(size -B $EXENAME | tail -1 | awk '{print $1}')  ;;
  -        DATA)  DATA=$(size -B $EXENAME | tail -1 | awk '{print $2}')  ;;
  -        SIZE)  SIZE=$(size -B $EXENAME | tail -1 | awk '{print $4}')  ;;
  +        TEXT)  TEXT=$(size -B $EXENAME | tail -n 1 | awk '{print $1}')  ;;
  +        DATA)  DATA=$(size -B $EXENAME | tail -n 1 | awk '{print $2}')  ;;
  +        SIZE)  SIZE=$(size -B $EXENAME | tail -n 1 | awk '{print $4}')  ;;
         esac
       }
     else
  diff -Naur gcc-3.5-20040502.orig/ltcf-c.sh gcc-3.5-20040502/ltcf-c.sh
  --- gcc-3.5-20040502.orig/ltcf-c.sh	2004-05-16 14:45:28.000000000 +0000
  +++ gcc-3.5-20040502/ltcf-c.sh	2004-05-16 14:47:00.000000000 +0000
  @@ -153,7 +153,7 @@
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is.
       # If DATA tags from a recent dlltool are present, honour them!
  -    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  +    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
           cp $export_symbols $output_objdir/$soname-def;
         else
           echo EXPORTS > $output_objdir/$soname-def;
  diff -Naur gcc-3.5-20040502.orig/ltcf-gcj.sh gcc-3.5-20040502/ltcf-gcj.sh
  --- gcc-3.5-20040502.orig/ltcf-gcj.sh	2004-05-16 14:45:28.000000000 +0000
  +++ gcc-3.5-20040502/ltcf-gcj.sh	2004-05-16 14:47:00.000000000 +0000
  @@ -156,7 +156,7 @@
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is.
       # If DATA tags from a recent dlltool are present, honour them!
  -    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  +    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
           cp $export_symbols $output_objdir/$soname-def;
         else
           echo EXPORTS > $output_objdir/$soname-def;
  
  
  



More information about the patches mailing list