From 7e0ef17512fe15ed0b386ff1b07bd50e70ba8e9e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 15 Mar 2015 14:27:15 -0500
Subject: rename m68k specific patches. we want straight patches always usable

---
 toolchain/gcc/patches/4.8.4/disable-atomics.m68k  | 12 ------------
 toolchain/gcc/patches/4.8.4/disable-atomics.patch | 12 ++++++++++++
 toolchain/gcc/patches/4.8.4/disable-tm.m68k       | 14 --------------
 toolchain/gcc/patches/4.8.4/disable-tm.patch      | 14 ++++++++++++++
 toolchain/gcc/patches/4.9.2/disable-atomics.m68k  | 12 ------------
 toolchain/gcc/patches/4.9.2/disable-atomics.patch | 12 ++++++++++++
 toolchain/gcc/patches/4.9.2/disable-tm.m68k       | 14 --------------
 toolchain/gcc/patches/4.9.2/disable-tm.patch      | 14 ++++++++++++++
 8 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 toolchain/gcc/patches/4.8.4/disable-atomics.m68k
 create mode 100644 toolchain/gcc/patches/4.8.4/disable-atomics.patch
 delete mode 100644 toolchain/gcc/patches/4.8.4/disable-tm.m68k
 create mode 100644 toolchain/gcc/patches/4.8.4/disable-tm.patch
 delete mode 100644 toolchain/gcc/patches/4.9.2/disable-atomics.m68k
 create mode 100644 toolchain/gcc/patches/4.9.2/disable-atomics.patch
 delete mode 100644 toolchain/gcc/patches/4.9.2/disable-tm.m68k
 create mode 100644 toolchain/gcc/patches/4.9.2/disable-tm.patch

diff --git a/toolchain/gcc/patches/4.8.4/disable-atomics.m68k b/toolchain/gcc/patches/4.8.4/disable-atomics.m68k
deleted file mode 100644
index 4ab553218..000000000
--- a/toolchain/gcc/patches/4.8.4/disable-atomics.m68k
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-4.8.3.orig/libgcc/config.host gcc-4.8.3/libgcc/config.host
---- gcc-4.8.3.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
-+++ gcc-4.8.3/libgcc/config.host	2014-07-26 13:15:06.359463368 +0200
-@@ -689,7 +689,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/toolchain/gcc/patches/4.8.4/disable-atomics.patch b/toolchain/gcc/patches/4.8.4/disable-atomics.patch
new file mode 100644
index 000000000..4ab553218
--- /dev/null
+++ b/toolchain/gcc/patches/4.8.4/disable-atomics.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-4.8.3.orig/libgcc/config.host gcc-4.8.3/libgcc/config.host
+--- gcc-4.8.3.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
++++ gcc-4.8.3/libgcc/config.host	2014-07-26 13:15:06.359463368 +0200
+@@ -689,7 +689,7 @@
+ m68k*-*-openbsd*)
+ 	;;
+ m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
+-	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
++	tmake_file="$tmake_file m68k/t-floatlib"
+ 	md_unwind_header=m68k/linux-unwind.h
+ 	;;
+ m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/toolchain/gcc/patches/4.8.4/disable-tm.m68k b/toolchain/gcc/patches/4.8.4/disable-tm.m68k
deleted file mode 100644
index 02b5cb854..000000000
--- a/toolchain/gcc/patches/4.8.4/disable-tm.m68k
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h
---- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/m68k/uclinux.h	2014-08-25 17:03:59.543127685 +0200
-@@ -20,6 +20,10 @@
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+/* Do not use TM clone registry.  It breaks -msep-data (-fPIC) code. */
-+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */
-+#define USE_TM_CLONE_REGISTRY 0
-+
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC \
- "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \
diff --git a/toolchain/gcc/patches/4.8.4/disable-tm.patch b/toolchain/gcc/patches/4.8.4/disable-tm.patch
new file mode 100644
index 000000000..02b5cb854
--- /dev/null
+++ b/toolchain/gcc/patches/4.8.4/disable-tm.patch
@@ -0,0 +1,14 @@
+diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h
+--- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.3/gcc/config/m68k/uclinux.h	2014-08-25 17:03:59.543127685 +0200
+@@ -20,6 +20,10 @@
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++/* Do not use TM clone registry.  It breaks -msep-data (-fPIC) code. */
++/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */
++#define USE_TM_CLONE_REGISTRY 0
++
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+ "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \
diff --git a/toolchain/gcc/patches/4.9.2/disable-atomics.m68k b/toolchain/gcc/patches/4.9.2/disable-atomics.m68k
deleted file mode 100644
index 4ab553218..000000000
--- a/toolchain/gcc/patches/4.9.2/disable-atomics.m68k
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-4.8.3.orig/libgcc/config.host gcc-4.8.3/libgcc/config.host
---- gcc-4.8.3.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
-+++ gcc-4.8.3/libgcc/config.host	2014-07-26 13:15:06.359463368 +0200
-@@ -689,7 +689,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/toolchain/gcc/patches/4.9.2/disable-atomics.patch b/toolchain/gcc/patches/4.9.2/disable-atomics.patch
new file mode 100644
index 000000000..4ab553218
--- /dev/null
+++ b/toolchain/gcc/patches/4.9.2/disable-atomics.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-4.8.3.orig/libgcc/config.host gcc-4.8.3/libgcc/config.host
+--- gcc-4.8.3.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
++++ gcc-4.8.3/libgcc/config.host	2014-07-26 13:15:06.359463368 +0200
+@@ -689,7 +689,7 @@
+ m68k*-*-openbsd*)
+ 	;;
+ m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
+-	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
++	tmake_file="$tmake_file m68k/t-floatlib"
+ 	md_unwind_header=m68k/linux-unwind.h
+ 	;;
+ m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/toolchain/gcc/patches/4.9.2/disable-tm.m68k b/toolchain/gcc/patches/4.9.2/disable-tm.m68k
deleted file mode 100644
index 02b5cb854..000000000
--- a/toolchain/gcc/patches/4.9.2/disable-tm.m68k
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h
---- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/config/m68k/uclinux.h	2014-08-25 17:03:59.543127685 +0200
-@@ -20,6 +20,10 @@
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+/* Do not use TM clone registry.  It breaks -msep-data (-fPIC) code. */
-+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */
-+#define USE_TM_CLONE_REGISTRY 0
-+
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC \
- "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \
diff --git a/toolchain/gcc/patches/4.9.2/disable-tm.patch b/toolchain/gcc/patches/4.9.2/disable-tm.patch
new file mode 100644
index 000000000..02b5cb854
--- /dev/null
+++ b/toolchain/gcc/patches/4.9.2/disable-tm.patch
@@ -0,0 +1,14 @@
+diff -Nur gcc-4.8.3.orig/gcc/config/m68k/uclinux.h gcc-4.8.3/gcc/config/m68k/uclinux.h
+--- gcc-4.8.3.orig/gcc/config/m68k/uclinux.h	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.3/gcc/config/m68k/uclinux.h	2014-08-25 17:03:59.543127685 +0200
+@@ -20,6 +20,10 @@
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++/* Do not use TM clone registry.  It breaks -msep-data (-fPIC) code. */
++/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54584 */
++#define USE_TM_CLONE_REGISTRY 0
++
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+ "%{mshared-library-id=0|!mshared-library-id=*: crt1.o%s ;: Scrt1.o%s} \
-- 
cgit v1.2.3