Changeset 7f87fed in clfs-embedded

Timestamp:

Apr 12, 2011, 4:30:42 AM (13 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

42a70fd

Parents:

70e9374

Message:

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).

Files:

• BOOK/patches.ent (modified) (1 diff)
• patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch (moved) (moved from patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch) (3 diffs)

BOOK/patches.ent

@@ -35 +35 @@
 <!-- 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 -->

patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch

@@ -1 +1 @@
 Submitted By: Andrew Bradford <bradfa@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
@@ -14 +14 @@
              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}}"
@@ -29 +28 @@
  #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