gcc: rename gfortran patch to avoid FILESPATH confusion with sdk builds

diff --git a/packages/gcc/files/gfortran-4.3.x.patch b/packages/gcc/files/gfortran-4.3.x.patch
new file mode 100644 (file)
index 0000000..0c42851
--- /dev/null
+++ b/packages/gcc/files/gfortran-4.3.x.patch
@@ -0,0 +1,40 @@
+The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
+
+This target doesn't really have a 128-bit integer type, however it does use 
+TImode to represent the return value of certain special ABI defined library 
+functions. This results in type_for_size(TImode) being called.
+
+Because TImode deosn't correspond to any gfortran integer kind 
+gfc_type_for_size returns NULL and we segfault shortly after.
+
+The patch below fixes this by making gfc_type_for_size handle TImode in the 
+same way as the C frontend.
+
+Tested on x86_64-linux and arm-linux-gnueabi.
+Applied to trunk.
+
+Paul
+
+2007-05-15  Paul Brook  <paul@codesourcery.com>
+
+       gcc/fortran/
+       * trans-types.c (gfc_type_for_size): Handle signed TImode.
+
+Index: gcc-4.2.1/gcc/fortran/trans-types.c
+===================================================================
+--- gcc-4.2.1/gcc/fortran/trans-types.c        (revision 170435)
++++ gcc-4.2.1/gcc/fortran/trans-types.c        (working copy)
+@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
+         if (type && bits == TYPE_PRECISION (type))
+           return type;
+       }
++
++      /* Handle TImode as a special case because it is used by some backends
++         (eg. ARM) even though it is not available for normal use.  */
++#if HOST_BITS_PER_WIDE_INT >= 65
++      if (bits == TYPE_PRECISION (intTI_type_node))
++      return intTI_type_node;
++#endif
+     }
+   else
+     {

diff --git a/packages/gcc/files/gfortran.patch b/packages/gcc/files/gfortran.patch
index 0c42851..96905e5 100644 (file)
--- a/packages/gcc/files/gfortran.patch
+++ b/packages/gcc/files/gfortran.patch
@@ -31,7 +31,7 @@ Index: gcc-4.2.1/gcc/fortran/trans-types.c
 +
 +      /* Handle TImode as a special case because it is used by some backends
 +         (eg. ARM) even though it is not available for normal use.  */
-+#if HOST_BITS_PER_WIDE_INT >= 65
++#if HOST_BITS_PER_WIDE_INT >= 64
 +      if (bits == TYPE_PRECISION (intTI_type_node))
 +      return intTI_type_node;
 +#endif

diff --git a/packages/gcc/gcc-4.2.4/gfortran.patch b/packages/gcc/gcc-4.2.4/gfortran.patch
deleted file mode 100644 (file)
index 96905e5..0000000
--- a/packages/gcc/gcc-4.2.4/gfortran.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
-
-This target doesn't really have a 128-bit integer type, however it does use 
-TImode to represent the return value of certain special ABI defined library 
-functions. This results in type_for_size(TImode) being called.
-
-Because TImode deosn't correspond to any gfortran integer kind 
-gfc_type_for_size returns NULL and we segfault shortly after.
-
-The patch below fixes this by making gfc_type_for_size handle TImode in the 
-same way as the C frontend.
-
-Tested on x86_64-linux and arm-linux-gnueabi.
-Applied to trunk.
-
-Paul
-
-2007-05-15  Paul Brook  <paul@codesourcery.com>
-
-       gcc/fortran/
-       * trans-types.c (gfc_type_for_size): Handle signed TImode.
-
-Index: gcc-4.2.1/gcc/fortran/trans-types.c
-===================================================================
---- gcc-4.2.1/gcc/fortran/trans-types.c        (revision 170435)
-+++ gcc-4.2.1/gcc/fortran/trans-types.c        (working copy)
-@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
-         if (type && bits == TYPE_PRECISION (type))
-           return type;
-       }
-+
-+      /* Handle TImode as a special case because it is used by some backends
-+         (eg. ARM) even though it is not available for normal use.  */
-+#if HOST_BITS_PER_WIDE_INT >= 64
-+      if (bits == TYPE_PRECISION (intTI_type_node))
-+      return intTI_type_node;
-+#endif
-     }
-   else
-     {

diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc
index 18195bc..7f7f15e 100644 (file)
--- a/packages/gcc/gcc-4.3.1.inc
+++ b/packages/gcc/gcc-4.3.1.inc
@@ -49,7 +49,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
        file://ldflags.patch;patch=1 \
        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
        file://cache-amnesia.patch;patch=1 \
-       file://gfortran.patch;patch=1 \
+       file://gfortran-4.3.x.patch;patch=1 \
        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
 #      file://pr34130.patch;patch=1 \
 #      file://fortran-static-linking.patch;patch=1 \

diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc
index 74ed254..1fc05af 100644 (file)
--- a/packages/gcc/gcc-4.3.2.inc
+++ b/packages/gcc/gcc-4.3.2.inc
@@ -46,7 +46,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
        file://ldflags.patch;patch=1 \
        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
        file://cache-amnesia.patch;patch=1 \
-       file://gfortran.patch;patch=1 \
+       file://gfortran-4.3.x.patch;patch=1 \
        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
 #      file://pr34130.patch;patch=1 \
 #      file://fortran-static-linking.patch;patch=1 \

diff --git a/packages/gcc/gcc-csl-arm-2008q1.inc b/packages/gcc/gcc-csl-arm-2008q1.inc
index d4f6ef1..8c2a1c5 100644 (file)
--- a/packages/gcc/gcc-csl-arm-2008q1.inc
+++ b/packages/gcc/gcc-csl-arm-2008q1.inc
@@ -25,7 +25,7 @@ SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-20
            file://arm-nolibfloat.patch;patch=1 \
            file://arm-softfloat.patch;patch=1 \
            file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran.patch;patch=1 \
+#           file://gfortran-4.3.x.patch;patch=1 \
 #           file://fortran-static-linking.patch;patch=1 \
 #           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
 #           file://gcc-new-makeinfo.patch;patch=1 \

diff --git a/packages/gcc/gcc-csl-arm-2008q3.inc b/packages/gcc/gcc-csl-arm-2008q3.inc
index dcb0eb2..13b61b6 100644 (file)
--- a/packages/gcc/gcc-csl-arm-2008q3.inc
+++ b/packages/gcc/gcc-csl-arm-2008q3.inc
@@ -12,7 +12,7 @@ SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-20
            file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
            file://gcc-flags-for-build.patch;patch=1 \
            file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-           file://gfortran-csl.patch;patch=1 \
+           file://gfortran-4.3.x.patch;patch=1 \
 "