Changeset 7f87fed in clfs-embedded


Ignore:
Timestamp:
Apr 12, 2011, 4:30:42 AM (14 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:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/patches.ent

    r70e9374 r7f87fed  
    3535<!-- ARM Patches -->
    3636
    37 <!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-1.patch">
    38 <!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "8a302850b814bbd75237eff65a23b9d1">
    39 <!ENTITY gcc-uclibc-arm-softfloat-patch-size "2 KB">
     37<!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-2.patch">
     38<!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "365f3e9d4979fc31ef338907ee8f97dd">
     39<!ENTITY gcc-uclibc-arm-softfloat-patch-size "3 KB">
    4040
    4141<!-- MIPS Patches -->

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

    r70e9374 r7f87fed  
    11Submitted By: Andrew Bradford <bradfa@gmail.com>
    2 Date: 2011-04-05
     2Date: 2011-04-12
    33Initial Package Version: 4.6.0
    4 Upstream Status: From Buildroot Team
     4Upstream Status: Modified From Buildroot (uClibc) Team
    55Origin: http://git.buildroot.net/buildroot/tree/toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
    66Description: This patch configures GCC to produce the required asm functions
    … …  
    1414             offsets.
    1515
    16 diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/li
    17 nux-elf.h
    18 --- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h   2011-04-05 05:58:33.000000000 -0
    19 400
    20 +++ gcc-4.6.0/gcc/config/arm/linux-elf.h        2011-04-05 05:59:28.000000000 -0
    21 400
    22 @@ -60,7 +60,7 @@
     16diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
     17--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h   2011-04-12 05:59:31.000000000 -0400
     18+++ gcc-4.6.0/gcc/config/arm/linux-elf.h        2011-04-12 06:01:34.000000000 -0400
     19@@ -58,11 +58,11 @@
     20 #define LIB_SPEC \
     21   "%{pthread:-lpthread} \
    2322    %{shared:-lc} \
    2423    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
    … …  
    2928 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    3029 
    31 diff -Naur gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
    32 --- gcc-4.6.0.orig/gcc/config/arm/t-linux       2011-04-05 05:58:33.000000000 -0400
    33 +++ gcc-4.6.0/gcc/config/arm/t-linux    2011-04-05 06:03:12.000000000 -0400
    34 @@ -23,7 +23,11 @@
     30 #define LINUX_TARGET_LINK_SPEC  "%{h*} \
     31    %{static:-Bstatic} \
     32diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
     33--- gcc-4.6.0.orig/gcc/config/arm/t-linux       2011-04-12 05:59:31.000000000 -0400
     34+++ gcc-4.6.0/gcc/config/arm/t-linux    2011-04-12 06:03:02.000000000 -0400
     35@@ -21,11 +21,15 @@
     36 # difference.
     37 TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
    3538 
    3639 LIB1ASMSRC = arm/lib1funcs.asm
    3740 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
    38 -       _arm_addsubdf3 _arm_addsubsf3
    39 +       _arm_addsubdf3 _arm_addsubsf3 \
    40 +       _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
    41 +       _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
    42 +       _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
    43 +       _arm_fixsfsi _arm_fixunssfsi
     41-       _arm_addsubdf3 _arm_addsubsf3
     42+       _arm_addsubdf3 _arm_addsubsf3 \
     43+       _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
     44+       _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
     45+       _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
     46+       _arm_fixsfsi _arm_fixunssfsi
    4447 
    4548 # MULTILIB_OPTIONS = mhard-float/msoft-float
    4649 # MULTILIB_DIRNAMES = hard-float soft-float
     50 
     51 # EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
Note: See TracChangeset for help on using the changeset viewer.