aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-26 14:38:49 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-26 14:38:49 +0000
commit82dedd0d728765b8653653de8aa433b02ce14cbf (patch)
tree6ea1c7feafac53b2619d69a7a4cdea3af2ba6341
parenttag 1.3 patchset (diff)
downloadgcc-patches-82dedd0d728765b8653653de8aa433b02ce14cbf.tar.gz
gcc-patches-82dedd0d728765b8653653de8aa433b02ce14cbf.tar.bz2
gcc-patches-82dedd0d728765b8653653de8aa433b02ce14cbf.zip
restore the glibc linux defines
-rw-r--r--4.3.2/gentoo/80_all_sparc-biarch.patch13
1 files changed, 5 insertions, 8 deletions
diff --git a/4.3.2/gentoo/80_all_sparc-biarch.patch b/4.3.2/gentoo/80_all_sparc-biarch.patch
index ca4f26a..9741fa1 100644
--- a/4.3.2/gentoo/80_all_sparc-biarch.patch
+++ b/4.3.2/gentoo/80_all_sparc-biarch.patch
@@ -122,11 +122,10 @@ headers and using the gcc/linux.h work
/* Provide a LINK_SPEC appropriate for GNU/Linux. Here we provide support
for the special GCC options -static and -shared, which allow us to
link things in one of these three modes by applying the appropriate
-@@ -121,16 +84,6 @@
-
+@@ -121,15 +84,6 @@
/* If ELF is the default format, we should not use /lib/elf. */
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-#if UCLIBC_DEFAULT
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
@@ -256,12 +255,10 @@ headers and using the gcc/linux.h work
/* Provide a LINK_SPEC appropriate for GNU/Linux. Here we provide support
for the special GCC options -static and -shared, which allow us to
link things in one of these three modes by applying the appropriate
-@@ -146,19 +114,6 @@
-
- /* If ELF is the default format, we should not use /lib/elf. */
+@@ -146,17 +114,6 @@
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-#if UCLIBC_DEFAULT