Changeset 0804c00
- Timestamp:
- Jan 25, 2009, 9:06:18 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 49073ef
- Parents:
- 5ec7db05
- Files:
-
- 1 deleted
- 2 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/gcc-4.3.3-posix-1.patch
r5ec7db05 r0804c00 1 Submitted By: J oe Ciccone <jciccone@gmail.com>2 Date: 2008-08-243 Initial Package Version: 4. 1.21 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 4 4 Origin: Jim Gifford 5 5 Rediffed against 4.1.0 by Chris Staub … … 7 7 Rediffed and additions against 4.2.0 by Joe Ciccone 8 8 Rediffed against 4.3.0 by Joe Ciccone 9 Rediffed against 4.3.3 by Jim Gifford 9 10 Upstream Status: On Hold 10 11 Description: Makes GCC Posix Compliant 11 12 12 diff -Naur gcc-4.3. 1.orig/contrib/patch_tester.sh gcc-4.3.1/contrib/patch_tester.sh13 --- gcc-4.3. 1.orig/contrib/patch_tester.sh 2007-12-26 16:01:38.000000000 -050014 +++ gcc-4.3. 1/contrib/patch_tester.sh 2008-08-24 13:37:11.000000000 -040013 diff -Naur gcc-4.3.3.orig/contrib/patch_tester.sh gcc-4.3.3/contrib/patch_tester.sh 14 --- gcc-4.3.3.orig/contrib/patch_tester.sh 2007-12-26 13:01:38.000000000 -0800 15 +++ gcc-4.3.3/contrib/patch_tester.sh 2009-01-25 00:53:32.447636261 -0800 15 16 @@ -287,7 +287,7 @@ 16 17 … … 40 41 sleep ${standby}m 41 42 else 42 diff -Naur gcc-4.3. 1.orig/contrib/test_summary gcc-4.3.1/contrib/test_summary43 --- gcc-4.3. 1.orig/contrib/test_summary 2007-02-09 19:30:46.000000000 -050044 +++ gcc-4.3. 1/contrib/test_summary 2008-08-24 13:37:11.000000000 -040043 diff -Naur gcc-4.3.3.orig/contrib/test_summary gcc-4.3.3/contrib/test_summary 44 --- gcc-4.3.3.orig/contrib/test_summary 2007-02-09 16:30:46.000000000 -0800 45 +++ gcc-4.3.3/contrib/test_summary 2009-01-25 00:53:32.447636261 -0800 45 46 @@ -107,7 +107,7 @@ 46 47 srcdir = configflags; … … 52 53 53 54 sub(/^[^ ]*\/configure */, " ", configflags); 54 diff -Naur gcc-4.3. 1.orig/gcc/configure gcc-4.3.1/gcc/configure55 --- gcc-4.3. 1.orig/gcc/configure 2008-05-21 04:54:15.000000000 -040056 +++ gcc-4.3. 1/gcc/configure 2008-08-24 13:37:38.000000000 -040057 @@ - 14265,7 +14265,7 @@55 diff -Naur gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure 56 --- gcc-4.3.3.orig/gcc/configure 2008-08-01 02:51:03.000000000 -0700 57 +++ gcc-4.3.3/gcc/configure 2009-01-25 00:53:32.455839362 -0800 58 @@ -20245,7 +20245,7 @@ 58 59 # Therefore, use diff -b for the comparisons. 59 60 if test x$gcc_cv_objdump != x \ … … 64 65 || diff -b conftest.big conftest.got > /dev/null 2>&1; } 65 66 then 66 diff -Naur gcc-4.3. 1.orig/gcc/configure.ac gcc-4.3.1/gcc/configure.ac67 --- gcc-4.3. 1.orig/gcc/configure.ac 2008-05-21 04:54:15.000000000 -040068 +++ gcc-4.3. 1/gcc/configure.ac 2008-08-24 13:37:25.000000000 -040069 @@ -22 26,7 +2226,7 @@67 diff -Naur gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac 68 --- gcc-4.3.3.orig/gcc/configure.ac 2008-08-01 02:51:03.000000000 -0700 69 +++ gcc-4.3.3/gcc/configure.ac 2009-01-25 00:53:32.455839362 -0800 70 @@ -2241,7 +2241,7 @@ 70 71 # Therefore, use diff -b for the comparisons. 71 72 if test x$gcc_cv_objdump != x \ … … 76 77 || diff -b conftest.big conftest.got > /dev/null 2>&1; } 77 78 then 78 diff -Naur gcc-4.3.1.orig/gcc/gccbug.in gcc-4.3.1/gcc/gccbug.in 79 --- gcc-4.3.1.orig/gcc/gccbug.in 2007-07-26 04:37:01.000000000 -0400 80 +++ gcc-4.3.1/gcc/gccbug.in 2008-08-24 13:37:38.000000000 -0400 81 @@ -31,7 +31,7 @@ 82 83 # The default release for this host. 84 # We have to guess at what program_transform_name might have done. 85 -# "sed 1q" because neither "head -1" nor "head -n 1" is universal, argh. 86 +# "sed 1q" because neither "head -n 1" nor "head -n n 1" is universal, argh. 87 88 DEFAULT_GCC="`echo $0 | sed -e 's/bug//'`" 89 DEFAULT_RELEASE="`$DEFAULT_GCC --version | sed 1q`" 90 diff -Naur gcc-4.3.1.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.3.1/gcc/testsuite/ada/acats/run_all.sh 91 --- gcc-4.3.1.orig/gcc/testsuite/ada/acats/run_all.sh 2006-09-14 06:12:03.000000000 -0400 92 +++ gcc-4.3.1/gcc/testsuite/ada/acats/run_all.sh 2008-08-24 13:37:18.000000000 -0400 79 diff -Naur gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh 80 --- gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh 2006-09-14 03:12:03.000000000 -0700 81 +++ gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh 2009-01-25 00:53:32.459940773 -0800 93 82 @@ -68,7 +68,7 @@ 94 83 ls ${i}?.adb > ${i}.lst 2> /dev/null … … 100 89 101 90 EXTERNAL_OBJECTS="" 102 diff -Naur gcc-4.3. 1.orig/libgomp/acinclude.m4 gcc-4.3.1/libgomp/acinclude.m4103 --- gcc-4.3. 1.orig/libgomp/acinclude.m4 2007-03-18 07:17:44.000000000 -0400104 +++ gcc-4.3. 1/libgomp/acinclude.m4 2008-08-24 13:37:09.000000000 -040091 diff -Naur gcc-4.3.3.orig/libgomp/acinclude.m4 gcc-4.3.3/libgomp/acinclude.m4 92 --- gcc-4.3.3.orig/libgomp/acinclude.m4 2007-03-18 04:17:44.000000000 -0700 93 +++ gcc-4.3.3/libgomp/acinclude.m4 2009-01-25 00:53:32.459940773 -0800 105 94 @@ -147,7 +147,7 @@ 106 95 # Start by getting the version number. I think the libtool test already … … 112 101 changequote([,]) 113 102 libgomp_gnu_ld_version=`echo $ldver | \ 114 diff -Naur gcc-4.3. 1.orig/libgomp/configure gcc-4.3.1/libgomp/configure115 --- gcc-4.3. 1.orig/libgomp/configure 2008-01-24 11:23:13.000000000 -0500116 +++ gcc-4.3. 1/libgomp/configure 2008-08-24 13:37:09.000000000 -0400103 diff -Naur gcc-4.3.3.orig/libgomp/configure gcc-4.3.3/libgomp/configure 104 --- gcc-4.3.3.orig/libgomp/configure 2008-01-24 08:23:13.000000000 -0800 105 +++ gcc-4.3.3/libgomp/configure 2009-01-25 00:53:32.464042184 -0800 117 106 @@ -17600,7 +17600,7 @@ 118 107 # Start by getting the version number. I think the libtool test already … … 124 113 125 114 libgomp_gnu_ld_version=`echo $ldver | \ 126 diff -Naur gcc-4.3.1.orig/libjava/classpath/ChangeLog-2004 gcc-4.3.1/libjava/classpath/ChangeLog-2004 127 --- gcc-4.3.1.orig/libjava/classpath/ChangeLog-2004 2007-01-09 14:58:05.000000000 -0500 128 +++ gcc-4.3.1/libjava/classpath/ChangeLog-2004 2008-08-24 13:37:00.000000000 -0400 129 @@ -8256,7 +8256,7 @@ 130 131 2004-08-17 Casey Marshall <csm@gnu.org> 132 133 - * autogen.sh: use `head -n 1' instead of `head -1'. 134 + * autogen.sh: use `head -n n 1' instead of `head -n 1'. 135 136 2004-08-16 Andrew John Hughes <gnu_andrew@member.fsf.org> 137 138 diff -Naur gcc-4.3.1.orig/libjava/classpath/configure gcc-4.3.1/libjava/classpath/configure 139 --- gcc-4.3.1.orig/libjava/classpath/configure 2008-02-29 18:47:54.000000000 -0500 140 +++ gcc-4.3.1/libjava/classpath/configure 2008-08-24 13:37:00.000000000 -0400 115 diff -Naur gcc-4.3.3.orig/libjava/classpath/configure gcc-4.3.3/libjava/classpath/configure 116 --- gcc-4.3.3.orig/libjava/classpath/configure 2008-02-29 15:47:54.000000000 -0800 117 +++ gcc-4.3.3/libjava/classpath/configure 2009-01-25 00:53:32.480448386 -0800 141 118 @@ -29126,7 +29126,7 @@ 142 119 fi # shortcircut to system "stdint.h" … … 148 125 ac_cv_stdint_message="using $CC" 149 126 fi 150 diff -Naur gcc-4.3. 1.orig/libjava/classpath/ltcf-c.sh gcc-4.3.1/libjava/classpath/ltcf-c.sh151 --- gcc-4.3. 1.orig/libjava/classpath/ltcf-c.sh 2006-01-17 13:09:40.000000000 -0500152 +++ gcc-4.3. 1/libjava/classpath/ltcf-c.sh 2008-08-24 13:36:57.000000000 -0400127 diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh gcc-4.3.3/libjava/classpath/ltcf-c.sh 128 --- gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh 2006-01-17 10:09:40.000000000 -0800 129 +++ gcc-4.3.3/libjava/classpath/ltcf-c.sh 2009-01-25 00:53:32.484550356 -0800 153 130 @@ -153,7 +153,7 @@ 154 131 # If the export-symbols file already is a .def file (1st line … … 160 137 else 161 138 echo EXPORTS > $output_objdir/$soname-def; 162 diff -Naur gcc-4.3. 1.orig/libjava/classpath/ltcf-gcj.sh gcc-4.3.1/libjava/classpath/ltcf-gcj.sh163 --- gcc-4.3. 1.orig/libjava/classpath/ltcf-gcj.sh 2005-09-23 17:31:04.000000000 -0400164 +++ gcc-4.3. 1/libjava/classpath/ltcf-gcj.sh 2008-08-24 13:36:55.000000000 -0400139 diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh gcc-4.3.3/libjava/classpath/ltcf-gcj.sh 140 --- gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh 2005-09-23 14:31:04.000000000 -0700 141 +++ gcc-4.3.3/libjava/classpath/ltcf-gcj.sh 2009-01-25 00:53:32.484550356 -0800 165 142 @@ -156,7 +156,7 @@ 166 143 # If the export-symbols file already is a .def file (1st line … … 172 149 else 173 150 echo EXPORTS > $output_objdir/$soname-def; 174 diff -Naur gcc-4.3. 1.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.3.1/libjava/classpath/m4/ax_create_stdint_h.m4175 --- gcc-4.3. 1.orig/libjava/classpath/m4/ax_create_stdint_h.m4 2007-05-19 16:44:43.000000000 -0400176 +++ gcc-4.3. 1/libjava/classpath/m4/ax_create_stdint_h.m4 2008-08-24 13:36:57.000000000 -0400151 diff -Naur gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4 152 --- gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4 2007-05-19 13:44:43.000000000 -0700 153 +++ gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4 2009-01-25 00:53:32.484550356 -0800 177 154 @@ -217,7 +217,7 @@ 178 155 fi # shortcircut to system "stdint.h" … … 184 161 ac_cv_stdint_message="using $CC" 185 162 fi 186 diff -Naur gcc-4.3. 1.orig/libjava/configure gcc-4.3.1/libjava/configure187 --- gcc-4.3. 1.orig/libjava/configure 2008-06-06 10:49:11.000000000 -0400188 +++ gcc-4.3. 1/libjava/configure 2008-08-24 13:37:03.000000000 -0400163 diff -Naur gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure 164 --- gcc-4.3.3.orig/libjava/configure 2009-01-24 02:32:29.000000000 -0800 165 +++ gcc-4.3.3/libjava/configure 2009-01-25 00:53:32.492753177 -0800 189 166 @@ -18673,8 +18673,8 @@ 190 167 echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6 … … 198 175 LD_OK="ok" 199 176 else 200 diff -Naur gcc-4.3. 1.orig/libjava/mingwld.m4 gcc-4.3.1/libjava/mingwld.m4201 --- gcc-4.3. 1.orig/libjava/mingwld.m4 2005-08-22 18:36:35.000000000 -0400202 +++ gcc-4.3. 1/libjava/mingwld.m4 2008-08-24 13:36:52.000000000 -0400177 diff -Naur gcc-4.3.3.orig/libjava/mingwld.m4 gcc-4.3.3/libjava/mingwld.m4 178 --- gcc-4.3.3.orig/libjava/mingwld.m4 2005-08-22 15:36:35.000000000 -0700 179 +++ gcc-4.3.3/libjava/mingwld.m4 2009-01-25 00:53:32.492753177 -0800 203 180 @@ -3,8 +3,8 @@ 204 181 AC_MSG_CHECKING(whether 'ld' is at least 2.13) … … 212 189 LD_OK="ok" 213 190 else 214 diff -Naur gcc-4.3. 1.orig/libstdc++-v3/acinclude.m4 gcc-4.3.1/libstdc++-v3/acinclude.m4215 --- gcc-4.3. 1.orig/libstdc++-v3/acinclude.m4 2008-04-25 12:52:57.000000000 -0400216 +++ gcc-4.3. 1/libstdc++-v3/acinclude.m4 2008-08-24 13:37:07.000000000 -0400191 diff -Naur gcc-4.3.3.orig/libstdc++-v3/acinclude.m4 gcc-4.3.3/libstdc++-v3/acinclude.m4 192 --- gcc-4.3.3.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700 193 +++ gcc-4.3.3/libstdc++-v3/acinclude.m4 2009-01-25 00:53:32.500956558 -0800 217 194 @@ -234,7 +234,7 @@ 218 195 if test x"$with_gnu_ld" = x"yes"; then … … 224 201 changequote([,]) 225 202 glibcxx_gnu_ld_version=`echo $ldver | \ 226 diff -Naur gcc-4.3. 1.orig/libstdc++-v3/configure gcc-4.3.1/libstdc++-v3/configure227 --- gcc-4.3. 1.orig/libstdc++-v3/configure 2008-04-25 12:52:57.000000000 -0400228 +++ gcc-4.3. 1/libstdc++-v3/configure 2008-08-24 13:37:09.000000000 -0400229 @@ -174 88,7 +17488,7 @@230 echo "$as_me:$LINENO: checking for ld version" >&5 231 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 232 233 - ldver=`$LD --version 2>/dev/null | head -1 | \ 234 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 235 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 236 237 glibcxx_gnu_ld_version=`echo $ldver | \ 238 @@ -4221 3,7 +42213,7 @@239 echo "$as_me:$LINENO: checking for ld version" >&5 240 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 241 242 - ldver=`$LD --version 2>/dev/null | head -1 | \ 243 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 244 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 245 246 glibcxx_gnu_ld_version=`echo $ldver | \ 247 @@ -8460 4,7 +84604,7 @@248 echo "$as_me:$LINENO: checking for ld version" >&5 249 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 250 251 - ldver=`$LD --version 2>/dev/null | head -1 | \ 252 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 253 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 254 255 glibcxx_gnu_ld_version=`echo $ldver | \ 256 @@ -8562 0,7 +85620,7 @@257 echo "$as_me:$LINENO: checking for ld version" >&5 258 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 259 260 - ldver=`$LD --version 2>/dev/null | head -1 | \ 261 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 262 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 263 264 glibcxx_gnu_ld_version=`echo $ldver | \ 265 @@ -866 08,7 +86608,7 @@266 echo "$as_me:$LINENO: checking for ld version" >&5 267 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 268 269 - ldver=`$LD --version 2>/dev/null | head -1 | \ 270 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 271 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 272 273 glibcxx_gnu_ld_version=`echo $ldver | \ 274 @@ -10908 7,7 +109087,7 @@275 echo "$as_me:$LINENO: checking for ld version" >&5 276 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 277 278 - ldver=`$LD --version 2>/dev/null | head -1 | \ 279 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 280 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 281 282 glibcxx_gnu_ld_version=`echo $ldver | \ 283 @@ -10993 2,7 +109932,7 @@284 echo "$as_me:$LINENO: checking for ld version" >&5 285 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 286 287 - ldver=`$LD --version 2>/dev/null | head -1 | \ 288 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 289 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 290 291 glibcxx_gnu_ld_version=`echo $ldver | \ 292 @@ -11082 6,7 +110826,7 @@293 echo "$as_me:$LINENO: checking for ld version" >&5 294 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 295 296 - ldver=`$LD --version 2>/dev/null | head -1 | \ 297 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 298 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 299 300 glibcxx_gnu_ld_version=`echo $ldver | \ 301 @@ -11211 2,7 +112112,7 @@302 echo "$as_me:$LINENO: checking for ld version" >&5 303 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 304 305 - ldver=`$LD --version 2>/dev/null | head -1 | \ 306 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 307 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 308 309 glibcxx_gnu_ld_version=`echo $ldver | \ 310 @@ -1128 48,7 +112848,7 @@311 echo "$as_me:$LINENO: checking for ld version" >&5 312 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 313 314 - ldver=`$LD --version 2>/dev/null | head -1 | \ 315 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 316 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 317 318 glibcxx_gnu_ld_version=`echo $ldver | \ 319 @@ -1133 49,7 +113349,7 @@320 echo "$as_me:$LINENO: checking for ld version" >&5 321 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 322 323 - ldver=`$LD --version 2>/dev/null | head -1 | \ 324 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 325 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 326 327 glibcxx_gnu_ld_version=`echo $ldver | \ 203 diff -Naur gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure 204 --- gcc-4.3.3.orig/libstdc++-v3/configure 2008-07-07 12:49:54.000000000 -0700 205 +++ gcc-4.3.3/libstdc++-v3/configure 2009-01-25 00:53:32.582987288 -0800 206 @@ -17490,7 +17490,7 @@ 207 echo "$as_me:$LINENO: checking for ld version" >&5 208 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 209 210 - ldver=`$LD --version 2>/dev/null | head -1 | \ 211 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 212 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 213 214 glibcxx_gnu_ld_version=`echo $ldver | \ 215 @@ -42215,7 +42215,7 @@ 216 echo "$as_me:$LINENO: checking for ld version" >&5 217 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 218 219 - ldver=`$LD --version 2>/dev/null | head -1 | \ 220 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 221 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 222 223 glibcxx_gnu_ld_version=`echo $ldver | \ 224 @@ -84606,7 +84606,7 @@ 225 echo "$as_me:$LINENO: checking for ld version" >&5 226 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 227 228 - ldver=`$LD --version 2>/dev/null | head -1 | \ 229 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 230 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 231 232 glibcxx_gnu_ld_version=`echo $ldver | \ 233 @@ -85622,7 +85622,7 @@ 234 echo "$as_me:$LINENO: checking for ld version" >&5 235 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 236 237 - ldver=`$LD --version 2>/dev/null | head -1 | \ 238 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 239 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 240 241 glibcxx_gnu_ld_version=`echo $ldver | \ 242 @@ -86610,7 +86610,7 @@ 243 echo "$as_me:$LINENO: checking for ld version" >&5 244 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 245 246 - ldver=`$LD --version 2>/dev/null | head -1 | \ 247 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 248 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 249 250 glibcxx_gnu_ld_version=`echo $ldver | \ 251 @@ -109089,7 +109089,7 @@ 252 echo "$as_me:$LINENO: checking for ld version" >&5 253 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 254 255 - ldver=`$LD --version 2>/dev/null | head -1 | \ 256 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 257 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 258 259 glibcxx_gnu_ld_version=`echo $ldver | \ 260 @@ -109934,7 +109934,7 @@ 261 echo "$as_me:$LINENO: checking for ld version" >&5 262 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 263 264 - ldver=`$LD --version 2>/dev/null | head -1 | \ 265 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 266 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 267 268 glibcxx_gnu_ld_version=`echo $ldver | \ 269 @@ -110828,7 +110828,7 @@ 270 echo "$as_me:$LINENO: checking for ld version" >&5 271 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 272 273 - ldver=`$LD --version 2>/dev/null | head -1 | \ 274 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 275 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 276 277 glibcxx_gnu_ld_version=`echo $ldver | \ 278 @@ -112114,7 +112114,7 @@ 279 echo "$as_me:$LINENO: checking for ld version" >&5 280 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 281 282 - ldver=`$LD --version 2>/dev/null | head -1 | \ 283 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 284 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 285 286 glibcxx_gnu_ld_version=`echo $ldver | \ 287 @@ -112850,7 +112850,7 @@ 288 echo "$as_me:$LINENO: checking for ld version" >&5 289 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 290 291 - ldver=`$LD --version 2>/dev/null | head -1 | \ 292 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 293 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 294 295 glibcxx_gnu_ld_version=`echo $ldver | \ 296 @@ -113351,7 +113351,7 @@ 297 echo "$as_me:$LINENO: checking for ld version" >&5 298 echo $ECHO_N "checking for ld version... $ECHO_C" >&6 299 300 - ldver=`$LD --version 2>/dev/null | head -1 | \ 301 + ldver=`$LD --version 2>/dev/null | head -n 1 | \ 302 sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'` 303 304 glibcxx_gnu_ld_version=`echo $ldver | \ -
patches/gcc-4.3.3-pure64-1.patch
r5ec7db05 r0804c00 1 diff -Naur gcc-4.3.1.orig/gcc/config/i386/linux64.h gcc-4.3.1/gcc/config/i386/linux64.h 2 --- gcc-4.3.1.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400 3 +++ gcc-4.3.1/gcc/config/i386/linux64.h 2008-08-24 13:43:19.000000000 -0400 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 5 the Pure LFS project. 6 Upstream Status: Not Applied 7 Description: This patch modifies the location of the dynamic linker for gcc-4.3.3. 8 9 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h 10 --- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700 11 +++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:49:04.956938399 -0800 4 12 @@ -53,8 +53,8 @@ 5 13 When the -shared link option is used a final link is not being … … 13 21 #if TARGET_64BIT_DEFAULT 14 22 #define SPEC_32 "m32" 15 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/t-linux64 gcc-4.3.1/gcc/config/i386/t-linux6416 --- gcc-4.3. 1.orig/gcc/config/i386/t-linux64 2007-09-27 15:56:06.000000000 -040017 +++ gcc-4.3. 1/gcc/config/i386/t-linux64 2008-08-24 13:43:19.000000000 -040023 diff -Naur gcc-4.3.3.orig/gcc/config/i386/t-linux64 gcc-4.3.3/gcc/config/i386/t-linux64 24 --- gcc-4.3.3.orig/gcc/config/i386/t-linux64 2007-09-27 12:56:06.000000000 -0700 25 +++ gcc-4.3.3/gcc/config/i386/t-linux64 2009-01-25 00:49:11.211799413 -0800 18 26 @@ -13,7 +13,7 @@ 19 27 … … 21 29 MULTILIB_DIRNAMES = 64 32 22 30 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 23 +MULTILIB_OSDIRNAMES 31 +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 24 32 25 33 LIBGCC = stmp-multilib 26 34 INSTALL_LIBGCC = install-multilib 27 diff -Naur gcc-4.3.1.orig/gcc/config/mips/linux64.h gcc-4.3.1/gcc/config/mips/linux64.h 28 --- gcc-4.3.1.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400 29 +++ gcc-4.3.1/gcc/config/mips/linux64.h 2008-08-24 13:43:19.000000000 -0400 35 diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h 36 --- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700 37 +++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:49:09.037979047 -0800 38 @@ -113,7 +113,7 @@ 39 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 40 supporting both 32-bit and 64-bit compilation. */ 41 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 42 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 43 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 44 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 45 #define LINUX_DYNAMIC_LINKER \ 46 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) 47 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h 48 --- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700 49 +++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:49:09.124111188 -0800 30 50 @@ -38,10 +38,10 @@ 31 51 %{!shared: \ … … 43 63 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 44 64 45 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/t-linux64 gcc-4.3.1/gcc/config/mips/t-linux6446 --- gcc-4.3. 1.orig/gcc/config/mips/t-linux64 2006-06-06 08:51:24.000000000 -040047 +++ gcc-4.3. 1/gcc/config/mips/t-linux64 2008-08-24 13:43:19.000000000 -040065 diff -Naur gcc-4.3.3.orig/gcc/config/mips/t-linux64 gcc-4.3.3/gcc/config/mips/t-linux64 66 --- gcc-4.3.3.orig/gcc/config/mips/t-linux64 2006-06-06 05:51:24.000000000 -0700 67 +++ gcc-4.3.3/gcc/config/mips/t-linux64 2009-01-25 00:49:11.265119430 -0800 48 68 @@ -1,6 +1,6 @@ 49 69 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 … … 54 74 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o 55 75 56 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h gcc-4.3.1/gcc/config/rs6000/linux64.h57 --- gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -040058 +++ gcc-4.3. 1/gcc/config/rs6000/linux64.h 2008-08-24 13:43:19.000000000 -040059 @@ -339, 8 +339,8@@76 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h 77 --- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700 78 +++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:49:01.265542673 -0800 79 @@ -339,9 +339,9 @@ 60 80 #undef LINK_OS_DEFAULT_SPEC 61 81 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" … … 63 83 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 64 84 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" 85 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 65 86 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 66 87 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 67 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"88 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 68 89 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 69 90 #if UCLIBC_DEFAULT 70 diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 gcc-4.3.1/gcc/config/rs6000/t-linux64 71 --- gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400 72 +++ gcc-4.3.1/gcc/config/rs6000/t-linux64 2008-08-24 13:43:19.000000000 -0400 91 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 92 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 gcc-4.3.3/gcc/config/rs6000/t-linux64 93 --- gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 2007-09-27 12:56:06.000000000 -0700 94 +++ gcc-4.3.3/gcc/config/rs6000/t-linux64 2009-01-25 00:49:11.137970107 -0800 73 95 @@ -19,7 +19,7 @@ 74 96 MULTILIB_EXTRA_OPTS = fPIC mstrict-align … … 80 102 81 103 softfp_wrap_start := '\#ifndef __powerpc64__' 82 diff -Naur gcc-4.3.1.orig/gcc/config/s390/t-linux64 gcc-4.3.1/gcc/config/s390/t-linux64 83 --- gcc-4.3.1.orig/gcc/config/s390/t-linux64 2006-02-06 12:41:54.000000000 -0500 84 +++ gcc-4.3.1/gcc/config/s390/t-linux64 2008-08-24 13:43:19.000000000 -0400 104 diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h 105 --- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 106 +++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:49:04.058697303 -0800 107 @@ -72,7 +72,7 @@ 108 #define MULTILIB_DEFAULTS { "m31" } 109 #endif 110 111 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 112 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 113 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 114 115 #undef LINK_SPEC 116 diff -Naur gcc-4.3.3.orig/gcc/config/s390/t-linux64 gcc-4.3.3/gcc/config/s390/t-linux64 117 --- gcc-4.3.3.orig/gcc/config/s390/t-linux64 2006-02-06 09:41:54.000000000 -0800 118 +++ gcc-4.3.3/gcc/config/s390/t-linux64 2009-01-25 00:49:11.178985891 -0800 85 119 @@ -1,6 +1,6 @@ 86 120 MULTILIB_OPTIONS = m64/m31 … … 91 125 LIBGCC = stmp-multilib 92 126 INSTALL_LIBGCC = install-multilib 93 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux64.h gcc-4.3.1/gcc/config/sparc/linux64.h94 --- gcc-4.3. 1.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -040095 +++ gcc-4.3. 1/gcc/config/sparc/linux64.h 2008-08-24 13:43:19.000000000 -040096 @@ -144, 8 +144,8@@127 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h 128 --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 129 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:49:10.604768822 -0800 130 @@ -144,9 +144,9 @@ 97 131 98 132 /* If ELF is the default format, we should not use /lib/elf. */ … … 100 134 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" 101 135 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" 136 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 102 137 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 103 138 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" 104 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"139 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 105 140 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 106 141 #if UCLIBC_DEFAULT 142 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 107 143 @@ -167,7 +167,7 @@ 108 144 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ … … 132 168 %{!ibcs: \ 133 169 %{!static: \ 134 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux.h gcc-4.3.1/gcc/config/sparc/linux.h135 --- gcc-4.3. 1.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400136 +++ gcc-4.3. 1/gcc/config/sparc/linux.h 2008-08-24 13:43:19.000000000 -0400170 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h 171 --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 172 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:49:10.863168878 -0800 137 173 @@ -132,7 +132,7 @@ 138 174 … … 144 180 %{!shared: \ 145 181 %{!ibcs: \ 146 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/t-linux64 gcc-4.3.1/gcc/config/sparc/t-linux64147 --- gcc-4.3. 1.orig/gcc/config/sparc/t-linux64 2006-02-08 02:19:43.000000000 -0500148 +++ gcc-4.3. 1/gcc/config/sparc/t-linux64 2008-08-24 13:43:19.000000000 -0400182 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/t-linux64 gcc-4.3.3/gcc/config/sparc/t-linux64 183 --- gcc-4.3.3.orig/gcc/config/sparc/t-linux64 2006-02-07 23:19:43.000000000 -0800 184 +++ gcc-4.3.3/gcc/config/sparc/t-linux64 2009-01-25 00:49:11.314338874 -0800 149 185 @@ -1,6 +1,6 @@ 150 186 MULTILIB_OPTIONS = m64/m32 … … 155 191 LIBGCC = stmp-multilib 156 192 INSTALL_LIBGCC = install-multilib 157 @@ -10,4 +10,4 @@158 159 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \160 -print-multi-os-directory) \161 - = x../lib64; then echo -mcmodel=medany; fi`162 + = x../lib; then echo -mcmodel=medany; fi` -
patches/gcc-4.3.3-pure64_specs-1.patch
r5ec7db05 r0804c00 1 Submitted By: Joe Ciccone <jciccone@gmail.com> 2 Date: 2008-08-24 3 Initial Package Version: 4.1.2 4 Upstream Status: Not Sent - LFS Specific 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 5 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 6 5 the Pure LFS project. 7 More architectures added by Zack Winkles. 8 Further fine tunings by Greg Schafer. 9 Rediffed against gcc 4.0.0 by Robert Connolly. 10 Rediffed against gcc 4.1.0 by Chris Staub 11 Rediffed against gcc 4.1.2 by Jim Gifford 12 Rediffed against gcc 4.2.0 by Joe Ciccone 13 Rediffed against gcc 4.3.1 by Joe Ciccone 14 Description: This patch modifies the location of the dynamic linker for 15 the GCC Pass 2 build in LFS Chapter 5. 6 Upstream Status: Not Applied 7 Description: This patch modifies the location of the dynamic linker for gcc-4.3.3. 16 8 17 diff -Naur gcc-4.3. 1.orig/gcc/config/alpha/gnu.h gcc-4.3.1/gcc/config/alpha/gnu.h18 --- gcc-4.3. 1.orig/gcc/config/alpha/gnu.h 2004-09-07 20:17:19.000000000 -040019 +++ gcc-4.3. 1/gcc/config/alpha/gnu.h 2008-08-24 13:51:46.000000000 -04009 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h 10 --- gcc-4.3.3.orig/gcc/config/alpha/gnu.h 2004-09-07 17:17:19.000000000 -0700 11 +++ gcc-4.3.3/gcc/config/alpha/gnu.h 2009-01-25 00:46:43.363275038 -0800 20 12 @@ -11,7 +11,7 @@ 21 13 } while (0) … … 27 19 #undef STARTFILE_SPEC 28 20 #define STARTFILE_SPEC \ 29 diff -Naur gcc-4.3. 1.orig/gcc/config/alpha/linux-elf.h gcc-4.3.1/gcc/config/alpha/linux-elf.h30 --- gcc-4.3. 1.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -040031 +++ gcc-4.3. 1/gcc/config/alpha/linux-elf.h 2008-08-24 13:51:46.000000000 -040021 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h 22 --- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700 23 +++ gcc-4.3.3/gcc/config/alpha/linux-elf.h 2009-01-25 00:46:43.506828048 -0800 32 24 @@ -27,8 +27,8 @@ 33 25 #define EXTRA_SPECS \ … … 41 33 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 42 34 #else 43 diff -Naur gcc-4.3. 1.orig/gcc/config/arm/linux-eabi.h gcc-4.3.1/gcc/config/arm/linux-eabi.h44 --- gcc-4.3. 1.orig/gcc/config/arm/linux-eabi.h 2007-11-08 08:44:09.000000000 -050045 +++ gcc-4.3. 1/gcc/config/arm/linux-eabi.h 2008-08-24 13:52:56.000000000 -040035 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h 36 --- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h 2007-11-08 05:44:09.000000000 -0800 37 +++ gcc-4.3.3/gcc/config/arm/linux-eabi.h 2009-01-25 00:46:48.034939237 -0800 46 38 @@ -61,7 +61,7 @@ 47 39 /* Use ld-linux.so.3 so that it will be possible to run "classic" … … 53 45 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to 54 46 use the GNU/Linux version, not the generic BPABI version. */ 55 diff -Naur gcc-4.3. 1.orig/gcc/config/arm/linux-elf.h gcc-4.3.1/gcc/config/arm/linux-elf.h56 --- gcc-4.3. 1.orig/gcc/config/arm/linux-elf.h 2007-11-08 08:44:09.000000000 -050057 +++ gcc-4.3. 1/gcc/config/arm/linux-elf.h 2008-08-24 13:51:46.000000000 -040047 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h 48 --- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 49 +++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-25 00:46:47.747830702 -0800 58 50 @@ -62,7 +62,7 @@ 59 51 … … 65 57 #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \ 66 58 %{b} \ 67 diff -Naur gcc-4.3.1.orig/gcc/config/cris/linux.h gcc-4.3.1/gcc/config/cris/linux.h 68 --- gcc-4.3.1.orig/gcc/config/cris/linux.h 2008-01-23 12:17:58.000000000 -0500 69 +++ gcc-4.3.1/gcc/config/cris/linux.h 2008-08-24 13:51:46.000000000 -0400 59 diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h 60 --- gcc-4.3.3.orig/gcc/config/bfin/linux.h 2007-09-05 17:09:05.000000000 -0700 61 +++ gcc-4.3.3/gcc/config/bfin/linux.h 2009-01-25 00:46:40.418363458 -0800 62 @@ -22,7 +22,7 @@ 63 %{shared:-G -Bdynamic} \ 64 %{!shared: %{!static: \ 65 %{rdynamic:-export-dynamic} \ 66 - %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \ 67 + %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \ 68 %{static}} -init __init -fini __fini" 69 70 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" 71 diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h 72 --- gcc-4.3.3.orig/gcc/config/cris/linux.h 2008-01-23 09:17:58.000000000 -0800 73 +++ gcc-4.3.3/gcc/config/cris/linux.h 2009-01-25 00:46:38.092783349 -0800 70 74 @@ -102,7 +102,7 @@ 71 75 #undef CRIS_DEFAULT_CPU_VERSION … … 77 81 /* We need an -rpath-link to ld.so.1, and presumably to each directory 78 82 specified with -B. */ 79 diff -Naur gcc-4.3. 1.orig/gcc/config/frv/linux.h gcc-4.3.1/gcc/config/frv/linux.h80 --- gcc-4.3. 1.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -040081 +++ gcc-4.3. 1/gcc/config/frv/linux.h 2008-08-24 13:51:46.000000000 -040083 diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h 84 --- gcc-4.3.3.orig/gcc/config/frv/linux.h 2007-08-02 03:49:31.000000000 -0700 85 +++ gcc-4.3.3/gcc/config/frv/linux.h 2009-01-25 00:46:37.813879592 -0800 82 86 @@ -35,7 +35,7 @@ 83 87 #define ENDFILE_SPEC \ … … 89 93 #undef LINK_SPEC 90 94 #define LINK_SPEC "\ 91 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/gnu.h gcc-4.3.1/gcc/config/i386/gnu.h92 --- gcc-4.3. 1.orig/gcc/config/i386/gnu.h 2007-08-08 02:35:17.000000000 -040093 +++ gcc-4.3. 1/gcc/config/i386/gnu.h 2008-08-24 13:51:46.000000000 -040095 diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h 96 --- gcc-4.3.3.orig/gcc/config/i386/gnu.h 2007-08-07 23:35:17.000000000 -0700 97 +++ gcc-4.3.3/gcc/config/i386/gnu.h 2009-01-25 00:46:40.849024165 -0800 94 98 @@ -22,7 +22,7 @@ 95 99 %{!shared: \ … … 101 105 102 106 #undef STARTFILE_SPEC 103 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/linux64.h gcc-4.3.1/gcc/config/i386/linux64.h104 --- gcc-4.3. 1.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400105 +++ gcc-4.3. 1/gcc/config/i386/linux64.h 2008-08-24 13:51:46.000000000 -0400107 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h 108 --- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700 109 +++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:46:40.578323788 -0800 106 110 @@ -53,8 +53,8 @@ 107 111 When the -shared link option is used a final link is not being … … 115 119 #if TARGET_64BIT_DEFAULT 116 120 #define SPEC_32 "m32" 117 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/linux.h gcc-4.3.1/gcc/config/i386/linux.h118 --- gcc-4.3. 1.orig/gcc/config/i386/linux.h 2007-11-27 20:04:27.000000000 -0500119 +++ gcc-4.3. 1/gcc/config/i386/linux.h 2008-08-24 13:51:46.000000000 -0400121 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h 122 --- gcc-4.3.3.orig/gcc/config/i386/linux.h 2007-11-27 17:04:27.000000000 -0800 123 +++ gcc-4.3.3/gcc/config/i386/linux.h 2009-01-25 00:46:42.161519765 -0800 120 124 @@ -100,7 +100,7 @@ 121 125 … … 127 131 #undef SUBTARGET_EXTRA_SPECS 128 132 #define SUBTARGET_EXTRA_SPECS \ 129 diff -Naur gcc-4.3. 1.orig/gcc/config/ia64/linux.h gcc-4.3.1/gcc/config/ia64/linux.h130 --- gcc-4.3. 1.orig/gcc/config/ia64/linux.h 2006-12-12 10:15:19.000000000 -0500131 +++ gcc-4.3. 1/gcc/config/ia64/linux.h 2008-08-24 13:51:46.000000000 -0400133 diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h 134 --- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 07:15:19.000000000 -0800 135 +++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-25 00:46:43.236127392 -0800 132 136 @@ -37,7 +37,7 @@ 133 137 /* Define this for shared library support because it isn't in the main … … 139 143 #undef LINK_SPEC 140 144 #define LINK_SPEC "\ 141 diff -Naur gcc-4.3. 1.orig/gcc/config/linux.h gcc-4.3.1/gcc/config/linux.h142 --- gcc-4.3. 1.orig/gcc/config/linux.h 2007-08-02 06:49:31.000000000 -0400143 +++ gcc-4.3. 1/gcc/config/linux.h 2008-08-24 13:51:46.000000000 -0400145 diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h 146 --- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700 147 +++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:46:46.090803184 -0800 144 148 @@ -112,9 +112,9 @@ 145 149 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or … … 150 154 -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 151 155 +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" 152 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"156 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 153 157 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 154 158 #define LINUX_DYNAMIC_LINKER \ 155 159 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) 156 160 #define LINUX_DYNAMIC_LINKER32 \ 157 @@ -130,3 +130,7 @@ 158 #define TARGET_HAS_SINCOS (OPTION_GLIBC) 159 160 #define TARGET_POSIX_IO 161 + 162 +/* Remove /usr/include from the end of the include search path. */ 163 +#undef STANDARD_INCLUDE_DIR 164 +#define STANDARD_INCLUDE_DIR 0 165 diff -Naur gcc-4.3.1.orig/gcc/config/m32r/linux.h gcc-4.3.1/gcc/config/m32r/linux.h 166 --- gcc-4.3.1.orig/gcc/config/m32r/linux.h 2007-08-02 06:49:31.000000000 -0400 167 +++ gcc-4.3.1/gcc/config/m32r/linux.h 2008-08-24 13:51:46.000000000 -0400 161 diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h 162 --- gcc-4.3.3.orig/gcc/config/m32r/linux.h 2007-08-02 03:49:31.000000000 -0700 163 +++ gcc-4.3.3/gcc/config/m32r/linux.h 2009-01-25 00:46:40.180472971 -0800 168 164 @@ -58,7 +58,7 @@ 169 165 … … 175 171 #undef LINK_SPEC 176 172 #if TARGET_LITTLE_ENDIAN 177 diff -Naur gcc-4.3. 1.orig/gcc/config/m68k/linux.h gcc-4.3.1/gcc/config/m68k/linux.h178 --- gcc-4.3. 1.orig/gcc/config/m68k/linux.h 2007-09-24 17:07:08.000000000 -0400179 +++ gcc-4.3. 1/gcc/config/m68k/linux.h 2008-08-24 13:51:46.000000000 -0400173 diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h 174 --- gcc-4.3.3.orig/gcc/config/m68k/linux.h 2007-09-24 14:07:08.000000000 -0700 175 +++ gcc-4.3.3/gcc/config/m68k/linux.h 2009-01-25 00:46:38.769538482 -0800 180 176 @@ -84,7 +84,7 @@ 181 177 … … 187 183 #undef LINK_SPEC 188 184 #define LINK_SPEC "-m m68kelf %{shared} \ 189 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/linux64.h gcc-4.3.1/gcc/config/mips/linux64.h190 --- gcc-4.3. 1.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400191 +++ gcc-4.3. 1/gcc/config/mips/linux64.h 2008-08-24 13:51:46.000000000 -0400185 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h 186 --- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700 187 +++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:46:46.197444615 -0800 192 188 @@ -38,10 +38,10 @@ 193 189 %{!shared: \ … … 205 201 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 206 202 207 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/linux.h gcc-4.3.1/gcc/config/mips/linux.h208 --- gcc-4.3. 1.orig/gcc/config/mips/linux.h 2007-10-21 05:20:49.000000000 -0400209 +++ gcc-4.3. 1/gcc/config/mips/linux.h 2008-08-24 13:51:46.000000000 -0400203 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h 204 --- gcc-4.3.3.orig/gcc/config/mips/linux.h 2007-10-21 02:20:49.000000000 -0700 205 +++ gcc-4.3.3/gcc/config/mips/linux.h 2009-01-25 00:46:46.685527587 -0800 210 206 @@ -64,7 +64,7 @@ 211 207 #undef MIPS_DEFAULT_GVALUE … … 217 213 /* Borrowed from sparc/linux.h */ 218 214 #undef LINK_SPEC 219 diff -Naur gcc-4.3. 1.orig/gcc/config/mn10300/linux.h gcc-4.3.1/gcc/config/mn10300/linux.h220 --- gcc-4.3. 1.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400221 +++ gcc-4.3. 1/gcc/config/mn10300/linux.h 2008-08-24 13:51:46.000000000 -0400215 diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h 216 --- gcc-4.3.3.orig/gcc/config/mn10300/linux.h 2007-08-02 03:49:31.000000000 -0700 217 +++ gcc-4.3.3/gcc/config/mn10300/linux.h 2009-01-25 00:46:47.091582902 -0800 222 218 @@ -32,7 +32,7 @@ 223 219 #undef ASM_SPEC … … 229 225 #undef LINK_SPEC 230 226 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ 231 diff -Naur gcc-4.3. 1.orig/gcc/config/pa/pa-linux.h gcc-4.3.1/gcc/config/pa/pa-linux.h232 --- gcc-4.3. 1.orig/gcc/config/pa/pa-linux.h 2007-08-02 06:49:31.000000000 -0400233 +++ gcc-4.3. 1/gcc/config/pa/pa-linux.h 2008-08-24 13:51:46.000000000 -0400227 diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h 228 --- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h 2007-08-02 03:49:31.000000000 -0700 229 +++ gcc-4.3.3/gcc/config/pa/pa-linux.h 2009-01-25 00:46:45.143347394 -0800 234 230 @@ -44,7 +44,7 @@ 235 231 /* Define this for shared library support because it isn't in the main … … 241 237 #undef LINK_SPEC 242 238 #define LINK_SPEC "\ 243 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h gcc-4.3.1/gcc/config/rs6000/linux64.h244 --- gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -0400245 +++ gcc-4.3. 1/gcc/config/rs6000/linux64.h 2008-08-24 13:51:46.000000000 -0400239 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h 240 --- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700 241 +++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:46:36.037907528 -0800 246 242 @@ -339,10 +339,10 @@ 247 243 #undef LINK_OS_DEFAULT_SPEC … … 254 250 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1" 255 251 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" 256 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"252 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 257 253 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 258 254 #if UCLIBC_DEFAULT 259 255 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 260 256 #else 261 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/sysv4.h gcc-4.3.1/gcc/config/rs6000/sysv4.h262 --- gcc-4.3. 1.orig/gcc/config/rs6000/sysv4.h 2007-08-08 15:33:24.000000000 -0400263 +++ gcc-4.3. 1/gcc/config/rs6000/sysv4.h 2008-08-24 13:51:46.000000000 -0400257 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h 258 --- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h 2007-08-08 12:33:24.000000000 -0700 259 +++ gcc-4.3.3/gcc/config/rs6000/sysv4.h 2009-01-25 00:46:36.316812403 -0800 264 260 @@ -891,8 +891,8 @@ 265 261 … … 282 278 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ 283 279 %{!undef: \ 284 diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 gcc-4.3.1/gcc/config/rs6000/t-linux64 285 --- gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400 286 +++ gcc-4.3.1/gcc/config/rs6000/t-linux64 2008-08-24 13:50:38.000000000 -0400 287 @@ -14,13 +14,13 @@ 288 # it doesn't tell anything about the 32bit libraries on those systems. Set 289 # MULTILIB_OSDIRNAMES according to what is found on the target. 290 291 -MULTILIB_OPTIONS = m64/m32 msoft-float 292 -MULTILIB_DIRNAMES = 64 32 nof 293 +MULTILIB_OPTIONS = m64/m32 294 +MULTILIB_DIRNAMES = 64 32 295 MULTILIB_EXTRA_OPTS = fPIC mstrict-align 296 -MULTILIB_EXCEPTIONS = m64/msoft-float 297 -MULTILIB_EXCLUSIONS = m64/!m32/msoft-float 298 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof 299 -MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) 300 +MULTILIB_EXCEPTIONS = 301 +MULTILIB_EXCLUSIONS = 302 +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 303 +MULTILIB_MATCHES = 304 305 softfp_wrap_start := '\#ifndef __powerpc64__' 306 softfp_wrap_end := '\#endif' 307 diff -Naur gcc-4.3.1.orig/gcc/config/s390/linux.h gcc-4.3.1/gcc/config/s390/linux.h 308 --- gcc-4.3.1.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400 309 +++ gcc-4.3.1/gcc/config/s390/linux.h 2008-08-24 13:51:46.000000000 -0400 280 diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h 281 --- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 282 +++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:46:39.536529682 -0800 310 283 @@ -72,8 +72,8 @@ 311 284 #define MULTILIB_DEFAULTS { "m31" } … … 314 287 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 315 288 -#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 316 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib /ld.so.1"289 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1" 317 290 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" 318 291 319 292 #undef LINK_SPEC 320 293 #define LINK_SPEC \ 321 diff -Naur gcc-4.3. 1.orig/gcc/config/sh/linux.h gcc-4.3.1/gcc/config/sh/linux.h322 --- gcc-4.3. 1.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400323 +++ gcc-4.3. 1/gcc/config/sh/linux.h 2008-08-24 13:51:46.000000000 -0400294 diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h 295 --- gcc-4.3.3.orig/gcc/config/sh/linux.h 2007-08-02 03:49:31.000000000 -0700 296 +++ gcc-4.3.3/gcc/config/sh/linux.h 2009-01-25 00:46:44.454287190 -0800 324 297 @@ -47,7 +47,7 @@ 325 298 … … 331 304 #undef SUBTARGET_LINK_EMUL_SUFFIX 332 305 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" 333 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux64.h gcc-4.3.1/gcc/config/sparc/linux64.h334 --- gcc-4.3. 1.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -0400335 +++ gcc-4.3. 1/gcc/config/sparc/linux64.h 2008-08-24 13:51:46.000000000 -0400306 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h 307 --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 308 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:46:48.145679843 -0800 336 309 @@ -144,10 +144,10 @@ 337 310 … … 344 317 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2" 345 318 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2" 346 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"319 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 347 320 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 348 321 #if UCLIBC_DEFAULT … … 376 349 %{!ibcs: \ 377 350 %{!static: \ 378 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux.h gcc-4.3.1/gcc/config/sparc/linux.h379 --- gcc-4.3. 1.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400380 +++ gcc-4.3. 1/gcc/config/sparc/linux.h 2008-08-24 13:51:46.000000000 -0400351 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h 352 --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 353 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:46:48.494310657 -0800 381 354 @@ -120,8 +120,8 @@ 382 355 … … 399 372 %{!shared: \ 400 373 %{!ibcs: \ 401 diff -Naur gcc-4.3. 1.orig/gcc/config/xtensa/linux.h gcc-4.3.1/gcc/config/xtensa/linux.h402 --- gcc-4.3. 1.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500403 +++ gcc-4.3. 1/gcc/config/xtensa/linux.h 2008-08-24 13:51:46.000000000 -0400374 diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h 375 --- gcc-4.3.3.orig/gcc/config/xtensa/linux.h 2008-01-17 17:37:53.000000000 -0800 376 +++ gcc-4.3.3/gcc/config/xtensa/linux.h 2009-01-25 00:46:37.658018717 -0800 404 377 @@ -43,7 +43,7 @@ 405 378 %{mlongcalls:--longcalls} \ -
patches/gcc-4.3.3-specs-1.patch
r5ec7db05 r0804c00 1 Submitted By: Joe Ciccone <jciccone@gmail.com> 2 Date: 2008-08-22 3 Initial Package Version: 4.1.2 4 Upstream Status: Not Sent - LFS Specific 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 5 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 6 5 the Pure LFS project. 7 More architectures added by Zack Winkles. 8 Further fine tunings by Greg Schafer. 9 Rediffed against gcc 4.0.0 by Robert Connolly. 10 Rediffed against gcc 4.1.0 by Chris Staub 11 Rediffed against gcc 4.1.2 by Jim Gifford 12 Rediffed against gcc 4.2.0 by Joe Ciccone 13 Rediffed against gcc 4.3.0 by Joe Ciccone 14 Description: This patch modifies the location of the dynamic linker for 15 the GCC Pass 2 build in LFS Chapter 5. 6 Upstream Status: Not Applied 7 Description: This patch modifies the location of the dynamic linker for gcc-4.3.3. 16 8 17 diff -Naur gcc-4.3. 0.orig/gcc/config/alpha/gnu.h gcc-4.3.0/gcc/config/alpha/gnu.h18 --- gcc-4.3. 0.orig/gcc/config/alpha/gnu.h 2004-09-07 20:17:19.000000000 -040019 +++ gcc-4.3. 0/gcc/config/alpha/gnu.h 2008-05-05 21:34:09.000000000 -04009 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h 10 --- gcc-4.3.3.orig/gcc/config/alpha/gnu.h 2004-09-07 17:17:19.000000000 -0700 11 +++ gcc-4.3.3/gcc/config/alpha/gnu.h 2009-01-25 00:44:15.387601620 -0800 20 12 @@ -11,7 +11,7 @@ 21 13 } while (0) … … 27 19 #undef STARTFILE_SPEC 28 20 #define STARTFILE_SPEC \ 29 diff -Naur gcc-4.3. 0.orig/gcc/config/alpha/linux-elf.h gcc-4.3.0/gcc/config/alpha/linux-elf.h30 --- gcc-4.3. 0.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -040031 +++ gcc-4.3. 0/gcc/config/alpha/linux-elf.h 2008-05-05 21:34:09.000000000 -040021 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h 22 --- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700 23 +++ gcc-4.3.3/gcc/config/alpha/linux-elf.h 2009-01-25 00:44:15.527054895 -0800 32 24 @@ -27,8 +27,8 @@ 33 25 #define EXTRA_SPECS \ … … 41 33 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 42 34 #else 43 diff -Naur gcc-4.3. 0.orig/gcc/config/arm/linux-eabi.h gcc-4.3.0/gcc/config/arm/linux-eabi.h44 --- gcc-4.3. 0.orig/gcc/config/arm/linux-eabi.h 2007-11-08 08:44:09.000000000 -050045 +++ gcc-4.3. 0/gcc/config/arm/linux-eabi.h 2008-05-05 21:34:43.000000000 -040035 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h 36 --- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h 2007-11-08 05:44:09.000000000 -0800 37 +++ gcc-4.3.3/gcc/config/arm/linux-eabi.h 2009-01-25 00:44:20.001844391 -0800 46 38 @@ -61,7 +61,7 @@ 47 39 /* Use ld-linux.so.3 so that it will be possible to run "classic" … … 53 45 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to 54 46 use the GNU/Linux version, not the generic BPABI version. */ 55 diff -Naur gcc-4.3. 0.orig/gcc/config/arm/linux-elf.h gcc-4.3.0/gcc/config/arm/linux-elf.h56 --- gcc-4.3. 0.orig/gcc/config/arm/linux-elf.h 2007-11-08 08:44:09.000000000 -050057 +++ gcc-4.3. 0/gcc/config/arm/linux-elf.h 2008-05-05 21:34:09.000000000 -040047 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h 48 --- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 49 +++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-25 00:44:19.714736136 -0800 58 50 @@ -62,7 +62,7 @@ 59 51 … … 65 57 #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \ 66 58 %{b} \ 67 diff -Naur gcc-4.3.0.orig/gcc/config/cris/linux.h gcc-4.3.0/gcc/config/cris/linux.h 68 --- gcc-4.3.0.orig/gcc/config/cris/linux.h 2008-01-23 12:17:58.000000000 -0500 69 +++ gcc-4.3.0/gcc/config/cris/linux.h 2008-05-05 21:34:09.000000000 -0400 59 diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h 60 --- gcc-4.3.3.orig/gcc/config/bfin/linux.h 2007-09-05 17:09:05.000000000 -0700 61 +++ gcc-4.3.3/gcc/config/bfin/linux.h 2009-01-25 00:44:12.614954881 -0800 62 @@ -22,7 +22,7 @@ 63 %{shared:-G -Bdynamic} \ 64 %{!shared: %{!static: \ 65 %{rdynamic:-export-dynamic} \ 66 - %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \ 67 + %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \ 68 %{static}} -init __init -fini __fini" 69 70 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" 71 diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h 72 --- gcc-4.3.3.orig/gcc/config/cris/linux.h 2008-01-23 09:17:58.000000000 -0800 73 +++ gcc-4.3.3/gcc/config/cris/linux.h 2009-01-25 00:44:10.547772593 -0800 70 74 @@ -102,7 +102,7 @@ 71 75 #undef CRIS_DEFAULT_CPU_VERSION … … 77 81 /* We need an -rpath-link to ld.so.1, and presumably to each directory 78 82 specified with -B. */ 79 diff -Naur gcc-4.3. 0.orig/gcc/config/frv/linux.h gcc-4.3.0/gcc/config/frv/linux.h80 --- gcc-4.3. 0.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -040081 +++ gcc-4.3. 0/gcc/config/frv/linux.h 2008-05-05 21:34:09.000000000 -040083 diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h 84 --- gcc-4.3.3.orig/gcc/config/frv/linux.h 2007-08-02 03:49:31.000000000 -0700 85 +++ gcc-4.3.3/gcc/config/frv/linux.h 2009-01-25 00:44:10.199141500 -0800 82 86 @@ -35,7 +35,7 @@ 83 87 #define ENDFILE_SPEC \ … … 89 93 #undef LINK_SPEC 90 94 #define LINK_SPEC "\ 91 diff -Naur gcc-4.3. 0.orig/gcc/config/i386/gnu.h gcc-4.3.0/gcc/config/i386/gnu.h92 --- gcc-4.3. 0.orig/gcc/config/i386/gnu.h 2007-08-08 02:35:17.000000000 -040093 +++ gcc-4.3. 0/gcc/config/i386/gnu.h 2008-05-05 21:34:09.000000000 -040095 diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h 96 --- gcc-4.3.3.orig/gcc/config/i386/gnu.h 2007-08-07 23:35:17.000000000 -0700 97 +++ gcc-4.3.3/gcc/config/i386/gnu.h 2009-01-25 00:44:12.893860874 -0800 94 98 @@ -22,7 +22,7 @@ 95 99 %{!shared: \ … … 101 105 102 106 #undef STARTFILE_SPEC 103 diff -Naur gcc-4.3. 0.orig/gcc/config/i386/linux64.h gcc-4.3.0/gcc/config/i386/linux64.h104 --- gcc-4.3. 0.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400105 +++ gcc-4.3. 0/gcc/config/i386/linux64.h 2008-05-05 21:34:09.000000000 -0400107 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h 108 --- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700 109 +++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:44:12.770812683 -0800 106 110 @@ -53,8 +53,8 @@ 107 111 When the -shared link option is used a final link is not being … … 115 119 #if TARGET_64BIT_DEFAULT 116 120 #define SPEC_32 "m32" 117 diff -Naur gcc-4.3. 0.orig/gcc/config/i386/linux.h gcc-4.3.0/gcc/config/i386/linux.h118 --- gcc-4.3. 0.orig/gcc/config/i386/linux.h 2007-11-27 20:04:27.000000000 -0500119 +++ gcc-4.3. 0/gcc/config/i386/linux.h 2008-05-05 21:34:09.000000000 -0400121 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h 122 --- gcc-4.3.3.orig/gcc/config/i386/linux.h 2007-11-27 17:04:27.000000000 -0800 123 +++ gcc-4.3.3/gcc/config/i386/linux.h 2009-01-25 00:44:14.194051683 -0800 120 124 @@ -100,7 +100,7 @@ 121 125 … … 127 131 #undef SUBTARGET_EXTRA_SPECS 128 132 #define SUBTARGET_EXTRA_SPECS \ 129 diff -Naur gcc-4.3. 0.orig/gcc/config/ia64/linux.h gcc-4.3.0/gcc/config/ia64/linux.h130 --- gcc-4.3. 0.orig/gcc/config/ia64/linux.h 2006-12-12 10:15:19.000000000 -0500131 +++ gcc-4.3. 0/gcc/config/ia64/linux.h 2008-05-05 21:34:09.000000000 -0400133 diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h 134 --- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 07:15:19.000000000 -0800 135 +++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-25 00:44:15.260453415 -0800 132 136 @@ -37,7 +37,7 @@ 133 137 /* Define this for shared library support because it isn't in the main … … 139 143 #undef LINK_SPEC 140 144 #define LINK_SPEC "\ 141 diff -Naur gcc-4.3. 0.orig/gcc/config/linux.h gcc-4.3.0/gcc/config/linux.h142 --- gcc-4.3. 0.orig/gcc/config/linux.h 2007-08-02 06:49:31.000000000 -0400143 +++ gcc-4.3. 0/gcc/config/linux.h 2008-05-05 21:34:09.000000000 -0400145 diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h 146 --- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700 147 +++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:44:18.070013688 -0800 144 148 @@ -112,9 +112,9 @@ 145 149 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or … … 155 159 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) 156 160 #define LINUX_DYNAMIC_LINKER32 \ 157 @@ -130,3 +130,7 @@ 158 #define TARGET_HAS_SINCOS (OPTION_GLIBC) 159 160 #define TARGET_POSIX_IO 161 + 162 +/* Remove /usr/include from the end of the include search path. */ 163 +#undef STANDARD_INCLUDE_DIR 164 +#define STANDARD_INCLUDE_DIR 0 165 diff -Naur gcc-4.3.0.orig/gcc/config/m32r/linux.h gcc-4.3.0/gcc/config/m32r/linux.h 166 --- gcc-4.3.0.orig/gcc/config/m32r/linux.h 2007-08-02 06:49:31.000000000 -0400 167 +++ gcc-4.3.0/gcc/config/m32r/linux.h 2008-05-05 21:34:09.000000000 -0400 161 diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h 162 --- gcc-4.3.3.orig/gcc/config/m32r/linux.h 2007-08-02 03:49:31.000000000 -0700 163 +++ gcc-4.3.3/gcc/config/m32r/linux.h 2009-01-25 00:44:12.389370023 -0800 168 164 @@ -58,7 +58,7 @@ 169 165 … … 175 171 #undef LINK_SPEC 176 172 #if TARGET_LITTLE_ENDIAN 177 diff -Naur gcc-4.3. 0.orig/gcc/config/m68k/linux.h gcc-4.3.0/gcc/config/m68k/linux.h178 --- gcc-4.3. 0.orig/gcc/config/m68k/linux.h 2007-09-24 17:07:08.000000000 -0400179 +++ gcc-4.3. 0/gcc/config/m68k/linux.h 2008-05-05 21:34:09.000000000 -0400173 diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h 174 --- gcc-4.3.3.orig/gcc/config/m68k/linux.h 2007-09-24 14:07:08.000000000 -0700 175 +++ gcc-4.3.3/gcc/config/m68k/linux.h 2009-01-25 00:44:11.044059784 -0800 180 176 @@ -84,7 +84,7 @@ 181 177 … … 187 183 #undef LINK_SPEC 188 184 #define LINK_SPEC "-m m68kelf %{shared} \ 189 diff -Naur gcc-4.3. 0.orig/gcc/config/mips/linux64.h gcc-4.3.0/gcc/config/mips/linux64.h190 --- gcc-4.3. 0.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400191 +++ gcc-4.3. 0/gcc/config/mips/linux64.h 2008-05-05 21:34:09.000000000 -0400185 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h 186 --- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700 187 +++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:44:18.176655119 -0800 192 188 @@ -38,10 +38,10 @@ 193 189 %{!shared: \ … … 205 201 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 206 202 207 diff -Naur gcc-4.3. 0.orig/gcc/config/mips/linux.h gcc-4.3.0/gcc/config/mips/linux.h208 --- gcc-4.3. 0.orig/gcc/config/mips/linux.h 2007-10-21 05:20:49.000000000 -0400209 +++ gcc-4.3. 0/gcc/config/mips/linux.h 2008-05-05 21:34:09.000000000 -0400203 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h 204 --- gcc-4.3.3.orig/gcc/config/mips/linux.h 2007-10-21 02:20:49.000000000 -0700 205 +++ gcc-4.3.3/gcc/config/mips/linux.h 2009-01-25 00:44:18.652435256 -0800 210 206 @@ -64,7 +64,7 @@ 211 207 #undef MIPS_DEFAULT_GVALUE … … 217 213 /* Borrowed from sparc/linux.h */ 218 214 #undef LINK_SPEC 219 diff -Naur gcc-4.3. 0.orig/gcc/config/mn10300/linux.h gcc-4.3.0/gcc/config/mn10300/linux.h220 --- gcc-4.3. 0.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400221 +++ gcc-4.3. 0/gcc/config/mn10300/linux.h 2008-05-05 21:34:09.000000000 -0400215 diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h 216 --- gcc-4.3.3.orig/gcc/config/mn10300/linux.h 2007-08-02 03:49:31.000000000 -0700 217 +++ gcc-4.3.3/gcc/config/mn10300/linux.h 2009-01-25 00:44:19.054386646 -0800 222 218 @@ -32,7 +32,7 @@ 223 219 #undef ASM_SPEC … … 229 225 #undef LINK_SPEC 230 226 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ 231 diff -Naur gcc-4.3. 0.orig/gcc/config/pa/pa-linux.h gcc-4.3.0/gcc/config/pa/pa-linux.h232 --- gcc-4.3. 0.orig/gcc/config/pa/pa-linux.h 2007-08-02 06:49:31.000000000 -0400233 +++ gcc-4.3. 0/gcc/config/pa/pa-linux.h 2008-05-05 21:34:09.000000000 -0400227 diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h 228 --- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h 2007-08-02 03:49:31.000000000 -0700 229 +++ gcc-4.3.3/gcc/config/pa/pa-linux.h 2009-01-25 00:44:17.138963542 -0800 234 230 @@ -44,7 +44,7 @@ 235 231 /* Define this for shared library support because it isn't in the main … … 241 237 #undef LINK_SPEC 242 238 #define LINK_SPEC "\ 243 diff -Naur gcc-4.3. 0.orig/gcc/config/rs6000/linux64.h gcc-4.3.0/gcc/config/rs6000/linux64.h244 --- gcc-4.3. 0.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -0400245 +++ gcc-4.3. 0/gcc/config/rs6000/linux64.h 2008-05-05 21:34:09.000000000 -0400239 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h 240 --- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700 241 +++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:44:08.140163989 -0800 246 242 @@ -339,10 +339,10 @@ 247 243 #undef LINK_OS_DEFAULT_SPEC … … 259 255 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 260 256 #else 261 diff -Naur gcc-4.3. 0.orig/gcc/config/rs6000/sysv4.h gcc-4.3.0/gcc/config/rs6000/sysv4.h262 --- gcc-4.3. 0.orig/gcc/config/rs6000/sysv4.h 2007-08-08 15:33:24.000000000 -0400263 +++ gcc-4.3. 0/gcc/config/rs6000/sysv4.h 2008-05-05 21:34:09.000000000 -0400257 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h 258 --- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h 2007-08-08 12:33:24.000000000 -0700 259 +++ gcc-4.3.3/gcc/config/rs6000/sysv4.h 2009-01-25 00:44:08.414967174 -0800 264 260 @@ -891,8 +891,8 @@ 265 261 … … 282 278 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ 283 279 %{!undef: \ 284 diff -Naur gcc-4.3. 0.orig/gcc/config/s390/linux.h gcc-4.3.0/gcc/config/s390/linux.h285 --- gcc-4.3. 0.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400286 +++ gcc-4.3. 0/gcc/config/s390/linux.h 2008-05-05 21:34:09.000000000 -0400280 diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h 281 --- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 282 +++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:44:11.774138007 -0800 287 283 @@ -72,8 +72,8 @@ 288 284 #define MULTILIB_DEFAULTS { "m31" } … … 296 292 #undef LINK_SPEC 297 293 #define LINK_SPEC \ 298 diff -Naur gcc-4.3. 0.orig/gcc/config/sh/linux.h gcc-4.3.0/gcc/config/sh/linux.h299 --- gcc-4.3. 0.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400300 +++ gcc-4.3. 0/gcc/config/sh/linux.h 2008-05-05 21:34:09.000000000 -0400294 diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h 295 --- gcc-4.3.3.orig/gcc/config/sh/linux.h 2007-08-02 03:49:31.000000000 -0700 296 +++ gcc-4.3.3/gcc/config/sh/linux.h 2009-01-25 00:44:16.458105601 -0800 301 297 @@ -47,7 +47,7 @@ 302 298 … … 308 304 #undef SUBTARGET_LINK_EMUL_SUFFIX 309 305 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" 310 diff -Naur gcc-4.3. 0.orig/gcc/config/sparc/linux64.h gcc-4.3.0/gcc/config/sparc/linux64.h311 --- gcc-4.3. 0.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -0400312 +++ gcc-4.3. 0/gcc/config/sparc/linux64.h 2008-05-05 21:34:09.000000000 -0400306 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h 307 --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 308 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:44:20.108482748 -0800 313 309 @@ -144,10 +144,10 @@ 314 310 … … 353 349 %{!ibcs: \ 354 350 %{!static: \ 355 diff -Naur gcc-4.3. 0.orig/gcc/config/sparc/linux.h gcc-4.3.0/gcc/config/sparc/linux.h356 --- gcc-4.3. 0.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400357 +++ gcc-4.3. 0/gcc/config/sparc/linux.h 2008-05-05 21:34:09.000000000 -0400351 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h 352 --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 353 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:44:20.453014666 -0800 358 354 @@ -120,8 +120,8 @@ 359 355 … … 376 372 %{!shared: \ 377 373 %{!ibcs: \ 378 diff -Naur gcc-4.3. 0.orig/gcc/config/xtensa/linux.h gcc-4.3.0/gcc/config/xtensa/linux.h379 --- gcc-4.3. 0.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500380 +++ gcc-4.3. 0/gcc/config/xtensa/linux.h 2008-05-05 21:34:09.000000000 -0400374 diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h 375 --- gcc-4.3.3.orig/gcc/config/xtensa/linux.h 2008-01-17 17:37:53.000000000 -0800 376 +++ gcc-4.3.3/gcc/config/xtensa/linux.h 2009-01-25 00:44:10.043282860 -0800 381 377 @@ -43,7 +43,7 @@ 382 378 %{mlongcalls:--longcalls} \ -
scripts/patch/gcc-patch.sh
r5ec7db05 r0804c00 18 18 cd /usr/src 19 19 if ! [ -e gcc-${VERSION}.tar.bz2 ]; then 20 wget ftp:// ftp.gnu.org/gnu/gcc/gcc-${VERSION}/gcc-${VERSION}.tar.bz220 wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2 21 21 fi 22 22 -
scripts/patch/gcc-specs-patch.sh
r5ec7db05 r0804c00 18 18 cd /usr/src 19 19 if ! [ -e gcc-${VERSION}.tar.bz2 ]; then 20 wget ftp:// ftp.gnu.org/gnu/gcc/gcc-${VERSION}/gcc-${VERSION}.tar.bz220 wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2 21 21 fi 22 22 … … 41 41 sed -i '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file} 42 42 fi 43 if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then 44 echo "Modifying ${file}..." 45 sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/tools/lib64@' \ 46 -e '/elf32_sparc -Y P,/s@/usr/lib@/tools/lib@' \ 47 -e '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file} 48 fi 43 49 fi 44 50 done … … 57 63 echo "" >> gcc-${VERSION}-specs-x.patch 58 64 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-specs-x.patch 65 66 # Cleanup Directory 67 # 68 rm -rf gcc-${VERSION} gcc-${VERSION}.orig 69 tar xvf gcc-${VERSION}.tar.bz2 70 cp -ar gcc-${VERSION} gcc-${VERSION}.orig 71 CURRENTDIR=$(pwd -P) 72 73 # Modify the Data 74 # 75 cd /usr/src/gcc-${VERSION} 76 for file in $(find gcc/config -name "*.h"); do 77 if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then 78 if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then 79 echo "Modifying ${file}..." 80 sed -i -e '/DYNAMIC_LINKER32/s@"/lib@"/tools/lib32@' \ 81 -e '/DYNAMIC_LINKERN32/s@"/lib32@"/tools/lib64@' \ 82 -e '/DYNAMIC_LINKER64/s@"/lib64@"/tools/lib@' \ 83 -e '/DYNAMIC_LINKER/s@"/lib@"/tools/lib@' ${file} 84 fi 85 if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then 86 echo "Modifying ${file}..." 87 sed -i '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file} 88 fi 89 if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then 90 echo "Modifying ${file}..." 91 sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/tools/lib@' \ 92 -e '/elf32_sparc -Y P,/s@/usr/lib@/tools/lib32@' \ 93 -e '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file} 94 fi 95 fi 96 done 97 98 # Create Patch 99 # 100 cd /usr/src 101 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-pure64_specs-x.patch 102 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-pure64_specs-x.patch 103 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-pure64_specs-x.patch 104 echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> gcc-${VERSION}-pure64_specs-x.patch 105 echo " the Pure LFS project." >> gcc-${VERSION}-pure64_specs-x.patch 106 echo "Upstream Status: Not Applied" >> gcc-${VERSION}-pure64_specs-x.patch 107 echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> gcc-${VERSION}-pure64_specs-x.patch 108 echo "" >> gcc-${VERSION}-pure64_specs-x.patch 109 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-pure64_specs-x.patch 110 111 # Cleanup Directory 112 # 113 rm -rf gcc-${VERSION} gcc-${VERSION}.orig 114 tar xvf gcc-${VERSION}.tar.bz2 115 cp -ar gcc-${VERSION} gcc-${VERSION}.orig 116 CURRENTDIR=$(pwd -P) 117 118 # Modify the Data 119 # 120 cd /usr/src/gcc-${VERSION} 121 for file in $(find gcc/config -name "*.h"); do 122 if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then 123 if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then 124 echo "Modifying ${file}..." 125 sed -i -e '/DYNAMIC_LINKER32/s@"/lib@"/lib32@' \ 126 -e '/DYNAMIC_LINKERN32/s@"/lib32@"/lib64@' \ 127 -e '/DYNAMIC_LINKER64/s@"/lib64@"/lib@' \ 128 -e '/DYNAMIC_LINKER/s@"/lib@"/lib@' ${file} 129 fi 130 if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then 131 echo "Modifying ${file}..." 132 sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/usr/lib@' \ 133 -e '/elf32_sparc -Y P,/s@/usr/lib@/usr/lib32@' ${file} 134 fi 135 fi 136 done 137 138 for file in $(find gcc/config -name "t-linux*"); do 139 if [ "$(cat ${file} | grep -c MULTILIB_OSDIRNAMES)" != "0" ]; then 140 echo "Modifying ${file}..." 141 if [ "$(echo ${file} | grep -c mips)" != "0" ]; then 142 sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' \ 143 -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' ${file} 144 else 145 sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib64 ../lib@MULTILIB_OSDIRNAMES = ../lib ../lib32@' \ 146 -e 's@MULTILIB_OSDIRNAMES.= ../lib64 .@MULTILIB_OSDIRNAMES\t= ../lib $@' ${file} 147 fi 148 fi 149 done 150 151 # Create Patch 152 # 153 cd /usr/src 154 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-pure64-x.patch 155 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-pure64-x.patch 156 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-pure64-x.patch 157 echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> gcc-${VERSION}-pure64-x.patch 158 echo " the Pure LFS project." >> gcc-${VERSION}-pure64-x.patch 159 echo "Upstream Status: Not Applied" >> gcc-${VERSION}-pure64-x.patch 160 echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> gcc-${VERSION}-pure64-x.patch 161 echo "" >> gcc-${VERSION}-pure64-x.patch 162 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-pure64-x.patch 163 59 164 echo "Created /usr/src/gcc-${VERSION}-specs-x.patch." 165 echo "Created /usr/src/gcc-${VERSION}-pure64_specs-x.patch." 166 echo "Created /usr/src/gcc-${VERSION}-pure64-x.patch."
Note:
See TracChangeset
for help on using the changeset viewer.