[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 7f87fed26fac7d2b4a2afc80ca2e4e4d44658307

git git at cross-lfs.org
Tue Apr 12 20:03:58 PDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Embedded Book".

The branch, master has been updated
       via  7f87fed26fac7d2b4a2afc80ca2e4e4d44658307 (commit)
      from  70e937471f44dbb922be24b0046fadc6a899400a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7f87fed26fac7d2b4a2afc80ca2e4e4d44658307
Author: Andrew Bradford <bradfa at gmail.com>
Date:   Tue Apr 12 07:30:42 2011 -0400

    Fixed GCC ARM soft float patch
    
    Fixed an issue where applying the patch would end up with errors.
    I don't think there was enough context in the patch file for the
    patch program to determine what to do in the t-linux file.
    Now providing extra context (5 lines).

diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 5c8b7ad..716e5e8 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -34,9 +34,9 @@
 
 <!-- ARM Patches -->
 
-<!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-1.patch">
-<!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "8a302850b814bbd75237eff65a23b9d1">
-<!ENTITY gcc-uclibc-arm-softfloat-patch-size "2 KB">
+<!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-2.patch">
+<!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "365f3e9d4979fc31ef338907ee8f97dd">
+<!ENTITY gcc-uclibc-arm-softfloat-patch-size "3 KB">
 
 <!-- MIPS Patches -->
 
diff --git a/patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch b/patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
similarity index 50%
rename from patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch
rename to patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
index d61802b..0af23f4 100644
--- a/patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch
+++ b/patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
@@ -1,7 +1,7 @@
 Submitted By: Andrew Bradford <bradfa at gmail.com>
-Date: 2011-04-05
+Date: 2011-04-12
 Initial Package Version: 4.6.0
-Upstream Status: From Buildroot Team
+Upstream Status: Modified From Buildroot (uClibc) Team
 Origin: http://git.buildroot.net/buildroot/tree/toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
 Description: This patch configures GCC to produce the required asm functions
              to enable soft floating point operation in libgcc for ARM systems
@@ -13,13 +13,12 @@ Description: This patch configures GCC to produce the required asm functions
              cleanly to GCC-4.6.0.  Content is the same but with different
              offsets.
 
-diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/li
-nux-elf.h
---- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h   2011-04-05 05:58:33.000000000 -0
-400
-+++ gcc-4.6.0/gcc/config/arm/linux-elf.h        2011-04-05 05:59:28.000000000 -0
-400
-@@ -60,7 +60,7 @@
+diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
+--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h	2011-04-12 05:59:31.000000000 -0400
++++ gcc-4.6.0/gcc/config/arm/linux-elf.h	2011-04-12 06:01:34.000000000 -0400
+@@ -58,11 +58,11 @@
+ #define LIB_SPEC \
+   "%{pthread:-lpthread} \
     %{shared:-lc} \
     %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
  
@@ -28,19 +27,25 @@ nux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-diff -Naur gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
---- gcc-4.6.0.orig/gcc/config/arm/t-linux       2011-04-05 05:58:33.000000000 -0400
-+++ gcc-4.6.0/gcc/config/arm/t-linux    2011-04-05 06:03:12.000000000 -0400
-@@ -23,7 +23,11 @@
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
+    %{static:-Bstatic} \
+diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
+--- gcc-4.6.0.orig/gcc/config/arm/t-linux	2011-04-12 05:59:31.000000000 -0400
++++ gcc-4.6.0/gcc/config/arm/t-linux	2011-04-12 06:03:02.000000000 -0400
+@@ -21,11 +21,15 @@
+ # difference.
+ TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
  
  LIB1ASMSRC = arm/lib1funcs.asm
  LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--       _arm_addsubdf3 _arm_addsubsf3
-+       _arm_addsubdf3 _arm_addsubsf3 \
-+       _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+       _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+       _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+       _arm_fixsfsi _arm_fixunssfsi
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
  
  # MULTILIB_OPTIONS = mhard-float/msoft-float
  # MULTILIB_DIRNAMES = hard-float soft-float
+ 
+ # EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o

-----------------------------------------------------------------------

Summary of changes:
 BOOK/patches.ent                                   |    6 +-
 ...atch => gcc-4.6.0-uclibc-arm-softfloat-2.patch} |   43 +++++++++++---------
 2 files changed, 27 insertions(+), 22 deletions(-)
 rename patches/{gcc-4.6.0-uclibc-arm-softfloat-1.patch => gcc-4.6.0-uclibc-arm-softfloat-2.patch} (50%)


hooks/post-receive
-- 
Cross-LFS Embedded Book



More information about the Clfs-commits mailing list