CRUX-ARM : Home

Home :: Documentation :: Download :: Development :: Community :: Ports :: Packages :: Bugs :: Links :: About :: Donors
development / crossrootfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6dad5d9)
gcc: fixed broken patch.
authorVictor Martinez <pitillo@ono.com>
Mon, 24 Sep 2012 21:28:27 +0000 (21:28 +0000)
committerVictor Martinez <pitillo@ono.com>
Mon, 24 Sep 2012 21:28:27 +0000 (21:28 +0000)
gcc/.md5sum patch | blob | blame | history
gcc/Pkgfile patch | blob | blame | history
gcc/gcc-4.6.1-gnueabihf.patch patch | blob | blame | history

diff --git a/gcc/.md5sum b/gcc/.md5sum
index 580e70bc4483014b6df39d0432e19185de276e30..ec0363f74b54808007a0defe341292a2d20e9abf 100644 (file)
--- a/gcc/.md5sum
+++ b/gcc/.md5sum
@@ -1,3 +1,3 @@
-32a8f999b98f9f965adf9cb49835b263  gcc-4.6.1-gnueabihf.patch
+2e561e1ad59268ef35ac40a208e564d1  gcc-4.6.1-gnueabihf.patch
 0c0e7e35d2215e19de9c97efba507553  gcc-core-4.6.1.tar.bz2
 0d75ca7ca35b1e7f252223f9d23a6ad1  gcc-g++-4.6.1.tar.bz2
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 795910fa63ead0ebbe6e34660e4a2f793c467309..c0aab554976dbea8204b4f644bceb3a58a48ea58 100644 (file)
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -13,7 +13,6 @@ source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-{core,g++
 
 build() {
   cd $name-$version
-  
   patch -p1 -i $SRC/$name-$version-gnueabihf.patch
   sed -i 's|REVISION|REVISION " (CRUX)"|' $name/version.c
   # apply a sed substitutio that will suppress the installation of libiberty.a
diff --git a/gcc/gcc-4.6.1-gnueabihf.patch b/gcc/gcc-4.6.1-gnueabihf.patch
index 672a75b0b2933ffbd13254025695a138b4fe9230..6bced82e345b53ac79ac8f8d1453fb31dbe1f917 100644 (file)
--- a/gcc/gcc-4.6.1-gnueabihf.patch
+++ b/gcc/gcc-4.6.1-gnueabihf.patch
@@ -1,48 +1,28 @@
-http://gcc.gnu.org/ml/gcc/2011-02/msg00390.html
-
-Triplet for ARM Linux HardFP ABI, again
-
-    * From: Guillem Jover <guillem at debian dot org>
-    * To: gcc at gcc dot gnu dot org
-    * Date: Mon, 21 Feb 2011 11:12:09 +0100
-    * Subject: Triplet for ARM Linux HardFP ABI, again
-
-
-diff --git a/configure b/configure
-index 501c6ff..43ff04f 100755
---- a/configure
-+++ b/configure
-diff --git a/configure b/configure
-index 501c6ff..43ff04f 100755
---- a/configure
-+++ b/configure
+--- gcc-4.6.1.orig/configure   2012-09-24 17:56:00.232164337 +0000
++++ gcc-4.6.1/configure        2012-09-24 18:00:08.820172802 +0000
 @@ -3236,7 +3236,7 @@ case "${target}" in
      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
      libgloss_dir=arm
      ;;
 -  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*eabi*)
++  arm*-*-linux-gnueabi*)
      noconfigdirs="$noconfigdirs target-qthreads"
      case ${with_newlib} in
        no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-diff --git a/configure.ac b/configure.ac
-index 9121d65..e1a42e0 100644
---- a/configure.ac
-+++ b/configure.ac
+--- gcc-4.6.1.orig/configure.ac        2012-09-24 17:56:02.312164408 +0000
++++ gcc-4.6.1/configure.ac     2012-09-24 18:01:00.840174573 +0000
 @@ -682,7 +682,7 @@ case "${target}" in
      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
      libgloss_dir=arm
      ;;
 -  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*eabi*)
++  arm*-*-linux-gnueabi*)
      noconfigdirs="$noconfigdirs target-qthreads"
      case ${with_newlib} in
        no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 54b822e..1a47343 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -820,13 +820,13 @@ arm*-*-linux*)                   # ARM GNU/Linux with ELF
+--- gcc-4.6.1.orig/gcc/config.gcc      2012-09-24 17:56:04.152164470 +0000
++++ gcc-4.6.1/gcc/config.gcc   2012-09-24 18:02:13.052177032 +0000
+@@ -822,13 +822,13 @@ arm*-*-linux*)                   # ARM GNU/Linux with EL
        esac
        tmake_file="${tmake_file} t-linux arm/t-arm"
        case ${target} in
@@ -58,7 +38,7 @@ index 54b822e..1a47343 100644
                tmake_file="$tmake_file arm/t-linux-androideabi"
                ;;
            esac
-@@ -848,7 +848,7 @@ arm*-*-uclinux*)           # ARM ucLinux
+@@ -850,7 +850,7 @@ arm*-*-uclinux*)           # ARM ucLinux
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
@@ -67,10 +47,8 @@ index 54b822e..1a47343 100644
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
            tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
            tmake_file="$tmake_file arm/t-bpabi"
-diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
-index e29404c..a2e58a9 100644
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
+--- gcc-4.6.1.orig/libstdc++-v3/configure.host 2010-12-06 00:50:04.000000000 +0000
++++ gcc-4.6.1/libstdc++-v3/configure.host      2012-09-24 18:04:28.736181653 +0000
 @@ -322,7 +322,7 @@ case "${host}" in
          fi
      esac
@@ -80,26 +58,21 @@ index e29404c..a2e58a9 100644
        port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
        ;;
      esac
-diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-index cb40b7b..6147d66 100644
---- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-+++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+--- gcc-4.6.1.orig/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc       2009-04-09 15:00:19.000000000 +0000
++++ gcc-4.6.1/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc    2012-09-24 18:06:09.996185101 +0000
 @@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
 -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
  
  // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
  //
-diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-index d71c012..1086a18 100644
---- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-+++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+--- gcc-4.6.1.orig/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc     2009-04-09 15:00:19.000000000 +0000
++++ gcc-4.6.1/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc  2012-09-24 18:06:19.120185411 +0000
 @@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
 -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
  
  // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
  //
-
Ports repository to generate crossrootfs