diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-31 18:03:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-31 18:03:31 +0100 |
| commit | a511e322ab940a4a469b375912114582578824a4 (patch) | |
| tree | 19b723b755f646aadcf5ac6541767c929f00265c /toolchain | |
| parent | 99248b2020f2109bdf6ea2de9887af6bbc5f8775 (diff) | |
simplify, avoid problems with musl patch, reported by Johnathan McKnight
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/patches/4.9.3/microblaze-uclibc.patch | 29 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.9.3/microblaze.uclibc-ng | 19 |
2 files changed, 19 insertions, 29 deletions
diff --git a/toolchain/gcc/patches/4.9.3/microblaze-uclibc.patch b/toolchain/gcc/patches/4.9.3/microblaze-uclibc.patch deleted file mode 100644 index 06dfddcd7..000000000 --- a/toolchain/gcc/patches/4.9.3/microblaze-uclibc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur gcc-4.9.2.orig/gcc/config/microblaze/linux.h gcc-4.9.2/gcc/config/microblaze/linux.h ---- gcc-4.9.2.orig/gcc/config/microblaze/linux.h 2014-01-02 16:23:26.000000000 -0600 -+++ gcc-4.9.2/gcc/config/microblaze/linux.h 2015-06-07 09:32:24.621501374 -0500 -@@ -25,10 +25,23 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#if DEFAULT_LIBC == LIBC_UCLIBC -+#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#elif DEFAULT_LIBC == LIBC_GLIBC -+#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#else -+#error "Unsupported DEFAULT_LIBC" -+#endif -+#define GNU_USER_DYNAMIC_LINKER \ -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ -+#define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ -- { "dynamic_linker", DYNAMIC_LINKER } -+ { "dynamic_linker", ELF_DYNAMIC_LINKER } - - #undef LINK_SPEC - #define LINK_SPEC "%{shared:-shared} \ diff --git a/toolchain/gcc/patches/4.9.3/microblaze.uclibc-ng b/toolchain/gcc/patches/4.9.3/microblaze.uclibc-ng new file mode 100644 index 000000000..213a24d33 --- /dev/null +++ b/toolchain/gcc/patches/4.9.3/microblaze.uclibc-ng @@ -0,0 +1,19 @@ +diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h +--- gcc-4.9.3.orig/gcc/config/microblaze/linux.h 2015-05-28 16:07:04.000000000 +0200 ++++ gcc-4.9.3/gcc/config/microblaze/linux.h 2015-10-31 17:46:14.388940297 +0100 +@@ -28,10 +28,18 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++ ++#if DEFAULT_LIBC == LIBC_UCLIBC ++#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ |