diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-11 20:03:56 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-11 20:03:56 +0000 |
commit | 122c43cb0589c423749b9f046ceed1ab53bee9f6 (patch) | |
tree | f4381920fc7e84bf5eabd3cd37bf6adeee33fbec /packages/gcc/gcc-3.4.4 | |
parent | 5f016dabf20ee6196f7e141e7f499a09b7342f91 (diff) |
This set of changes ensures that TARGET_CC_ARCH is passed reliably to all
packages in a build. The change fixes problems in the following packages:
binutils{,-cross}_2.15.94.0.1
HOST_CC_ARCH was not being passed to HOST_CC. The problem does
not seem to be present in binutils* 2.16, however this version
is still used for uClibc builds.
gcc{,-cross,-cross-initial}_3.4.4
HOST/TARGET_CC_ARCH was not used in the appropriate places, plus
this was not sufficient - FLAGS_FOR_TARGET (a gcc make variable)
is now preloaded with the target CC_ARCH values, which causes all
the builds (gcc, g++, gcj, fortran) to get the correct values.
gcc OTHER
*NOT* fixed - other versions of gcc will still need the _CC_ARCH
fix in the same lines (CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET),
however so long as these builds use gcc3-*.inc the FLAGS_FOR_TARGET
fixx will be there.
uclibc{,-initial}_0.9.27
TARGET_CC_ARCH added to the do_compile. For the do_stage step the
build actually compiles target code (make utils), but this will not
accept a CC with whitespace. The TARGET_CC_ARCH flags have therefore
been added to CFLAGS (a bit ugly, but it works).
These changes have been tested for both cross and target builds, the changes
should be fine on self-hosted (i.e. target-hosted) builds, if anyone actually
does these, but note that the gcc build specifically tests for build==host and
does *not* do certain _FOR_TARGET settings in this case (this was the case
before this change too) - if you are seeing strange settings on self-hosted
gcc builds (before and after this change) check the do_compile environment
variable settings.
Diffstat (limited to 'packages/gcc/gcc-3.4.4')
-rw-r--r-- | packages/gcc/gcc-3.4.4/gcc34-configure.in.patch | 22 | ||||
-rw-r--r-- | packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch | 26 | ||||
-rw-r--r-- | packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch | 11 | ||||
-rw-r--r-- | packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch | 10 |
4 files changed, 69 insertions, 0 deletions
diff --git a/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch b/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch new file mode 100644 index 0000000000..3d33bcb978 --- /dev/null +++ b/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch @@ -0,0 +1,22 @@ +--- gcc-3.4.4/configure.in.orig 2005-08-09 19:57:51.504323183 -0700 ++++ gcc-3.4.4/configure.in 2005-08-09 20:00:12.073168623 -0700 +@@ -1907,7 +1907,7 @@ + *) gxx_include_dir=${with_gxx_include_dir} ;; + esac + +-FLAGS_FOR_TARGET= ++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" + case " $target_configdirs " in + *" newlib "*) + case " $target_configargs " in +--- gcc-3.4.4/configure.orig 2005-08-09 21:02:29.668360660 -0700 ++++ gcc-3.4.4/configure 2005-08-09 21:02:50.157649970 -0700 +@@ -2669,7 +2669,7 @@ + *) gxx_include_dir=${with_gxx_include_dir} ;; + esac + +-FLAGS_FOR_TARGET= ++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" + case " $target_configdirs " in + *" newlib "*) + case " $target_configargs " in diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch new file mode 100644 index 0000000000..57ccb85361 --- /dev/null +++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch @@ -0,0 +1,26 @@ +--- gcc-3.4.4/gcc/config/arm/linux-gas.h.orig 2005-08-09 08:10:22.809195204 -0700 ++++ gcc-3.4.4/gcc/config/arm/linux-gas.h 2005-08-09 08:13:06.539498102 -0700 +@@ -56,6 +56,7 @@ + + /* Clear the instruction cache from `beg' to `end'. This makes an + inline system call to SYS_cacheflush. */ ++#if !defined(__thumb__) + #define CLEAR_INSN_CACHE(BEG, END) \ + { \ + register unsigned long _beg __asm ("a1") = (unsigned long) (BEG); \ +@@ -65,3 +66,15 @@ + : "=r" (_beg) \ + : "0" (_beg), "r" (_end), "r" (_flg)); \ + } ++#else ++#define CLEAR_INSN_CACHE(BEG, END) \ ++{ \ ++ register unsigned long _beg __asm ("a1") = (unsigned long) (BEG); \ ++ register unsigned long _end __asm ("a2") = (unsigned long) (END); \ ++ register unsigned long _flg __asm ("a3") = 0; \ ++ register unsigned long _swi __asm ("r7") = 0x9f0002; \ ++ __asm __volatile ("swi 0 @ sys_cacheflush" \ ++ : "=r" (_beg) \ ++ : "0" (_beg), "r" (_end), "r" (_flg), "r" (_swi)); \ ++} ++#endif diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch new file mode 100644 index 0000000000..d57a420053 --- /dev/null +++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch @@ -0,0 +1,11 @@ +--- gcc-3.4.4/gcc/config/arm/lib1funcs.asm.orig 2005-08-09 07:58:42.717141188 -0700 ++++ gcc-3.4.4/gcc/config/arm/lib1funcs.asm 2005-08-09 07:58:45.425311603 -0700 +@@ -816,7 +816,7 @@ + #define __NR_kill (__NR_SYSCALL_BASE+ 37) + + .code 32 +- FUNC_START div0 ++ ARM_FUNC_START div0 + + stmfd sp!, {r1, lr} + swi __NR_getpid diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch new file mode 100644 index 0000000000..c3972d7ece --- /dev/null +++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch @@ -0,0 +1,10 @@ +--- gcc-3.4.4/gcc/config/arm/t-linux.orig 2005-08-09 08:55:02.181797492 -0700 ++++ gcc-3.4.4/gcc/config/arm/t-linux 2005-08-09 08:58:22.766419486 -0700 +@@ -7,6 +7,7 @@ + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ + _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ + _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ ++ _call_via_rX _interwork_call_via_rX \ + _fixsfsi _fixunssfsi + + # MULTILIB_OPTIONS = mhard-float/msoft-float |