From 17fbd0bfac5427455d075686a10e3b5b79382cc3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sun, 5 Jun 2016 08:27:16 +0200
Subject: patch conflicts with musl patch

---
 toolchain/gcc/patches/5.3.0/microbaze.uclibc-ng     | 20 ++++++++++++++++++++
 toolchain/gcc/patches/5.3.0/microblaze-uclibc.patch | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 toolchain/gcc/patches/5.3.0/microbaze.uclibc-ng
 delete mode 100644 toolchain/gcc/patches/5.3.0/microblaze-uclibc.patch

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/patches/5.3.0/microbaze.uclibc-ng b/toolchain/gcc/patches/5.3.0/microbaze.uclibc-ng
new file mode 100644
index 000000000..5d71fd78f
--- /dev/null
+++ b/toolchain/gcc/patches/5.3.0/microbaze.uclibc-ng
@@ -0,0 +1,20 @@
+diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
+--- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
++++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
+@@ -28,7 +28,15 @@
+ #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 \
+   { "dynamic_linker", DYNAMIC_LINKER }
diff --git a/toolchain/gcc/patches/5.3.0/microblaze-uclibc.patch b/toolchain/gcc/patches/5.3.0/microblaze-uclibc.patch
deleted file mode 100644
index 5d71fd78f..000000000
--- a/toolchain/gcc/patches/5.3.0/microblaze-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
-@@ -28,7 +28,15 @@
- #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 \
-   { "dynamic_linker", DYNAMIC_LINKER }
-- 
cgit v1.2.3