diff options
18 files changed, 0 insertions, 1551 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb deleted file mode 100644 index 06211033b8..0000000000 --- a/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | require gcc-cross_${PV}.bb | ||
| 2 | require gcc-cross-initial.inc | ||
| 3 | |||
| 4 | S = "${WORKDIR}/gcc-4.2" | ||
| 5 | |||
| 6 | # Hack till we fix *libc properly | ||
| 7 | do_install_append() { | ||
| 8 | ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/ | ||
| 9 | } | ||
| 10 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb deleted file mode 100644 index 8a8f21a575..0000000000 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | require gcc-cross_${PV}.bb | ||
| 2 | require gcc-cross-intermediate.inc | ||
| 3 | |||
| 4 | S = "${WORKDIR}/gcc-4.2" | ||
| 5 | |||
| 6 | # Hack till we fix *libc properly | ||
| 7 | do_install_append() { | ||
| 8 | ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/ | ||
| 9 | } | ||
| 10 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc deleted file mode 100644 index be772ba79a..0000000000 --- a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | # Cut-down gcc for kernel builds | ||
| 2 | # Only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. | ||
| 3 | |||
| 4 | PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" | ||
| 5 | |||
| 6 | do_install () { | ||
| 7 | cd gcc | ||
| 8 | oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc | ||
| 9 | install -m 0755 xgcc ${D}${bindir}/${TARGET_PREFIX}gcc-${PV} | ||
| 10 | |||
| 11 | # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are | ||
| 12 | # found. These need to be relative paths so they work in different locations. | ||
| 13 | dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ | ||
| 14 | install -d $dest | ||
| 15 | for t in ar as ld nm objcopy objdump ranlib strip cpp; do | ||
| 16 | ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t | ||
| 17 | ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t | ||
| 18 | done | ||
| 19 | } | ||
diff --git a/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb deleted file mode 100644 index 58eba46ddd..0000000000 --- a/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require gcc-csl-arm-2008q1.inc | ||
| 2 | require gcc-cross4.inc | ||
| 3 | require gcc-configure-cross.inc | ||
| 4 | require gcc-package-cross.inc | ||
| 5 | |||
| 6 | SRC_URI_append = " file://zecke-no-host-includes.patch " | ||
| 7 | |||
| 8 | EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" | ||
| 9 | |||
| 10 | #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include | ||
| 11 | CFLAGS = "" | ||
| 12 | CXXFLAGS = "" | ||
| 13 | LDFLAGS = "" | ||
| 14 | |||
| 15 | # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain | ||
| 16 | do_compile_prepend() { | ||
| 17 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ | ||
| 18 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ | ||
| 19 | ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ | ||
| 20 | sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure | ||
| 21 | |||
| 22 | } | ||
| 23 | |||
| 24 | ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc deleted file mode 100644 index 9aad535b07..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | require gcc-common.inc | ||
| 2 | |||
| 3 | BINV = "3.4.4" | ||
| 4 | PV = "3.4.4+csl-arm-2005q3-2" | ||
| 5 | PV_chinook-compat = "3.4.4cs2005q3.2" | ||
| 6 | |||
| 7 | FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" | ||
| 8 | |||
| 9 | SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \ | ||
| 10 | file://gcc_optab_arm.patch \ | ||
| 11 | file://gcc-3.4.4-eabi-bigendian.patch" | ||
| 12 | |||
| 13 | S = "${WORKDIR}/gcc-2005q3" | ||
| 14 | |||
| 15 | do_unpack2() { | ||
| 16 | cd ${WORKDIR} | ||
| 17 | tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2 | ||
| 18 | } | ||
| 19 | |||
| 20 | addtask unpack2 after do_unpack before do_patch | ||
| 21 | |||
| 22 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc deleted file mode 100644 index 648d78381f..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | require gcc-common.inc | ||
| 2 | |||
| 3 | BINV = "4.2.3" | ||
| 4 | PV = "4.2.3+csl-arm-2008q1-126" | ||
| 5 | PR = "r6" | ||
| 6 | |||
| 7 | FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" | ||
| 8 | |||
| 9 | SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \ | ||
| 10 | file://gcc41-configure.in.patch \ | ||
| 11 | file://arm-nolibfloat.patch \ | ||
| 12 | file://arm-softfloat.patch \ | ||
| 13 | file://zecke-xgcc-cpp.patch \ | ||
| 14 | " | ||
| 15 | # file://100-uclibc-conf.patch | ||
| 16 | # file://103-uclibc-conf-noupstream.patch | ||
| 17 | # file://200-uclibc-locale.patch | ||
| 18 | # file://203-uclibc-locale-no__x.patch | ||
| 19 | # file://204-uclibc-locale-wchar_fix.patch | ||
| 20 | # file://205-uclibc-locale-update.patch | ||
| 21 | # file://300-libstdc++-pic.patch | ||
| 22 | # file://302-c99-snprintf.patch | ||
| 23 | # file://303-c99-complex-ugly-hack.patch | ||
| 24 | # file://304-index_macro.patch | ||
| 25 | # file://305-libmudflap-susv3-legacy.patch | ||
| 26 | # file://306-libstdc++-namespace.patch | ||
| 27 | # file://307-locale_facets.patch | ||
| 28 | # file://402-libbackend_dep_gcov-iov.h.patch | ||
| 29 | # file://602-sdk-libstdc++-includes.patch | ||
| 30 | # file://gfortran.patch | ||
| 31 | # file://fortran-static-linking.patch | ||
| 32 | # file://gcc-configure-no-fortran.patch | ||
| 33 | # file://gcc-new-makeinfo.patch | ||
| 34 | |||
| 35 | S = "${WORKDIR}/gcc-4.2" | ||
| 36 | |||
| 37 | do_unpack2() { | ||
| 38 | cd ${WORKDIR} | ||
| 39 | tar -xvjf ./arm-2008q1-126-arm-none-eabi/gcc-2008q1-126.tar.bz2 | ||
| 40 | } | ||
| 41 | |||
| 42 | # Language Overrides | ||
| 43 | FORTRAN = "" | ||
| 44 | #FORTRAN_linux-gnueabi = ",fortran" | ||
| 45 | #JAVA = ",java" | ||
| 46 | |||
| 47 | EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" | ||
| 48 | EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" | ||
| 49 | EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" | ||
| 50 | |||
| 51 | ARM_INSTRUCTION_SET = "arm" | ||
| 52 | |||
| 53 | addtask unpack2 after do_unpack before do_patch | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch deleted file mode 100644 index 57d4a00774..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | # Dimitry Andric <dimitry@andric.com>, 2004-05-01 | ||
| 3 | # | ||
| 4 | # * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed | ||
| 5 | # anymore. (The required functions are now in libgcc.) | ||
| 6 | # | ||
| 7 | # Fixes errors like | ||
| 8 | # arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat | ||
| 9 | # collect2: ld returned 1 exit status | ||
| 10 | # make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 | ||
| 11 | # when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat | ||
| 12 | |||
| 13 | Index: gcc-4.0.2/gcc/config/arm/linux-elf.h | ||
| 14 | =================================================================== | ||
| 15 | --- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 | ||
| 16 | +++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 | ||
| 17 | @@ -56,7 +56,7 @@ | ||
| 18 | %{shared:-lc} \ | ||
| 19 | %{!shared:%{profile:-lc_p}%{!profile:-lc}}" | ||
| 20 | |||
| 21 | -#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" | ||
| 22 | +#define LIBGCC_SPEC "-lgcc" | ||
| 23 | |||
| 24 | /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add | ||
| 25 | the GNU/Linux magical crtbegin.o file (see crtstuff.c) which | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch deleted file mode 100644 index 9a0a691760..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | Index: gcc-4.0.2/gcc/config/arm/t-linux | ||
| 3 | =================================================================== | ||
| 4 | --- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 | ||
| 5 | +++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 | ||
| 6 | @@ -4,7 +4,10 @@ | ||
| 7 | LIBGCC2_DEBUG_CFLAGS = -g0 | ||
| 8 | |||
| 9 | LIB1ASMSRC = arm/lib1funcs.asm | ||
| 10 | -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx | ||
| 11 | +LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ | ||
| 12 | + _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ | ||
| 13 | + _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ | ||
| 14 | + _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf | ||
| 15 | |||
| 16 | # MULTILIB_OPTIONS = mhard-float/msoft-float | ||
| 17 | # MULTILIB_DIRNAMES = hard-float soft-float | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch deleted file mode 100644 index 7453acd348..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | --- gcc-2005q3/gcc/config/arm/linux-eabi.h~ 2007-07-10 09:19:47.000000000 +0930 | ||
| 3 | +++ gcc-2005q3/gcc/config/arm/linux-eabi.h 2007-07-10 10:42:37.000000000 +0930 | ||
| 4 | @@ -48,7 +48,8 @@ | ||
| 5 | #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi | ||
| 6 | |||
| 7 | #undef SUBTARGET_EXTRA_LINK_SPEC | ||
| 8 | -#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi" | ||
| 9 | +#define SUBTARGET_EXTRA_LINK_SPEC \ | ||
| 10 | + " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} " | ||
| 11 | |||
| 12 | /* Use ld-linux.so.3 so that it will be possible to run "classic" | ||
| 13 | GNU/Linux binaries on an EABI system. */ | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch deleted file mode 100644 index 9c53173413..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | --- gcc-3.4.4/gcc/Makefile.in.orig 2005-07-25 21:00:37 +0200 | ||
| 3 | +++ gcc-3.4.4/gcc/Makefile.in 2005-07-25 21:01:19 +0200 | ||
| 4 | @@ -304,7 +304,7 @@ | ||
| 5 | if [ "$(host)" = "$(target)" ] ; then \ | ||
| 6 | echo ar; \ | ||
| 7 | else \ | ||
| 8 | - t='$(program_transform_name)'; echo ar | sed -e $$t ; \ | ||
| 9 | + t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \ | ||
| 10 | fi; \ | ||
| 11 | fi` | ||
| 12 | AR_FLAGS_FOR_TARGET = | ||
| 13 | @@ -317,7 +317,7 @@ | ||
| 14 | if [ "$(host)" = "$(target)" ] ; then \ | ||
| 15 | echo $(RANLIB); \ | ||
| 16 | else \ | ||
| 17 | - t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ | ||
| 18 | + t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \ | ||
| 19 | fi; \ | ||
| 20 | fi` | ||
| 21 | NM_FOR_TARGET = ` \ | ||
| 22 | @@ -329,7 +329,7 @@ | ||
| 23 | if [ "$(host)" = "$(target)" ] ; then \ | ||
| 24 | echo nm; \ | ||
| 25 | else \ | ||
| 26 | - t='$(program_transform_name)'; echo nm | sed -e $$t ; \ | ||
| 27 | + t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \ | ||
| 28 | fi; \ | ||
| 29 | fi` | ||
| 30 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch deleted file mode 100644 index d9aed34bf3..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch +++ /dev/null | |||
| @@ -1,1076 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | --- tmp/configure.in.orig 2006-09-05 17:50:48.000000000 +0100 | ||
| 3 | +++ tmp/configure.in 2006-09-05 17:50:48.000000000 +0100 | ||
| 4 | @@ -157,7 +157,6 @@ | ||
| 5 | target-libstdc++-v3 \ | ||
| 6 | target-libmudflap \ | ||
| 7 | target-libssp \ | ||
| 8 | - target-libgfortran \ | ||
| 9 | ${libgcj} \ | ||
| 10 | target-libobjc \ | ||
| 11 | target-libada" | ||
| 12 | @@ -1084,77 +1083,6 @@ | ||
| 13 | AC_SUBST(docdir) | ||
| 14 | AC_SUBST(htmldir) | ||
| 15 | |||
| 16 | -# Check for GMP and MPFR | ||
| 17 | -gmplibs= | ||
| 18 | -gmpinc= | ||
| 19 | -have_gmp=yes | ||
| 20 | -# Specify a location for mpfr | ||
| 21 | -# check for this first so it ends up on the link line before gmp. | ||
| 22 | -AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH Specify source directory for MPFR library]) | ||
| 23 | - | ||
| 24 | -if test "x$with_mpfr_dir" != x; then | ||
| 25 | - gmpinc="-I$with_mpfr_dir" | ||
| 26 | - gmplibs="$with_mpfr_dir/libmpfr.a" | ||
| 27 | -else | ||
| 28 | - gmplibs="-lmpfr" | ||
| 29 | -fi | ||
| 30 | - | ||
| 31 | -AC_ARG_WITH(mpfr, [ --with-mpfr=PATH Specify directory for installed MPFR library]) | ||
| 32 | - | ||
| 33 | -if test "x$with_mpfr" != x; then | ||
| 34 | - gmplibs="-L$with_mpfr/lib $gmplibs" | ||
| 35 | - gmpinc="-I$with_mpfr/include" | ||
| 36 | -fi | ||
| 37 | - | ||
| 38 | -# Specify a location for gmp | ||
| 39 | -AC_ARG_WITH(gmp-dir, [ --with-gmp-dir=PATH Specify source directory for GMP library]) | ||
| 40 | - | ||
| 41 | -if test "x$with_gmp_dir" != x; then | ||
| 42 | - gmpinc="$gmpinc -I$with_gmp_dir" | ||
| 43 | - if test -f "$with_gmp_dir/.libs/libgmp.a"; then | ||
| 44 | - gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a" | ||
| 45 | - elif test -f "$with_gmp_dir/_libs/libgmp.a"; then | ||
| 46 | - gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a" | ||
| 47 | - fi | ||
| 48 | - # One of the later tests will catch the error if neither library is present. | ||
| 49 | -else | ||
| 50 | - gmplibs="$gmplibs -lgmp" | ||
| 51 | -fi | ||
| 52 | - | ||
| 53 | -AC_ARG_WITH(gmp, [ --with-gmp=PATH Specify directory for installed GMP library]) | ||
| 54 | - | ||
| 55 | -if test "x$with_gmp" != x; then | ||
| 56 | - gmplibs="-L$with_gmp/lib $gmplibs" | ||
| 57 | - gmpinc="-I$with_gmp/include $gmpinc" | ||
| 58 | -fi | ||
| 59 | - | ||
| 60 | -saved_CFLAGS="$CFLAGS" | ||
| 61 | -CFLAGS="$CFLAGS $gmpinc" | ||
| 62 | -# Check GMP actually works | ||
| 63 | -AC_MSG_CHECKING([for correct version of gmp.h]) | ||
| 64 | -AC_TRY_COMPILE([#include "gmp.h"],[ | ||
| 65 | -#if __GNU_MP_VERSION < 3 | ||
| 66 | -choke me | ||
| 67 | -#endif | ||
| 68 | -], [AC_MSG_RESULT([yes])], | ||
| 69 | - [AC_MSG_RESULT([no]); have_gmp=no]) | ||
| 70 | - | ||
| 71 | -if test x"$have_gmp" = xyes; then | ||
| 72 | - AC_MSG_CHECKING([for MPFR]) | ||
| 73 | - | ||
| 74 | - saved_LIBS="$LIBS" | ||
| 75 | - LIBS="$LIBS $gmplibs" | ||
| 76 | - AC_TRY_LINK([#include <gmp.h> | ||
| 77 | -#include <mpfr.h>], [mpfr_t n; mpfr_init(n);], | ||
| 78 | - [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no]) | ||
| 79 | - LIBS="$saved_LIBS" | ||
| 80 | - CFLAGS="$saved_CFLAGS" | ||
| 81 | -fi | ||
| 82 | - | ||
| 83 | -# Flags needed for both GMP and/or MPFR | ||
| 84 | -AC_SUBST(gmplibs) | ||
| 85 | -AC_SUBST(gmpinc) | ||
| 86 | - | ||
| 87 | # By default, C is the only stage 1 language. | ||
| 88 | stage1_languages=c | ||
| 89 | AC_SUBST(stage1_languages) | ||
| 90 | @@ -1182,15 +1110,6 @@ | ||
| 91 | fi | ||
| 92 | enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e 's/,$//'` | ||
| 93 | |||
| 94 | - # 'f95' is the old name for the 'fortran' language. We issue a warning | ||
| 95 | - # and make the substitution. | ||
| 96 | - case ,${enable_languages}, in | ||
| 97 | - *,f95,*) | ||
| 98 | - echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 | ||
| 99 | - enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` | ||
| 100 | - ;; | ||
| 101 | - esac | ||
| 102 | - | ||
| 103 | # First scan to see if an enabled language requires some other language. | ||
| 104 | # We assume that a given config-lang.in will list all the language | ||
| 105 | # front ends it requires, even if some are required indirectly. | ||
| 106 | @@ -2213,7 +2132,6 @@ | ||
| 107 | NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool) | ||
| 108 | NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET}) | ||
| 109 | NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj) | ||
| 110 | -NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran) | ||
| 111 | NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld) | ||
| 112 | NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo) | ||
| 113 | NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm) | ||
| 114 | @@ -2237,9 +2155,7 @@ | ||
| 115 | GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) | ||
| 116 | GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ, | ||
| 117 | [gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java) | ||
| 118 | -GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN, | ||
| 119 | - [gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran) | ||
| 120 | GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new]) | ||
| 121 | GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO) | ||
| 122 | GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new]) | ||
| 123 | |||
| 124 | --- tmp/Makefile.in.orig 2006-09-06 08:33:46.000000000 +0100 | ||
| 125 | +++ tmp/Makefile.in 2006-09-06 08:33:46.000000000 +0100 | ||
| 126 | @@ -119,7 +119,6 @@ | ||
| 127 | CXX="$(CXX_FOR_BUILD)"; export CXX; \ | ||
| 128 | CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ | ||
| 129 | GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \ | ||
| 130 | - GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ | ||
| 131 | DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \ | ||
| 132 | LD="$(LD_FOR_BUILD)"; export LD; \ | ||
| 133 | LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \ | ||
| 134 | @@ -201,7 +200,6 @@ | ||
| 135 | CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ | ||
| 136 | CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ | ||
| 137 | GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ | ||
| 138 | - GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ | ||
| 139 | DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ | ||
| 140 | LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ | ||
| 141 | LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ | ||
| 142 | @@ -313,7 +311,6 @@ | ||
| 143 | CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 144 | RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 145 | GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 146 | -GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 147 | DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ | ||
| 148 | LD_FOR_TARGET=@LD_FOR_TARGET@ | ||
| 149 | |||
| 150 | @@ -452,7 +449,6 @@ | ||
| 151 | "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ | ||
| 152 | "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ | ||
| 153 | "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \ | ||
| 154 | - "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ | ||
| 155 | "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ | ||
| 156 | "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ | ||
| 157 | "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \ | ||
| 158 | @@ -618,7 +614,6 @@ | ||
| 159 | maybe-configure-target-libmudflap \ | ||
| 160 | maybe-configure-target-libssp \ | ||
| 161 | maybe-configure-target-newlib \ | ||
| 162 | - maybe-configure-target-libgfortran \ | ||
| 163 | maybe-configure-target-libobjc \ | ||
| 164 | maybe-configure-target-libtermcap \ | ||
| 165 | maybe-configure-target-winsup \ | ||
| 166 | @@ -737,7 +732,6 @@ | ||
| 167 | maybe-all-target-libmudflap \ | ||
| 168 | maybe-all-target-libssp \ | ||
| 169 | maybe-all-target-newlib \ | ||
| 170 | - maybe-all-target-libgfortran \ | ||
| 171 | maybe-all-target-libobjc \ | ||
| 172 | maybe-all-target-libtermcap \ | ||
| 173 | maybe-all-target-winsup \ | ||
| 174 | @@ -844,7 +838,6 @@ | ||
| 175 | maybe-info-target-libmudflap \ | ||
| 176 | maybe-info-target-libssp \ | ||
| 177 | maybe-info-target-newlib \ | ||
| 178 | - maybe-info-target-libgfortran \ | ||
| 179 | maybe-info-target-libobjc \ | ||
| 180 | maybe-info-target-libtermcap \ | ||
| 181 | maybe-info-target-winsup \ | ||
| 182 | @@ -946,7 +939,6 @@ | ||
| 183 | maybe-dvi-target-libmudflap \ | ||
| 184 | maybe-dvi-target-libssp \ | ||
| 185 | maybe-dvi-target-newlib \ | ||
| 186 | - maybe-dvi-target-libgfortran \ | ||
| 187 | maybe-dvi-target-libobjc \ | ||
| 188 | maybe-dvi-target-libtermcap \ | ||
| 189 | maybe-dvi-target-winsup \ | ||
| 190 | @@ -1048,7 +1040,6 @@ | ||
| 191 | maybe-html-target-libmudflap \ | ||
| 192 | maybe-html-target-libssp \ | ||
| 193 | maybe-html-target-newlib \ | ||
| 194 | - maybe-html-target-libgfortran \ | ||
| 195 | maybe-html-target-libobjc \ | ||
| 196 | maybe-html-target-libtermcap \ | ||
| 197 | maybe-html-target-winsup \ | ||
| 198 | @@ -1150,7 +1141,6 @@ | ||
| 199 | maybe-TAGS-target-libmudflap \ | ||
| 200 | maybe-TAGS-target-libssp \ | ||
| 201 | maybe-TAGS-target-newlib \ | ||
| 202 | - maybe-TAGS-target-libgfortran \ | ||
| 203 | maybe-TAGS-target-libobjc \ | ||
| 204 | maybe-TAGS-target-libtermcap \ | ||
| 205 | maybe-TAGS-target-winsup \ | ||
| 206 | @@ -1252,7 +1242,6 @@ | ||
| 207 | maybe-install-info-target-libmudflap \ | ||
| 208 | maybe-install-info-target-libssp \ | ||
| 209 | maybe-install-info-target-newlib \ | ||
| 210 | - maybe-install-info-target-libgfortran \ | ||
| 211 | maybe-install-info-target-libobjc \ | ||
| 212 | maybe-install-info-target-libtermcap \ | ||
| 213 | maybe-install-info-target-winsup \ | ||
| 214 | @@ -1354,7 +1343,6 @@ | ||
| 215 | maybe-install-html-target-libmudflap \ | ||
| 216 | maybe-install-html-target-libssp \ | ||
| 217 | maybe-install-html-target-newlib \ | ||
| 218 | - maybe-install-html-target-libgfortran \ | ||
| 219 | maybe-install-html-target-libobjc \ | ||
| 220 | maybe-install-html-target-libtermcap \ | ||
| 221 | maybe-install-html-target-winsup \ | ||
| 222 | @@ -1456,7 +1444,6 @@ | ||
| 223 | maybe-installcheck-target-libmudflap \ | ||
| 224 | maybe-installcheck-target-libssp \ | ||
| 225 | maybe-installcheck-target-newlib \ | ||
| 226 | - maybe-installcheck-target-libgfortran \ | ||
| 227 | maybe-installcheck-target-libobjc \ | ||
| 228 | maybe-installcheck-target-libtermcap \ | ||
| 229 | maybe-installcheck-target-winsup \ | ||
| 230 | @@ -1558,7 +1545,6 @@ | ||
| 231 | maybe-mostlyclean-target-libmudflap \ | ||
| 232 | maybe-mostlyclean-target-libssp \ | ||
| 233 | maybe-mostlyclean-target-newlib \ | ||
| 234 | - maybe-mostlyclean-target-libgfortran \ | ||
| 235 | maybe-mostlyclean-target-libobjc \ | ||
| 236 | maybe-mostlyclean-target-libtermcap \ | ||
| 237 | maybe-mostlyclean-target-winsup \ | ||
| 238 | @@ -1660,7 +1646,6 @@ | ||
| 239 | maybe-clean-target-libmudflap \ | ||
| 240 | maybe-clean-target-libssp \ | ||
| 241 | maybe-clean-target-newlib \ | ||
| 242 | - maybe-clean-target-libgfortran \ | ||
| 243 | maybe-clean-target-libobjc \ | ||
| 244 | maybe-clean-target-libtermcap \ | ||
| 245 | maybe-clean-target-winsup \ | ||
| 246 | @@ -1762,7 +1747,6 @@ | ||
| 247 | maybe-distclean-target-libmudflap \ | ||
| 248 | maybe-distclean-target-libssp \ | ||
| 249 | maybe-distclean-target-newlib \ | ||
| 250 | - maybe-distclean-target-libgfortran \ | ||
| 251 | maybe-distclean-target-libobjc \ | ||
| 252 | maybe-distclean-target-libtermcap \ | ||
| 253 | maybe-distclean-target-winsup \ | ||
| 254 | @@ -1864,7 +1848,6 @@ | ||
| 255 | maybe-maintainer-clean-target-libmudflap \ | ||
| 256 | maybe-maintainer-clean-target-libssp \ | ||
| 257 | maybe-maintainer-clean-target-newlib \ | ||
| 258 | - maybe-maintainer-clean-target-libgfortran \ | ||
| 259 | maybe-maintainer-clean-target-libobjc \ | ||
| 260 | maybe-maintainer-clean-target-libtermcap \ | ||
| 261 | maybe-maintainer-clean-target-winsup \ | ||
| 262 | @@ -2024,7 +2007,6 @@ | ||
| 263 | maybe-check-target-libmudflap \ | ||
| 264 | maybe-check-target-libssp \ | ||
| 265 | maybe-check-target-newlib \ | ||
| 266 | - maybe-check-target-libgfortran \ | ||
| 267 | maybe-check-target-libobjc \ | ||
| 268 | maybe-check-target-libtermcap \ | ||
| 269 | maybe-check-target-winsup \ | ||
| 270 | @@ -2223,7 +2205,6 @@ | ||
| 271 | maybe-install-target-libmudflap \ | ||
| 272 | maybe-install-target-libssp \ | ||
| 273 | maybe-install-target-newlib \ | ||
| 274 | - maybe-install-target-libgfortran \ | ||
| 275 | maybe-install-target-libobjc \ | ||
| 276 | maybe-install-target-libtermcap \ | ||
| 277 | maybe-install-target-winsup \ | ||
| 278 | @@ -31606,382 +31587,6 @@ | ||
| 279 | |||
| 280 | |||
| 281 | # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. | ||
| 282 | -@if target-libgfortran | ||
| 283 | -$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out | ||
| 284 | - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ | ||
| 285 | - rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \ | ||
| 286 | - cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out | ||
| 287 | -@endif target-libgfortran | ||
| 288 | - | ||
| 289 | - | ||
| 290 | - | ||
| 291 | -.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran | ||
| 292 | -maybe-configure-target-libgfortran: | ||
| 293 | -@if target-libgfortran | ||
| 294 | -maybe-configure-target-libgfortran: configure-target-libgfortran | ||
| 295 | -configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out | ||
| 296 | - @$(unstage) | ||
| 297 | - @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ | ||
| 298 | - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ | ||
| 299 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 300 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 301 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 302 | - echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ | ||
| 303 | - cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ | ||
| 304 | - case $(srcdir) in \ | ||
| 305 | - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ | ||
| 306 | - *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \ | ||
| 307 | - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ | ||
| 308 | - esac; \ | ||
| 309 | - srcdiroption="--srcdir=$${topdir}/libgfortran"; \ | ||
| 310 | - libsrcdir="$$s/libgfortran"; \ | ||
| 311 | - rm -f no-such-file || : ; \ | ||
| 312 | - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ | ||
| 313 | - $(TARGET_CONFIGARGS) $${srcdiroption} \ | ||
| 314 | - || exit 1 | ||
| 315 | -@endif target-libgfortran | ||
| 316 | - | ||
| 317 | - | ||
| 318 | - | ||
| 319 | - | ||
| 320 | - | ||
| 321 | -.PHONY: all-target-libgfortran maybe-all-target-libgfortran | ||
| 322 | -maybe-all-target-libgfortran: | ||
| 323 | -@if target-libgfortran | ||
| 324 | -TARGET-target-libgfortran=all | ||
| 325 | -maybe-all-target-libgfortran: all-target-libgfortran | ||
| 326 | -all-target-libgfortran: configure-target-libgfortran | ||
| 327 | - @$(unstage) | ||
| 328 | - @r=`${PWD_COMMAND}`; export r; \ | ||
| 329 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 330 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 331 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 332 | - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran)) | ||
| 333 | -@endif target-libgfortran | ||
| 334 | - | ||
| 335 | - | ||
| 336 | - | ||
| 337 | - | ||
| 338 | - | ||
| 339 | -.PHONY: check-target-libgfortran maybe-check-target-libgfortran | ||
| 340 | -maybe-check-target-libgfortran: | ||
| 341 | -@if target-libgfortran | ||
| 342 | -maybe-check-target-libgfortran: check-target-libgfortran | ||
| 343 | - | ||
| 344 | -check-target-libgfortran: | ||
| 345 | - @: $(MAKE); $(unstage) | ||
| 346 | - @r=`${PWD_COMMAND}`; export r; \ | ||
| 347 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 348 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 349 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 350 | - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) | ||
| 351 | - | ||
| 352 | -@endif target-libgfortran | ||
| 353 | - | ||
| 354 | -.PHONY: install-target-libgfortran maybe-install-target-libgfortran | ||
| 355 | -maybe-install-target-libgfortran: | ||
| 356 | -@if target-libgfortran | ||
| 357 | -maybe-install-target-libgfortran: install-target-libgfortran | ||
| 358 | - | ||
| 359 | -install-target-libgfortran: installdirs | ||
| 360 | - @: $(MAKE); $(unstage) | ||
| 361 | - @r=`${PWD_COMMAND}`; export r; \ | ||
| 362 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 363 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 364 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 365 | - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) | ||
| 366 | - | ||
| 367 | -@endif target-libgfortran | ||
| 368 | - | ||
| 369 | -# Other targets (info, dvi, etc.) | ||
| 370 | - | ||
| 371 | -.PHONY: maybe-info-target-libgfortran info-target-libgfortran | ||
| 372 | -maybe-info-target-libgfortran: | ||
| 373 | -@if target-libgfortran | ||
| 374 | -maybe-info-target-libgfortran: info-target-libgfortran | ||
| 375 | - | ||
| 376 | -info-target-libgfortran: \ | ||
| 377 | - configure-target-libgfortran | ||
| 378 | - @: $(MAKE); $(unstage) | ||
| 379 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 380 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 381 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 382 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 383 | - echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 384 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 385 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 386 | - done; \ | ||
| 387 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 388 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 389 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 390 | - "RANLIB=$${RANLIB}" \ | ||
| 391 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 392 | - info) \ | ||
| 393 | - || exit 1 | ||
| 394 | - | ||
| 395 | -@endif target-libgfortran | ||
| 396 | - | ||
| 397 | -.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran | ||
| 398 | -maybe-dvi-target-libgfortran: | ||
| 399 | -@if target-libgfortran | ||
| 400 | -maybe-dvi-target-libgfortran: dvi-target-libgfortran | ||
| 401 | - | ||
| 402 | -dvi-target-libgfortran: \ | ||
| 403 | - configure-target-libgfortran | ||
| 404 | - @: $(MAKE); $(unstage) | ||
| 405 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 406 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 407 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 408 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 409 | - echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 410 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 411 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 412 | - done; \ | ||
| 413 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 414 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 415 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 416 | - "RANLIB=$${RANLIB}" \ | ||
| 417 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 418 | - dvi) \ | ||
| 419 | - || exit 1 | ||
| 420 | - | ||
| 421 | -@endif target-libgfortran | ||
| 422 | - | ||
| 423 | -.PHONY: maybe-html-target-libgfortran html-target-libgfortran | ||
| 424 | -maybe-html-target-libgfortran: | ||
| 425 | -@if target-libgfortran | ||
| 426 | -maybe-html-target-libgfortran: html-target-libgfortran | ||
| 427 | - | ||
| 428 | -html-target-libgfortran: \ | ||
| 429 | - configure-target-libgfortran | ||
| 430 | - @: $(MAKE); $(unstage) | ||
| 431 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 432 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 433 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 434 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 435 | - echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 436 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 437 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 438 | - done; \ | ||
| 439 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 440 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 441 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 442 | - "RANLIB=$${RANLIB}" \ | ||
| 443 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 444 | - html) \ | ||
| 445 | - || exit 1 | ||
| 446 | - | ||
| 447 | -@endif target-libgfortran | ||
| 448 | - | ||
| 449 | -.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran | ||
| 450 | -maybe-TAGS-target-libgfortran: | ||
| 451 | -@if target-libgfortran | ||
| 452 | -maybe-TAGS-target-libgfortran: TAGS-target-libgfortran | ||
| 453 | - | ||
| 454 | -TAGS-target-libgfortran: \ | ||
| 455 | - configure-target-libgfortran | ||
| 456 | - @: $(MAKE); $(unstage) | ||
| 457 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 458 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 459 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 460 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 461 | - echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 462 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 463 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 464 | - done; \ | ||
| 465 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 466 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 467 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 468 | - "RANLIB=$${RANLIB}" \ | ||
| 469 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 470 | - TAGS) \ | ||
| 471 | - || exit 1 | ||
| 472 | - | ||
| 473 | -@endif target-libgfortran | ||
| 474 | - | ||
| 475 | -.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran | ||
| 476 | -maybe-install-info-target-libgfortran: | ||
| 477 | -@if target-libgfortran | ||
| 478 | -maybe-install-info-target-libgfortran: install-info-target-libgfortran | ||
| 479 | - | ||
| 480 | -install-info-target-libgfortran: \ | ||
| 481 | - configure-target-libgfortran \ | ||
| 482 | - info-target-libgfortran | ||
| 483 | - @: $(MAKE); $(unstage) | ||
| 484 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 485 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 486 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 487 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 488 | - echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 489 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 490 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 491 | - done; \ | ||
| 492 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 493 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 494 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 495 | - "RANLIB=$${RANLIB}" \ | ||
| 496 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 497 | - install-info) \ | ||
| 498 | - || exit 1 | ||
| 499 | - | ||
| 500 | -@endif target-libgfortran | ||
| 501 | - | ||
| 502 | -.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran | ||
| 503 | -maybe-install-html-target-libgfortran: | ||
| 504 | -@if target-libgfortran | ||
| 505 | -maybe-install-html-target-libgfortran: install-html-target-libgfortran | ||
| 506 | - | ||
| 507 | -install-html-target-libgfortran: \ | ||
| 508 | - configure-target-libgfortran \ | ||
| 509 | - html-target-libgfortran | ||
| 510 | - @: $(MAKE); $(unstage) | ||
| 511 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 512 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 513 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 514 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 515 | - echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 516 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 517 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 518 | - done; \ | ||
| 519 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 520 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 521 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 522 | - "RANLIB=$${RANLIB}" \ | ||
| 523 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 524 | - install-html) \ | ||
| 525 | - || exit 1 | ||
| 526 | - | ||
| 527 | -@endif target-libgfortran | ||
| 528 | - | ||
| 529 | -.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran | ||
| 530 | -maybe-installcheck-target-libgfortran: | ||
| 531 | -@if target-libgfortran | ||
| 532 | -maybe-installcheck-target-libgfortran: installcheck-target-libgfortran | ||
| 533 | - | ||
| 534 | -installcheck-target-libgfortran: \ | ||
| 535 | - configure-target-libgfortran | ||
| 536 | - @: $(MAKE); $(unstage) | ||
| 537 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 538 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 539 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 540 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 541 | - echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 542 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 543 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 544 | - done; \ | ||
| 545 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 546 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 547 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 548 | - "RANLIB=$${RANLIB}" \ | ||
| 549 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 550 | - installcheck) \ | ||
| 551 | - || exit 1 | ||
| 552 | - | ||
| 553 | -@endif target-libgfortran | ||
| 554 | - | ||
| 555 | -.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran | ||
| 556 | -maybe-mostlyclean-target-libgfortran: | ||
| 557 | -@if target-libgfortran | ||
| 558 | -maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran | ||
| 559 | - | ||
| 560 | -mostlyclean-target-libgfortran: | ||
| 561 | - @: $(MAKE); $(unstage) | ||
| 562 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 563 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 564 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 565 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 566 | - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 567 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 568 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 569 | - done; \ | ||
| 570 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 571 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 572 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 573 | - "RANLIB=$${RANLIB}" \ | ||
| 574 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 575 | - mostlyclean) \ | ||
| 576 | - || exit 1 | ||
| 577 | - | ||
| 578 | -@endif target-libgfortran | ||
| 579 | - | ||
| 580 | -.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran | ||
| 581 | -maybe-clean-target-libgfortran: | ||
| 582 | -@if target-libgfortran | ||
| 583 | -maybe-clean-target-libgfortran: clean-target-libgfortran | ||
| 584 | - | ||
| 585 | -clean-target-libgfortran: | ||
| 586 | - @: $(MAKE); $(unstage) | ||
| 587 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 588 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 589 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 590 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 591 | - echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 592 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 593 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 594 | - done; \ | ||
| 595 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 596 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 597 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 598 | - "RANLIB=$${RANLIB}" \ | ||
| 599 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 600 | - clean) \ | ||
| 601 | - || exit 1 | ||
| 602 | - | ||
| 603 | -@endif target-libgfortran | ||
| 604 | - | ||
| 605 | -.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran | ||
| 606 | -maybe-distclean-target-libgfortran: | ||
| 607 | -@if target-libgfortran | ||
| 608 | -maybe-distclean-target-libgfortran: distclean-target-libgfortran | ||
| 609 | - | ||
| 610 | -distclean-target-libgfortran: | ||
| 611 | - @: $(MAKE); $(unstage) | ||
| 612 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 613 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 614 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 615 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 616 | - echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 617 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 618 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 619 | - done; \ | ||
| 620 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 621 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 622 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 623 | - "RANLIB=$${RANLIB}" \ | ||
| 624 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 625 | - distclean) \ | ||
| 626 | - || exit 1 | ||
| 627 | - | ||
| 628 | -@endif target-libgfortran | ||
| 629 | - | ||
| 630 | -.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran | ||
| 631 | -maybe-maintainer-clean-target-libgfortran: | ||
| 632 | -@if target-libgfortran | ||
| 633 | -maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran | ||
| 634 | - | ||
| 635 | -maintainer-clean-target-libgfortran: | ||
| 636 | - @: $(MAKE); $(unstage) | ||
| 637 | - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ | ||
| 638 | - r=`${PWD_COMMAND}`; export r; \ | ||
| 639 | - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ | ||
| 640 | - $(NORMAL_TARGET_EXPORTS) \ | ||
| 641 | - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \ | ||
| 642 | - for flag in $(EXTRA_TARGET_FLAGS); do \ | ||
| 643 | - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ | ||
| 644 | - done; \ | ||
| 645 | - (cd $(TARGET_SUBDIR)/libgfortran && \ | ||
| 646 | - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ | ||
| 647 | - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ | ||
| 648 | - "RANLIB=$${RANLIB}" \ | ||
| 649 | - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ | ||
| 650 | - maintainer-clean) \ | ||
| 651 | - || exit 1 | ||
| 652 | - | ||
| 653 | -@endif target-libgfortran | ||
| 654 | - | ||
| 655 | - | ||
| 656 | - | ||
| 657 | -# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. | ||
| 658 | @if target-libobjc | ||
| 659 | $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out | ||
| 660 | $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ | ||
| 661 | @@ -38574,8 +38179,6 @@ | ||
| 662 | |||
| 663 | configure-target-newlib: maybe-all-gcc | ||
| 664 | |||
| 665 | -configure-target-libgfortran: maybe-all-gcc | ||
| 666 | - | ||
| 667 | configure-target-libobjc: maybe-all-gcc | ||
| 668 | |||
| 669 | configure-target-libtermcap: maybe-all-gcc | ||
| 670 | @@ -38613,9 +38216,7 @@ | ||
| 671 | |||
| 672 | configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss | ||
| 673 | |||
| 674 | -configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss | ||
| 675 | - | ||
| 676 | configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss | ||
| 677 | |||
| 678 | configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss | ||
| 679 | |||
| 680 | --- tmp/Makefile.tpl.orig 2006-09-06 08:36:52.000000000 +0100 | ||
| 681 | +++ tmp/Makefile.tpl 2006-09-06 08:36:52.000000000 +0100 | ||
| 682 | @@ -122,7 +122,6 @@ | ||
| 683 | CXX="$(CXX_FOR_BUILD)"; export CXX; \ | ||
| 684 | CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ | ||
| 685 | GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \ | ||
| 686 | - GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ | ||
| 687 | DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \ | ||
| 688 | LD="$(LD_FOR_BUILD)"; export LD; \ | ||
| 689 | LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \ | ||
| 690 | @@ -204,7 +203,6 @@ | ||
| 691 | CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ | ||
| 692 | CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ | ||
| 693 | GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ | ||
| 694 | - GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ | ||
| 695 | DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ | ||
| 696 | LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ | ||
| 697 | LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ | ||
| 698 | @@ -316,7 +314,6 @@ | ||
| 699 | CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 700 | RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 701 | GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 702 | -GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) | ||
| 703 | DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ | ||
| 704 | LD_FOR_TARGET=@LD_FOR_TARGET@ | ||
| 705 | |||
| 706 | --- tmp/Makefile.def.orig 2006-09-06 08:38:50.000000000 +0100 | ||
| 707 | +++ tmp/Makefile.def 2006-09-06 08:38:50.000000000 +0100 | ||
| 708 | @@ -117,7 +117,6 @@ | ||
| 709 | target_modules = { module= libmudflap; lib_path=.libs; }; | ||
| 710 | target_modules = { module= libssp; lib_path=.libs; }; | ||
| 711 | target_modules = { module= newlib; }; | ||
| 712 | -target_modules = { module= libgfortran; }; | ||
| 713 | target_modules = { module= libobjc; }; | ||
| 714 | target_modules = { module= libtermcap; no_check=true; | ||
| 715 | missing=mostlyclean; | ||
| 716 | @@ -227,7 +226,6 @@ | ||
| 717 | flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; }; | ||
| 718 | flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; }; | ||
| 719 | flags_to_pass = { flag= GCJ_FOR_TARGET ; }; | ||
| 720 | -flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; }; | ||
| 721 | flags_to_pass = { flag= LD_FOR_TARGET ; }; | ||
| 722 | flags_to_pass = { flag= LIPO_FOR_TARGET ; }; | ||
| 723 | flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; }; | ||
| 724 | @@ -415,7 +413,6 @@ | ||
| 725 | lang_env_dependencies = { module=boehm-gc; }; | ||
| 726 | lang_env_dependencies = { module=gperf; cxx=true; }; | ||
| 727 | lang_env_dependencies = { module=libada; }; | ||
| 728 | -lang_env_dependencies = { module=libgfortran; }; | ||
| 729 | lang_env_dependencies = { module=libffi; }; | ||
| 730 | lang_env_dependencies = { module=libjava; cxx=true; }; | ||
| 731 | lang_env_dependencies = { module=libmudflap; }; | ||
| 732 | |||
| 733 | --- tmp/configure.orgig 2006-09-06 10:01:52.000000000 +0100 | ||
| 734 | +++ tmp/configure 2006-09-06 10:01:52.000000000 +0100 | ||
| 735 | @@ -921,7 +921,6 @@ | ||
| 736 | target-libstdc++-v3 \ | ||
| 737 | target-libmudflap \ | ||
| 738 | target-libssp \ | ||
| 739 | - target-libgfortran \ | ||
| 740 | ${libgcj} \ | ||
| 741 | target-libobjc \ | ||
| 742 | target-libada" | ||
| 743 | @@ -2246,135 +2245,6 @@ | ||
| 744 | fi | ||
| 745 | |||
| 746 | |||
| 747 | - | ||
| 748 | - | ||
| 749 | - | ||
| 750 | - | ||
| 751 | -# Check for GMP and MPFR | ||
| 752 | -gmplibs= | ||
| 753 | -gmpinc= | ||
| 754 | -have_gmp=yes | ||
| 755 | -# Specify a location for mpfr | ||
| 756 | -# check for this first so it ends up on the link line before gmp. | ||
| 757 | -# Check whether --with-mpfr-dir or --without-mpfr-dir was given. | ||
| 758 | -if test "${with_mpfr_dir+set}" = set; then | ||
| 759 | - withval="$with_mpfr_dir" | ||
| 760 | - : | ||
| 761 | -fi | ||
| 762 | - | ||
| 763 | - | ||
| 764 | -if test "x$with_mpfr_dir" != x; then | ||
| 765 | - gmpinc="-I$with_mpfr_dir" | ||
| 766 | - gmplibs="$with_mpfr_dir/libmpfr.a" | ||
| 767 | -else | ||
| 768 | - gmplibs="-lmpfr" | ||
| 769 | -fi | ||
| 770 | - | ||
| 771 | -# Check whether --with-mpfr or --without-mpfr was given. | ||
| 772 | -if test "${with_mpfr+set}" = set; then | ||
| 773 | - withval="$with_mpfr" | ||
| 774 | - : | ||
| 775 | -fi | ||
| 776 | - | ||
| 777 | - | ||
| 778 | -if test "x$with_mpfr" != x; then | ||
| 779 | - gmplibs="-L$with_mpfr/lib $gmplibs" | ||
| 780 | - gmpinc="-I$with_mpfr/include" | ||
| 781 | -fi | ||
| 782 | - | ||
| 783 | -# Specify a location for gmp | ||
| 784 | -# Check whether --with-gmp-dir or --without-gmp-dir was given. | ||
| 785 | -if test "${with_gmp_dir+set}" = set; then | ||
| 786 | - withval="$with_gmp_dir" | ||
| 787 | - : | ||
| 788 | -fi | ||
| 789 | - | ||
| 790 | - | ||
| 791 | -if test "x$with_gmp_dir" != x; then | ||
| 792 | - gmpinc="$gmpinc -I$with_gmp_dir" | ||
| 793 | - if test -f "$with_gmp_dir/.libs/libgmp.a"; then | ||
| 794 | - gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a" | ||
| 795 | - elif test -f "$with_gmp_dir/_libs/libgmp.a"; then | ||
| 796 | - gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a" | ||
| 797 | - fi | ||
| 798 | - # One of the later tests will catch the error if neither library is present. | ||
| 799 | -else | ||
| 800 | - gmplibs="$gmplibs -lgmp" | ||
| 801 | -fi | ||
| 802 | - | ||
| 803 | -# Check whether --with-gmp or --without-gmp was given. | ||
| 804 | -if test "${with_gmp+set}" = set; then | ||
| 805 | - withval="$with_gmp" | ||
| 806 | - : | ||
| 807 | -fi | ||
| 808 | - | ||
| 809 | - | ||
| 810 | -if test "x$with_gmp" != x; then | ||
| 811 | - gmplibs="-L$with_gmp/lib $gmplibs" | ||
| 812 | - gmpinc="-I$with_gmp/include $gmpinc" | ||
| 813 | -fi | ||
| 814 | - | ||
| 815 | -saved_CFLAGS="$CFLAGS" | ||
| 816 | -CFLAGS="$CFLAGS $gmpinc" | ||
| 817 | -# Check GMP actually works | ||
| 818 | -echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 | ||
| 819 | -echo "configure:2322: checking for correct version of gmp.h" >&5 | ||
| 820 | -cat > conftest.$ac_ext <<EOF | ||
| 821 | -#line 2324 "configure" | ||
| 822 | -#include "confdefs.h" | ||
| 823 | -#include "gmp.h" | ||
| 824 | -int main() { | ||
| 825 | - | ||
| 826 | -#if __GNU_MP_VERSION < 3 | ||
| 827 | -choke me | ||
| 828 | -#endif | ||
| 829 | - | ||
| 830 | -; return 0; } | ||
| 831 | -EOF | ||
| 832 | -if { (eval echo configure:2335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 833 | - rm -rf conftest* | ||
| 834 | - echo "$ac_t""yes" 1>&6 | ||
| 835 | -else | ||
| 836 | - echo "configure: failed program was:" >&5 | ||
| 837 | - cat conftest.$ac_ext >&5 | ||
| 838 | - rm -rf conftest* | ||
| 839 | - echo "$ac_t""no" 1>&6; have_gmp=no | ||
| 840 | -fi | ||
| 841 | -rm -f conftest* | ||
| 842 | - | ||
| 843 | -if test x"$have_gmp" = xyes; then | ||
| 844 | - echo $ac_n "checking for MPFR""... $ac_c" 1>&6 | ||
| 845 | -echo "configure:2348: checking for MPFR" >&5 | ||
| 846 | - | ||
| 847 | - saved_LIBS="$LIBS" | ||
| 848 | - LIBS="$LIBS $gmplibs" | ||
| 849 | - cat > conftest.$ac_ext <<EOF | ||
| 850 | -#line 2353 "configure" | ||
| 851 | -#include "confdefs.h" | ||
| 852 | -#include <gmp.h> | ||
| 853 | -#include <mpfr.h> | ||
| 854 | -int main() { | ||
| 855 | -mpfr_t n; mpfr_init(n); | ||
| 856 | -; return 0; } | ||
| 857 | -EOF | ||
| 858 | -if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 859 | - rm -rf conftest* | ||
| 860 | - echo "$ac_t""yes" 1>&6 | ||
| 861 | -else | ||
| 862 | - echo "configure: failed program was:" >&5 | ||
| 863 | - cat conftest.$ac_ext >&5 | ||
| 864 | - rm -rf conftest* | ||
| 865 | - echo "$ac_t""no" 1>&6; have_gmp=no | ||
| 866 | -fi | ||
| 867 | -rm -f conftest* | ||
| 868 | - LIBS="$saved_LIBS" | ||
| 869 | - CFLAGS="$saved_CFLAGS" | ||
| 870 | -fi | ||
| 871 | - | ||
| 872 | -# Flags needed for both GMP and/or MPFR | ||
| 873 | - | ||
| 874 | - | ||
| 875 | - | ||
| 876 | # By default, C is the only stage 1 language. | ||
| 877 | stage1_languages=c | ||
| 878 | |||
| 879 | @@ -2402,15 +2272,6 @@ | ||
| 880 | fi | ||
| 881 | enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/,$//'` | ||
| 882 | |||
| 883 | - # 'f95' is the old name for the 'fortran' language. We issue a warning | ||
| 884 | - # and make the substitution. | ||
| 885 | - case ,${enable_languages}, in | ||
| 886 | - *,f95,*) | ||
| 887 | - echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 | ||
| 888 | - enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` | ||
| 889 | - ;; | ||
| 890 | - esac | ||
| 891 | - | ||
| 892 | # First scan to see if an enabled language requires some other language. | ||
| 893 | # We assume that a given config-lang.in will list all the language | ||
| 894 | # front ends it requires, even if some are required indirectly. | ||
| 895 | @@ -5036,81 +4897,6 @@ | ||
| 896 | fi | ||
| 897 | fi | ||
| 898 | |||
| 899 | - for ncn_progname in gfortran; do | ||
| 900 | - if test -n "$ncn_target_tool_prefix"; then | ||
| 901 | - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. | ||
| 902 | -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 | ||
| 903 | -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 904 | -echo "configure:5045: checking for $ac_word" >&5 | ||
| 905 | -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then | ||
| 906 | - echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 907 | -else | ||
| 908 | - if test -n "$GFORTRAN_FOR_TARGET"; then | ||
| 909 | - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. | ||
| 910 | -else | ||
| 911 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
| 912 | - ac_dummy="$PATH" | ||
| 913 | - for ac_dir in $ac_dummy; do | ||
| 914 | - test -z "$ac_dir" && ac_dir=. | ||
| 915 | - if test -f $ac_dir/$ac_word; then | ||
| 916 | - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" | ||
| 917 | - break | ||
| 918 | - fi | ||
| 919 | - done | ||
| 920 | - IFS="$ac_save_ifs" | ||
| 921 | -fi | ||
| 922 | -fi | ||
| 923 | -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" | ||
| 924 | -if test -n "$GFORTRAN_FOR_TARGET"; then | ||
| 925 | - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 | ||
| 926 | -else | ||
| 927 | - echo "$ac_t""no" 1>&6 | ||
| 928 | -fi | ||
| 929 | - | ||
| 930 | - fi | ||
| 931 | - if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then | ||
| 932 | - # Extract the first word of "${ncn_progname}", so it can be a program name with args. | ||
| 933 | -set dummy ${ncn_progname}; ac_word=$2 | ||
| 934 | -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 935 | -echo "configure:5076: checking for $ac_word" >&5 | ||
| 936 | -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then | ||
| 937 | - echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 938 | -else | ||
| 939 | - if test -n "$GFORTRAN_FOR_TARGET"; then | ||
| 940 | - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. | ||
| 941 | -else | ||
| 942 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
| 943 | - ac_dummy="$PATH" | ||
| 944 | - for ac_dir in $ac_dummy; do | ||
| 945 | - test -z "$ac_dir" && ac_dir=. | ||
| 946 | - if test -f $ac_dir/$ac_word; then | ||
| 947 | - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" | ||
| 948 | - break | ||
| 949 | - fi | ||
| 950 | - done | ||
| 951 | - IFS="$ac_save_ifs" | ||
| 952 | -fi | ||
| 953 | -fi | ||
| 954 | -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" | ||
| 955 | -if test -n "$GFORTRAN_FOR_TARGET"; then | ||
| 956 | - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 | ||
| 957 | -else | ||
| 958 | - echo "$ac_t""no" 1>&6 | ||
| 959 | -fi | ||
| 960 | - | ||
| 961 | - fi | ||
| 962 | - test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break | ||
| 963 | -done | ||
| 964 | - | ||
| 965 | -if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then | ||
| 966 | - set dummy gfortran | ||
| 967 | - if test $build = $target ; then | ||
| 968 | - GFORTRAN_FOR_TARGET="$2" | ||
| 969 | - else | ||
| 970 | - GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" | ||
| 971 | - fi | ||
| 972 | -fi | ||
| 973 | - | ||
| 974 | for ncn_progname in ld; do | ||
| 975 | if test -n "$ncn_target_tool_prefix"; then | ||
| 976 | # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. | ||
| 977 | @@ -5843,34 +5629,6 @@ | ||
| 978 | echo "$ac_t""pre-installed" 1>&6 | ||
| 979 | fi | ||
| 980 | fi | ||
| 981 | -echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6 | ||
| 982 | -echo "configure:5848: checking where to find the target gfortran" >&5 | ||
| 983 | -if test "x${build}" != "x${host}" ; then | ||
| 984 | - # Canadian cross, just use what we found | ||
| 985 | - echo "$ac_t""pre-installed" 1>&6 | ||
| 986 | -else | ||
| 987 | - ok=yes | ||
| 988 | - case " ${configdirs} " in | ||
| 989 | - *" gcc "*) ;; | ||
| 990 | - *) ok=no ;; | ||
| 991 | - esac | ||
| 992 | - case ,${enable_languages}, in | ||
| 993 | - *,fortran,*) ;; | ||
| 994 | - *) ok=no ;; | ||
| 995 | - esac | ||
| 996 | - if test $ok = yes; then | ||
| 997 | - # An in-tree tool is available and we can use it | ||
| 998 | - GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' | ||
| 999 | - echo "$ac_t""just compiled" 1>&6 | ||
| 1000 | - elif test "x$target" = "x$host"; then | ||
| 1001 | - # We can use an host tool | ||
| 1002 | - GFORTRAN_FOR_TARGET='$(GFORTRAN)' | ||
| 1003 | - echo "$ac_t""host tool" 1>&6 | ||
| 1004 | - else | ||
| 1005 | - # We need a cross tool | ||
| 1006 | - echo "$ac_t""pre-installed" 1>&6 | ||
| 1007 | - fi | ||
| 1008 | -fi | ||
| 1009 | echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6 | ||
| 1010 | echo "configure:5876: checking where to find the target ld" >&5 | ||
| 1011 | if test "x${build}" != "x${host}" ; then | ||
| 1012 | @@ -6413,7 +6171,6 @@ | ||
| 1013 | s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g | ||
| 1014 | s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g | ||
| 1015 | s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g | ||
| 1016 | -s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g | ||
| 1017 | s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g | ||
| 1018 | s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g | ||
| 1019 | s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g | ||
| 1020 | |||
| 1021 | --- tmp/config-ml.in.orig 2006-09-06 10:27:49.000000000 +0100 | ||
| 1022 | +++ tmp/config-ml.in 2006-09-06 10:27:49.000000000 +0100 | ||
| 1023 | @@ -785,14 +785,12 @@ | ||
| 1024 | break | ||
| 1025 | fi | ||
| 1026 | done | ||
| 1027 | - ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"' | ||
| 1028 | + ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GCJ="${GCJ_}$flags"' | ||
| 1029 | |||
| 1030 | if [ "${with_target_subdir}" = "." ]; then | ||
| 1031 | CC_=$CC' ' | ||
| 1032 | CXX_=$CXX' ' | ||
| 1033 | - F77_=$F77' ' | ||
| 1034 | GCJ_=$GCJ' ' | ||
| 1035 | - GFORTRAN_=$GFORTRAN' ' | ||
| 1036 | else | ||
| 1037 | # Create a regular expression that matches any string as long | ||
| 1038 | # as ML_POPDIR. | ||
| 1039 | @@ -821,18 +819,6 @@ | ||
| 1040 | esac | ||
| 1041 | done | ||
| 1042 | |||
| 1043 | - F77_= | ||
| 1044 | - for arg in ${F77}; do | ||
| 1045 | - case $arg in | ||
| 1046 | - -[BIL]"${ML_POPDIR}"/*) | ||
| 1047 | - F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; | ||
| 1048 | - "${ML_POPDIR}"/*) | ||
| 1049 | - F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; | ||
| 1050 | - *) | ||
| 1051 | - F77_="${F77_}${arg} " ;; | ||
| 1052 | - esac | ||
| 1053 | - done | ||
| 1054 | - | ||
| 1055 | GCJ_= | ||
| 1056 | for arg in ${GCJ}; do | ||
| 1057 | case $arg in | ||
| 1058 | @@ -845,18 +831,6 @@ | ||
| 1059 | esac | ||
| 1060 | done | ||
| 1061 | |||
| 1062 | - GFORTRAN_= | ||
| 1063 | - for arg in ${GFORTRAN}; do | ||
| 1064 | - case $arg in | ||
| 1065 | - -[BIL]"${ML_POPDIR}"/*) | ||
| 1066 | - GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; | ||
| 1067 | - "${ML_POPDIR}"/*) | ||
| 1068 | - GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; | ||
| 1069 | - *) | ||
| 1070 | - GFORTRAN_="${GFORTRAN_}${arg} " ;; | ||
| 1071 | - esac | ||
| 1072 | - done | ||
| 1073 | - | ||
| 1074 | if test "x${LD_LIBRARY_PATH+set}" = xset; then | ||
| 1075 | LD_LIBRARY_PATH_= | ||
| 1076 | for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch deleted file mode 100644 index bd3197dc67..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | --- | ||
| 3 | configure | 2 +- | ||
| 4 | configure.in | 2 +- | ||
| 5 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 6 | |||
| 7 | --- gcc-2006q1.orig/configure | ||
| 8 | +++ gcc-2006q1/configure | ||
| 9 | @@ -3453,11 +3453,11 @@ case " $build_configdirs " in | ||
| 10 | *) | ||
| 11 | |||
| 12 | # For an installed makeinfo, we require it to be from texinfo 4.2 or | ||
| 13 | # higher, else we use the "missing" dummy. | ||
| 14 | if ${MAKEINFO} --version \ | ||
| 15 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then | ||
| 16 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
| 17 | : | ||
| 18 | else | ||
| 19 | MAKEINFO="$MISSING makeinfo" | ||
| 20 | fi | ||
| 21 | ;; | ||
| 22 | --- gcc-2006q1.orig/configure.in | ||
| 23 | +++ gcc-2006q1/configure.in | ||
| 24 | @@ -2078,11 +2078,11 @@ case " $build_configdirs " in | ||
| 25 | *) | ||
| 26 | changequote(,) | ||
| 27 | # For an installed makeinfo, we require it to be from texinfo 4.2 or | ||
| 28 | # higher, else we use the "missing" dummy. | ||
| 29 | if ${MAKEINFO} --version \ | ||
| 30 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then | ||
| 31 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
| 32 | : | ||
| 33 | else | ||
| 34 | MAKEINFO="$MISSING makeinfo" | ||
| 35 | fi | ||
| 36 | ;; | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch deleted file mode 100644 index 88b0611a2f..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | --- gcc-3.4.4/configure.in.orig 2005-08-09 19:57:51.504323183 -0700 | ||
| 4 | +++ gcc-3.4.4/configure.in 2005-08-09 20:00:12.073168623 -0700 | ||
| 5 | @@ -1907,7 +1907,7 @@ | ||
| 6 | *) gxx_include_dir=${with_gxx_include_dir} ;; | ||
| 7 | esac | ||
| 8 | |||
| 9 | -FLAGS_FOR_TARGET= | ||
| 10 | +FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" | ||
| 11 | case " $target_configdirs " in | ||
| 12 | *" newlib "*) | ||
| 13 | case " $target_configargs " in | ||
| 14 | --- gcc-3.4.4/configure.orig 2005-08-09 21:02:29.668360660 -0700 | ||
| 15 | +++ gcc-3.4.4/configure 2005-08-09 21:02:50.157649970 -0700 | ||
| 16 | @@ -2669,7 +2669,7 @@ | ||
| 17 | *) gxx_include_dir=${with_gxx_include_dir} ;; | ||
| 18 | esac | ||
| 19 | |||
| 20 | -FLAGS_FOR_TARGET= | ||
| 21 | +FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" | ||
| 22 | case " $target_configdirs " in | ||
| 23 | *" newlib "*) | ||
| 24 | case " $target_configargs " in | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch deleted file mode 100644 index 5738a470ff..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch +++ /dev/null | |||
| @@ -1,97 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | ARM is the only architecture that has a helper function that returns | ||
| 4 | an unbiased result. This fix is trivial enough that we can show it | ||
| 5 | doesn't effect any of the other arches. Can we consider this a | ||
| 6 | regression fix since it used to work until the helper was added :} | ||
| 7 | |||
| 8 | Tested with no regressions on x86_64-pc-linux-gnu and arm-none-eabi. | ||
| 9 | |||
| 10 | Cheers, | ||
| 11 | Carlos. | ||
| 12 | -- | ||
| 13 | Carlos O'Donell | ||
| 14 | CodeSourcery | ||
| 15 | carlos@codesourcery.com | ||
| 16 | (650) 331-3385 x716 | ||
| 17 | |||
| 18 | gcc/ | ||
| 19 | |||
| 20 | 2006-01-27 Carlos O'Donell <carlos@codesourcery.com> | ||
| 21 | |||
| 22 | * optabs.c (prepare_cmp_insn): If unbaised and unsigned then bias | ||
| 23 | the comparison routine return. | ||
| 24 | |||
| 25 | gcc/testsuite/ | ||
| 26 | |||
| 27 | 2006-01-27 Carlos O'Donell <carlos@codesourcery.com> | ||
| 28 | |||
| 29 | * gcc.dg/unsigned-long-compare.c: New test. | ||
| 30 | |||
| 31 | Index: gcc/optabs.c | ||
| 32 | =================================================================== | ||
| 33 | --- 1/gcc/optabs.c (revision 110300) | ||
| 34 | +++ 2/gcc/optabs.c (working copy) | ||
| 35 | @@ -3711,18 +3711,24 @@ | ||
| 36 | result = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST_MAKE_BLOCK, | ||
| 37 | word_mode, 2, x, mode, y, mode); | ||
| 38 | |||
| 39 | + /* There are two kinds of comparison routines. Biased routines | ||
| 40 | + return 0/1/2, and unbiased routines return -1/0/1. Other parts | ||
| 41 | + of gcc expect that the comparison operation is equivalent | ||
| 42 | + to the modified comparison. For signed comparisons compare the | ||
| 43 | + result against 1 in the unbiased case, and zero in the biased | ||
| 44 | + case. For unsigned comparisons always compare against 1 after | ||
| 45 | + biasing the unbased result by adding 1. This gives us a way to | ||
| 46 | + represent LTU. */ | ||
| 47 | *px = result; | ||
| 48 | *pmode = word_mode; | ||
| 49 | - if (TARGET_LIB_INT_CMP_BIASED) | ||
| 50 | - /* Integer comparison returns a result that must be compared | ||
| 51 | - against 1, so that even if we do an unsigned compare | ||
| 52 | - afterward, there is still a value that can represent the | ||
| 53 | - result "less than". */ | ||
| 54 | - *py = const1_rtx; | ||
| 55 | - else | ||
| 56 | + *py = const1_rtx; | ||
| 57 | + | ||
| 58 | + if (!TARGET_LIB_INT_CMP_BIASED) | ||
| 59 | { | ||
| 60 | - *py = const0_rtx; | ||
| 61 | - *punsignedp = 1; | ||
| 62 | + if (*punsignedp) | ||
| 63 | + *px = plus_constant (result, 1); | ||
| 64 | + else | ||
| 65 | + *py = const0_rtx; | ||
| 66 | } | ||
| 67 | return; | ||
| 68 | } | ||
| 69 | Index: gcc/testsuite/gcc.dg/unsigned-long-compare.c | ||
| 70 | =================================================================== | ||
| 71 | --- 1/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) | ||
| 72 | +++ 2/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) | ||
| 73 | @@ -0,0 +1,24 @@ | ||
| 74 | +/* Copyright (C) 2006 Free Software Foundation, Inc. */ | ||
| 75 | +/* Contributed by Carlos O'Donell on 2006-01-27 */ | ||
| 76 | + | ||
| 77 | +/* Test a division corner case where the expression simplifies | ||
| 78 | + to a comparison, and the optab expansion is wrong. The optab | ||
| 79 | + expansion emits a function whose return is unbiased and needs | ||
| 80 | + adjustment. */ | ||
| 81 | +/* Origin: Carlos O'Donell <carlos@codesourcery.com> */ | ||
| 82 | +/* { dg-do run { target arm-*-*eabi* } } */ | ||
| 83 | +/* { dg-options "" } */ | ||
| 84 | +#include <stdlib.h> | ||
| 85 | + | ||
| 86 | +#define BIG_CONSTANT 0xFFFFFFFF80000000ULL | ||
| 87 | + | ||
| 88 | +int main (void) | ||
| 89 | +{ | ||
| 90 | + unsigned long long OneULL = 1ULL; | ||
| 91 | + unsigned long long result; | ||
| 92 | + | ||
| 93 | + result = OneULL / BIG_CONSTANT; | ||
| 94 | + if (result) | ||
| 95 | + abort (); | ||
| 96 | + exit (0); | ||
| 97 | +} | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch deleted file mode 100644 index c78e8313b6..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | The patch below fixes a crash building libgfortran on arm-linux-gnueabi. | ||
| 4 | |||
| 5 | This target doesn't really have a 128-bit integer type, however it does use | ||
| 6 | TImode to represent the return value of certain special ABI defined library | ||
| 7 | functions. This results in type_for_size(TImode) being called. | ||
| 8 | |||
| 9 | Because TImode deosn't correspond to any gfortran integer kind | ||
| 10 | gfc_type_for_size returns NULL and we segfault shortly after. | ||
| 11 | |||
| 12 | The patch below fixes this by making gfc_type_for_size handle TImode in the | ||
| 13 | same way as the C frontend. | ||
| 14 | |||
| 15 | Tested on x86_64-linux and arm-linux-gnueabi. | ||
| 16 | Applied to trunk. | ||
| 17 | |||
| 18 | Paul | ||
| 19 | |||
| 20 | 2007-05-15 Paul Brook <paul@codesourcery.com> | ||
| 21 | |||
| 22 | gcc/fortran/ | ||
| 23 | * trans-types.c (gfc_type_for_size): Handle signed TImode. | ||
| 24 | |||
| 25 | Index: gcc-4.2.1/gcc/fortran/trans-types.c | ||
| 26 | =================================================================== | ||
| 27 | --- gcc-4.2.1/gcc/fortran/trans-types.c (revision 170435) | ||
| 28 | +++ gcc-4.2.1/gcc/fortran/trans-types.c (working copy) | ||
| 29 | @@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un | ||
| 30 | if (type && bits == TYPE_PRECISION (type)) | ||
| 31 | return type; | ||
| 32 | } | ||
| 33 | + | ||
| 34 | + /* Handle TImode as a special case because it is used by some backends | ||
| 35 | + (eg. ARM) even though it is not available for normal use. */ | ||
| 36 | +#if HOST_BITS_PER_WIDE_INT >= 64 | ||
| 37 | + if (bits == TYPE_PRECISION (intTI_type_node)) | ||
| 38 | + return intTI_type_node; | ||
| 39 | +#endif | ||
| 40 | } | ||
| 41 | else | ||
| 42 | { | ||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch deleted file mode 100644 index 1695582954..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Index: gcc-4.0.2/gcc/c-incpath.c | ||
| 4 | =================================================================== | ||
| 5 | --- gcc-4.0.2.orig/gcc/c-incpath.c 2005-01-23 16:05:27.000000000 +0100 | ||
| 6 | +++ gcc-4.0.2/gcc/c-incpath.c 2006-05-15 21:23:02.000000000 +0200 | ||
| 7 | @@ -350,6 +350,26 @@ | ||
| 8 | p->construct = 0; | ||
| 9 | p->user_supplied_p = user_supplied_p; | ||
| 10 | |||
| 11 | +#ifdef CROSS_COMPILE | ||
| 12 | + /* A common error when cross compiling is including | ||
| 13 | + host headers. This code below will try to fail fast | ||
| 14 | + for cross compiling. Currently we consider /usr/include, | ||
| 15 | + /opt/include and /sw/include as harmful. */ | ||
| 16 | + { | ||
| 17 | + /* printf("Adding Path: %s\n", p->name ); */ | ||
| 18 | + if( strstr(p->name, "/usr/include" ) == p->name ) { | ||
| 19 | + fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); | ||
| 20 | + abort(); | ||
| 21 | + } else if( strstr(p->name, "/sw/include") == p->name ) { | ||
| 22 | + fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); | ||
| 23 | + abort(); | ||
| 24 | + } else if( strstr(p->name, "/opt/include") == p->name ) { | ||
| 25 | + fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); | ||
| 26 | + abort(); | ||
| 27 | + } | ||
| 28 | + } | ||
| 29 | +#endif | ||
| 30 | + | ||
| 31 | add_cpp_dir_path (p, chain); | ||
| 32 | } | ||
| 33 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch deleted file mode 100644 index b06de5458b..0000000000 --- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | upstream: n/a | ||
| 3 | comment: Use the preprocessor we have just compiled instead the one of | ||
| 4 | the system. There might be incompabilities between us and them. | ||
| 5 | |||
| 6 | Index: gcc-4.1.1/Makefile.in | ||
| 7 | =================================================================== | ||
| 8 | --- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 | ||
| 9 | +++ gcc-4.1.1/Makefile.in 2006-08-06 13:32:46.000000000 +0200 | ||
| 10 | @@ -194,6 +194,7 @@ | ||
| 11 | AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ | ||
| 12 | CC="$(CC_FOR_TARGET)"; export CC; \ | ||
| 13 | CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ | ||
| 14 | + CPP="$(CC_FOR_TARGET) -E"; export CCP; \ | ||
| 15 | CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ | ||
| 16 | CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ | ||
| 17 | CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ | ||
diff --git a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb deleted file mode 100644 index 5bb8e58dcd..0000000000 --- a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | require gcc-${PV}.inc | ||
| 2 | require gcc-configure-target.inc | ||
| 3 | require gcc-package-target.inc | ||
