[oe-commits] org.oe.dev gcc 4.1.2: fix 800-arm-bigendian.patch

[koen commit]

gcc 4.1.2: fix 800-arm-bigendian.patch

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4bc8cc047648935876ee77c832ac802bb2411919
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4bc8cc047648935876ee77c832ac802bb2411919
Files:
1
packages/gcc/gcc-4.1.2/800-arm-bigendian.patch
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc_4.1.2.bb
Diffs:

#
# mt diff -rf93b1c50def57bdde2f3e3b2ac16d00035fadec2 -r4bc8cc047648935876ee77c832ac802bb2411919
#
# 
# 
# patch "packages/gcc/gcc-4.1.2/800-arm-bigendian.patch"
#  from [903d4846c84e17aae8d8d51696deb9ce1c7fbc66]
#    to [c0c4c62d447e3529b0c6f465546e3424643ccc3e]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [78f5b4b004f93529c71f6ccf6d0c605f7d25daac]
#    to [c01b9500bc2acab9b402e91ca8eb66869dc50d8e]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [797b8f302a91cd55838d411b09ba0eb4529e165f]
#    to [9ddf0897692ae124f0ae33980494625a3e8ff1ac]
# 
============================================================
--- packages/gcc/gcc-4.1.2/800-arm-bigendian.patch	903d4846c84e17aae8d8d51696deb9ce1c7fbc66
+++ packages/gcc/gcc-4.1.2/800-arm-bigendian.patch	c0c4c62d447e3529b0c6f465546e3424643ccc3e
@@ -1,10 +1,12 @@ See http://gcc.gnu.org/PR16350
 By Lennert Buytenhek <buytenh at wantstofly.org>
 Adds support for arm*b-linux* big-endian ARM targets
 
 See http://gcc.gnu.org/PR16350
 
---- gcc-4.1.0/gcc/config/arm/linux-elf.h
-+++ gcc-4.1.0/gcc/config/arm/linux-elf.h
+Index: gcc-4.1.1/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.1.1.orig/gcc/config/arm/linux-elf.h
++++ gcc-4.1.1/gcc/config/arm/linux-elf.h
 @@ -28,19 +28,33 @@
  #undef  TARGET_VERSION
  #define TARGET_VERSION  fputs (" (ARM GNU/Linux with ELF)", stderr);
@@ -51,9 +53,11 @@ See http://gcc.gnu.org/PR16350
     SUBTARGET_EXTRA_LINK_SPEC
  
  #undef  LINK_SPEC
---- gcc-4.1.0/gcc/config.gcc
-+++ gcc-4.1.0/gcc/config.gcc
-@@ -672,6 +672,11 @@
+Index: gcc-4.1.1/gcc/config.gcc
+===================================================================
+--- gcc-4.1.1.orig/gcc/config.gcc
++++ gcc-4.1.1/gcc/config.gcc
+@@ -672,6 +672,11 @@ arm*-*-netbsd*)
  	;;
  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" 
@@ -65,3 +69,59 @@ See http://gcc.gnu.org/PR16350
  	tmake_file="${tmake_file} t-linux arm/t-arm"
  	case ${target} in
  	arm*-*-linux-gnueabi)
+Index: gcc-4.1.1/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h
++++ gcc-4.1.1/gcc/config/arm/linux-eabi.h
+@@ -20,6 +20,17 @@
+    the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.  */
+ 
++/*
++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
++ * (big endian) configurations.
++ */
++#undef TARGET_LINKER_EMULATION
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define TARGET_LINKER_EMULATION "armelfb_linux_eabi"
++#else
++#define TARGET_LINKER_EMULATION "armelf_linux_eabi"
++#endif
++
+ /* On EABI GNU/Linux, we want both the BPABI builtins and the
+    GNU/Linux builtins.  */
+ #undef TARGET_OS_CPP_BUILTINS
+@@ -48,7 +59,7 @@
+ #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 " -m " TARGET_LINKER_EMULATION
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
+Index: gcc-4.1.1/gcc/config/arm/bpabi.h
+===================================================================
+--- gcc-4.1.1.orig/gcc/config/arm/bpabi.h
++++ gcc-4.1.1/gcc/config/arm/bpabi.h
+@@ -33,9 +33,19 @@
+ #undef FPUTYPE_DEFAULT
+ #define FPUTYPE_DEFAULT FPUTYPE_VFP
+ 
++/*
++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
++ * (big endian) configurations.
++ */
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
++#else
++#define TARGET_ENDIAN_DEFAULT 0
++#endif
++
+ /* EABI targets should enable interworking by default.  */
+ #undef TARGET_DEFAULT
+-#define TARGET_DEFAULT MASK_INTERWORK
++#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
+ 
+ /* The ARM BPABI functions return a boolean; they use no special
+    calling convention.  */
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	78f5b4b004f93529c71f6ccf6d0c605f7d25daac
+++ packages/gcc/gcc-cross_4.1.2.bb	c01b9500bc2acab9b402e91ca8eb66869dc50d8e
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.1.2.bb	797b8f302a91cd55838d411b09ba0eb4529e165f
+++ packages/gcc/gcc_4.1.2.bb	9ddf0897692ae124f0ae33980494625a3e8ff1ac
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -20,7 +20,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
 	file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
 	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://gcc41-configure.in.patch;patch=1 \