Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gcc/4.3.2/gentoo: 80_all_sparc-biarch.patch
Date: Fri, 26 Dec 2008 14:38:51
Message-Id: E1LGDpx-0004h4-4o@stork.gentoo.org
1 vapier 08/12/26 14:38:49
2
3 Modified: 80_all_sparc-biarch.patch
4 Log:
5 restore the glibc linux defines
6
7 Revision Changes Path
8 1.3 src/patchsets/gcc/4.3.2/gentoo/80_all_sparc-biarch.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.3.2/gentoo/80_all_sparc-biarch.patch?rev=1.3&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.3.2/gentoo/80_all_sparc-biarch.patch?rev=1.3&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.3.2/gentoo/80_all_sparc-biarch.patch?r1=1.2&r2=1.3
13
14 Index: 80_all_sparc-biarch.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.3.2/gentoo/80_all_sparc-biarch.patch,v
17 retrieving revision 1.2
18 retrieving revision 1.3
19 diff -u -r1.2 -r1.3
20 --- 80_all_sparc-biarch.patch 26 Dec 2008 00:39:11 -0000 1.2
21 +++ 80_all_sparc-biarch.patch 26 Dec 2008 14:38:49 -0000 1.3
22 @@ -122,11 +122,10 @@
23 /* Provide a LINK_SPEC appropriate for GNU/Linux. Here we provide support
24 for the special GCC options -static and -shared, which allow us to
25 link things in one of these three modes by applying the appropriate
26 -@@ -121,16 +84,6 @@
27 -
28 +@@ -121,15 +84,6 @@
29 /* If ELF is the default format, we should not use /lib/elf. */
30
31 --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
32 + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
33 -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
34 -#if UCLIBC_DEFAULT
35 -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
36 @@ -256,12 +255,10 @@
37 /* Provide a LINK_SPEC appropriate for GNU/Linux. Here we provide support
38 for the special GCC options -static and -shared, which allow us to
39 link things in one of these three modes by applying the appropriate
40 -@@ -146,19 +114,6 @@
41 -
42 - /* If ELF is the default format, we should not use /lib/elf. */
43 +@@ -146,17 +114,6 @@
44
45 --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
46 --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
47 + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
48 + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
49 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
50 -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
51 -#if UCLIBC_DEFAULT