diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 101 |
1 files changed, 52 insertions, 49 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 5755da8254..0aa6d926ba 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -29,11 +29,11 @@ Upstream-Status: Inappropriate [OE configuration] gcc/config/sparc/linux64.h | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) -Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h +Index: gcc-4.8.4/gcc/config/alpha/linux-elf.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.073657377 +0000 -@@ -23,8 +23,8 @@ +--- gcc-4.8.4.orig/gcc/config/alpha/linux-elf.h ++++ gcc-4.8.4/gcc/config/alpha/linux-elf.h +@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. #define EXTRA_SPECS \ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, @@ -44,10 +44,10 @@ Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC -Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h +Index: gcc-4.8.4/gcc/config/arm/linux-eabi.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.077657377 +0000 +--- gcc-4.8.4.orig/gcc/config/arm/linux-eabi.h ++++ gcc-4.8.4/gcc/config/arm/linux-eabi.h @@ -68,8 +68,8 @@ GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ @@ -59,10 +59,10 @@ Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT #define GLIBC_DYNAMIC_LINKER \ -Index: gcc-4.8.2/gcc/config/arm/linux-elf.h +Index: gcc-4.8.4/gcc/config/arm/linux-elf.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.077657377 +0000 +--- gcc-4.8.4.orig/gcc/config/arm/linux-elf.h ++++ gcc-4.8.4/gcc/config/arm/linux-elf.h @@ -57,7 +57,7 @@ #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" @@ -72,21 +72,21 @@ Index: gcc-4.8.2/gcc/config/arm/linux-elf.h #define LINUX_TARGET_LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -Index: gcc-4.8.2/gcc/config/i386/linux.h +Index: gcc-4.8.4/gcc/config/i386/linux.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/i386/linux.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/i386/linux.h 2014-05-06 10:34:51.077657377 +0000 -@@ -20,4 +20,4 @@ +--- gcc-4.8.4.orig/gcc/config/i386/linux.h ++++ gcc-4.8.4/gcc/config/i386/linux.h +@@ -20,4 +20,4 @@ along with GCC; see the file COPYING3. <http://www.gnu.org/licenses/>. */ #define GNU_USER_LINK_EMULATION "elf_i386" -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" -Index: gcc-4.8.2/gcc/config/i386/linux64.h +Index: gcc-4.8.4/gcc/config/i386/linux64.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/i386/linux64.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/i386/linux64.h 2014-05-06 10:34:51.077657377 +0000 -@@ -27,6 +27,6 @@ +--- gcc-4.8.4.orig/gcc/config/i386/linux64.h ++++ gcc-4.8.4/gcc/config/i386/linux64.h +@@ -27,6 +27,6 @@ see the files COPYING3 and COPYING.RUNTI #define GNU_USER_LINK_EMULATION64 "elf_x86_64" #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" @@ -96,21 +96,21 @@ Index: gcc-4.8.2/gcc/config/i386/linux64.h +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" -Index: gcc-4.8.2/gcc/config/mips/linux.h +Index: gcc-4.8.4/gcc/config/mips/linux.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/mips/linux.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/mips/linux.h 2014-05-06 10:34:51.077657377 +0000 -@@ -17,4 +17,4 @@ +--- gcc-4.8.4.orig/gcc/config/mips/linux.h ++++ gcc-4.8.4/gcc/config/mips/linux.h +@@ -17,4 +17,4 @@ You should have received a copy of the G along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" -Index: gcc-4.8.2/gcc/config/mips/linux64.h +Index: gcc-4.8.4/gcc/config/mips/linux64.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/mips/linux64.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/mips/linux64.h 2014-05-06 10:34:51.077657377 +0000 -@@ -22,10 +22,10 @@ +--- gcc-4.8.4.orig/gcc/config/mips/linux64.h ++++ gcc-4.8.4/gcc/config/mips/linux64.h +@@ -22,10 +22,10 @@ along with GCC; see the file COPYING3. #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" @@ -125,30 +125,33 @@ Index: gcc-4.8.2/gcc/config/mips/linux64.h #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define GNU_USER_DYNAMIC_LINKERN32 \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -Index: gcc-4.8.2/gcc/config/rs6000/linux64.h +Index: gcc-4.8.4/gcc/config/rs6000/linux64.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.077657377 +0000 -@@ -350,10 +350,10 @@ +--- gcc-4.8.4.orig/gcc/config/rs6000/linux64.h ++++ gcc-4.8.4/gcc/config/rs6000/linux64.h +@@ -366,14 +366,14 @@ extern int dot_symbols; #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" + #ifdef LINUX64_DEFAULT_ABI_ELFv2 + #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}" + #else + #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}" + #endif -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" -+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64.so.1" +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC -Index: gcc-4.8.2/gcc/config/sh/linux.h +Index: gcc-4.8.4/gcc/config/sh/linux.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/sh/linux.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/sh/linux.h 2014-05-06 10:34:51.077657377 +0000 -@@ -43,7 +43,7 @@ +--- gcc-4.8.4.orig/gcc/config/sh/linux.h ++++ gcc-4.8.4/gcc/config/sh/linux.h +@@ -43,7 +43,7 @@ along with GCC; see the file COPYING3. #define TARGET_ASM_FILE_END file_end_indicate_exec_stack @@ -157,11 +160,11 @@ Index: gcc-4.8.2/gcc/config/sh/linux.h #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -Index: gcc-4.8.2/gcc/config/sparc/linux.h +Index: gcc-4.8.4/gcc/config/sparc/linux.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/sparc/linux.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/sparc/linux.h 2014-05-06 10:34:51.077657377 +0000 -@@ -83,7 +83,7 @@ +--- gcc-4.8.4.orig/gcc/config/sparc/linux.h ++++ gcc-4.8.4/gcc/config/sparc/linux.h +@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu When the -shared link option is used a final link is not being done. */ @@ -170,11 +173,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux.h #undef LINK_SPEC #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ -Index: gcc-4.8.2/gcc/config/sparc/linux64.h +Index: gcc-4.8.4/gcc/config/sparc/linux64.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.081657377 +0000 -+++ gcc-4.8.2/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.077657377 +0000 -@@ -92,8 +92,8 @@ +--- gcc-4.8.4.orig/gcc/config/sparc/linux64.h ++++ gcc-4.8.4/gcc/config/sparc/linux64.h +@@ -92,8 +92,8 @@ along with GCC; see the file COPYING3. When the -shared link option is used a final link is not being done. */ @@ -185,11 +188,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux64.h #ifdef SPARC_BI_ARCH -Index: gcc-4.8.2/gcc/config/linux.h +Index: gcc-4.8.4/gcc/config/linux.h =================================================================== ---- gcc-4.8.2.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000 -+++ gcc-4.8.2/gcc/config/linux.h 2014-05-06 10:36:26.549656893 +0000 -@@ -73,10 +73,10 @@ +--- gcc-4.8.4.orig/gcc/config/linux.h ++++ gcc-4.8.4/gcc/config/linux.h +@@ -73,10 +73,10 @@ see the files COPYING3 and COPYING.RUNTI GLIBC_DYNAMIC_LINKER must be defined for each target using them, or GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets supporting both 32-bit and 64-bit compilation. */ |