diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-19 14:48:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-19 14:48:22 +0200 |
| commit | 3c705181641e100c98b362dd5a2f8950b123bf49 (patch) | |
| tree | 10043458f74464ab10187ad896c3c5f688fa54f6 | |
| parent | 0581f2b62a2f626c73343877d308dfcd40bc301d (diff) | |
fix for non-64 bit platforms without TARGET_SUBARCH, from uclibc ml
| -rw-r--r-- | toolchain/uClibc/patches/0.9.33.2/target_arch.patch | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/toolchain/uClibc/patches/0.9.33.2/target_arch.patch b/toolchain/uClibc/patches/0.9.33.2/target_arch.patch index 3f02bb4e0..8bdf1f30f 100644 --- a/toolchain/uClibc/patches/0.9.33.2/target_arch.patch +++ b/toolchain/uClibc/patches/0.9.33.2/target_arch.patch @@ -1,25 +1,24 @@ -diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in ---- uClibc-0.9.33.2.orig/extra/Configs/Config.in 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc-0.9.33.2/extra/Configs/Config.in 2012-10-01 12:17:14.000000000 +0200 -@@ -235,6 +235,9 @@ - default "i486" if CONFIG_486 - default "i586" if CONFIG_586 || CONFIG_586MMX - default "i686" if TARGET_ARCH = "i386" -+ default "mips" if CONFIG_MIPS_N32_ABI -+ default "mips" if CONFIG_MIPS_O32_ABI -+ default "mips64" if CONFIG_MIPS_N64_ABI - default "" - - source "extra/Configs/Config.in.arch" diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak --- uClibc-0.9.33.2.orig/Rules.mak 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc-0.9.33.2/Rules.mak 2012-10-01 11:28:26.000000000 +0200 -@@ -118,7 +118,7 @@ ++++ uClibc-0.9.33.2/Rules.mak 2013-04-19 12:52:32.000000000 +0200 +@@ -118,12 +118,17 @@ LIBC := libc SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) -ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) -+ifneq ($(findstring $(TARGET_SUBARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) ++ ++UCLIBC_LDSO_NAME := ld-uClibc ++ARCH_NATIVE_BIT := 32 ++ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),) UCLIBC_LDSO_NAME := ld64-uClibc ARCH_NATIVE_BIT := 64 else +-UCLIBC_LDSO_NAME := ld-uClibc +-ARCH_NATIVE_BIT := 32 ++ifeq ($(CONFIG_MIPS_N64_ABI),y) ++UCLIBC_LDSO_NAME := ld64-uClibc ++ARCH_NATIVE_BIT := 64 ++endif + endif + UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) + NONSHARED_LIBNAME := uclibc_nonshared.a |