From 03d5cedd44b3d750ce1da656e206483ad2e019b8 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 14 Feb 2008 14:31:31 +0000
Subject: revert ARM to oabi by default, add some eabi patches for fixing up
 the toolchain, which unfortunately break eabi userland, but are IMHO a
 necessary basis for further eabi fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10458 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/gcc/Config.in                          |  9 ++++++
 toolchain/gcc/patches/4.1.2/930-eabi_fixes.patch | 36 ++++++++++++++++++++++++
 toolchain/gcc/patches/4.2.0/930-eabi_fixes.patch | 36 ++++++++++++++++++++++++
 toolchain/gcc/patches/4.2.1/930-eabi_fixes.patch | 36 ++++++++++++++++++++++++
 toolchain/gcc/patches/4.2.2/930-eabi_fixes.patch | 36 ++++++++++++++++++++++++
 toolchain/gcc/patches/4.2.3/930-eabi_fixes.patch | 36 ++++++++++++++++++++++++
 6 files changed, 189 insertions(+)
 create mode 100644 toolchain/gcc/patches/4.1.2/930-eabi_fixes.patch
 create mode 100644 toolchain/gcc/patches/4.2.0/930-eabi_fixes.patch
 create mode 100644 toolchain/gcc/patches/4.2.1/930-eabi_fixes.patch
 create mode 100644 toolchain/gcc/patches/4.2.2/930-eabi_fixes.patch
 create mode 100644 toolchain/gcc/patches/4.2.3/930-eabi_fixes.patch

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 01557138d5..13b5238bf7 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -34,6 +34,15 @@ choice
 
 endchoice
 
+config EABI_SUPPORT
+	bool
+	depends arm||armeb
+	depends BROKEN
+	prompt "Enable EABI support" if TOOLCHAINOPTS
+	default n
+	help
+	  Enable ARM EABI support
+
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
 	prompt "Additional gcc options" if TOOLCHAINOPTS
diff --git a/toolchain/gcc/patches/4.1.2/930-eabi_fixes.patch b/toolchain/gcc/patches/4.1.2/930-eabi_fixes.patch
new file mode 100644
index 0000000000..03814b9a9c
--- /dev/null
+++ b/toolchain/gcc/patches/4.1.2/930-eabi_fixes.patch
@@ -0,0 +1,36 @@
+Index: gcc-4.1.2/gcc/config.gcc
+===================================================================
+--- gcc-4.1.2.orig/gcc/config.gcc	2008-02-12 23:29:31.037442374 +0100
++++ gcc-4.1.2/gcc/config.gcc	2008-02-12 23:30:11.051722656 +0100
+@@ -670,7 +670,7 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+-arm*-*-linux*)			# ARM GNU/Linux with ELF
++arm*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" 
+ 	case $target in
+ 	arm*b-*)
+@@ -679,7 +679,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
++	arm*-*eabi)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in 
+Index: gcc-4.1.2/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.1.2.orig/gcc/config/arm/linux-eabi.h	2008-02-12 23:51:04.655161444 +0100
++++ gcc-4.1.2/gcc/config/arm/linux-eabi.h	2008-02-12 23:51:10.619501332 +0100
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++	" %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/toolchain/gcc/patches/4.2.0/930-eabi_fixes.patch b/toolchain/gcc/patches/4.2.0/930-eabi_fixes.patch
new file mode 100644
index 0000000000..52b56899df
--- /dev/null
+++ b/toolchain/gcc/patches/4.2.0/930-eabi_fixes.patch
@@ -0,0 +1,36 @@
+Index: gcc-4.2.0/gcc/config.gcc
+===================================================================
+--- gcc-4.2.0.orig/gcc/config.gcc	2008-02-13 00:19:06.507477329 +0100
++++ gcc-4.2.0/gcc/config.gcc	2008-02-13 00:19:42.239640606 +0100
+@@ -701,7 +701,7 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+-arm*-*-linux*)			# ARM GNU/Linux with ELF
++arm*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+@@ -710,7 +710,7 @@
+ 		;;
+ 	esac
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-linux-*eabi)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+Index: gcc-4.2.0/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2008-02-13 00:18:31.343062422 +0100
++++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2008-02-13 00:19:11.825120518 +0100
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++	" %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/toolchain/gcc/patches/4.2.1/930-eabi_fixes.patch b/toolchain/gcc/patches/4.2.1/930-eabi_fixes.patch
new file mode 100644
index 0000000000..52b56899df
--- /dev/null
+++ b/toolchain/gcc/patches/4.2.1/930-eabi_fixes.patch
@@ -0,0 +1,36 @@
+Index: gcc-4.2.0/gcc/config.gcc
+===================================================================
+--- gcc-4.2.0.orig/gcc/config.gcc	2008-02-13 00:19:06.507477329 +0100
++++ gcc-4.2.0/gcc/config.gcc	2008-02-13 00:19:42.239640606 +0100
+@@ -701,7 +701,7 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+-arm*-*-linux*)			# ARM GNU/Linux with ELF
++arm*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+@@ -710,7 +710,7 @@
+ 		;;
+ 	esac
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-linux-*eabi)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+Index: gcc-4.2.0/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2008-02-13 00:18:31.343062422 +0100
++++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2008-02-13 00:19:11.825120518 +0100
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++	" %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/toolchain/gcc/patches/4.2.2/930-eabi_fixes.patch b/toolchain/gcc/patches/4.2.2/930-eabi_fixes.patch
new file mode 100644
index 0000000000..52b56899df
--- /dev/null
+++ b/toolchain/gcc/patches/4.2.2/930-eabi_fixes.patch
@@ -0,0 +1,36 @@
+Index: gcc-4.2.0/gcc/config.gcc
+===================================================================
+--- gcc-4.2.0.orig/gcc/config.gcc	2008-02-13 00:19:06.507477329 +0100
++++ gcc-4.2.0/gcc/config.gcc	2008-02-13 00:19:42.239640606 +0100
+@@ -701,7 +701,7 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+-arm*-*-linux*)			# ARM GNU/Linux with ELF
++arm*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+@@ -710,7 +710,7 @@
+ 		;;
+ 	esac
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-linux-*eabi)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+Index: gcc-4.2.0/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2008-02-13 00:18:31.343062422 +0100
++++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2008-02-13 00:19:11.825120518 +0100
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++	" %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/toolchain/gcc/patches/4.2.3/930-eabi_fixes.patch b/toolchain/gcc/patches/4.2.3/930-eabi_fixes.patch
new file mode 100644
index 0000000000..52b56899df
--- /dev/null
+++ b/toolchain/gcc/patches/4.2.3/930-eabi_fixes.patch
@@ -0,0 +1,36 @@
+Index: gcc-4.2.0/gcc/config.gcc
+===================================================================
+--- gcc-4.2.0.orig/gcc/config.gcc	2008-02-13 00:19:06.507477329 +0100
++++ gcc-4.2.0/gcc/config.gcc	2008-02-13 00:19:42.239640606 +0100
+@@ -701,7 +701,7 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+-arm*-*-linux*)			# ARM GNU/Linux with ELF
++arm*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+@@ -710,7 +710,7 @@
+ 		;;
+ 	esac
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-linux-*eabi)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+Index: gcc-4.2.0/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2008-02-13 00:18:31.343062422 +0100
++++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2008-02-13 00:19:11.825120518 +0100
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++	" %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
-- 
cgit v1.2.3