- add gfortran support

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index c644bb654b534b57cb4c42b24125351fc60232c9..4e89487fbcb4230123498948703decec1c1ea560 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -127,8 +127,16 @@ config BR2_INSTALL_OBJC
        help
            Build/install Objective-C compiler and runtime?
 
+config BR2_INSTALL_FORTRAN
+       bool "Build/install Fortran compiler and runtime?"
+       default n
+       select BR2_PACKAGE_LIBMPFR
+       help
+           Build/install Fortran compiler and runtime?
+
 config BR2_GCC_SHARED_LIBGCC
        bool "Build/install a shared libgcc?"
        default y
        help
            Build/install a shared libgcc library
+

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index 913395b321d231e8e0b295c6fa37295962d5bff5..9a04a0f77b3bf738982f315a52b99f0b3b818d0e 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -51,8 +51,17 @@ ifeq ($(BR2_INSTALL_OBJC),y)
 TARGET_LANGUAGES:=$(TARGET_LANGUAGES),objc
 endif
 
+TARGET_PREREQ =
+STAGING_PREREQ= $(STAGING_DIR)/lib/libc.a
+
 ifeq ($(BR2_INSTALL_FORTRAN),y)
 TARGET_LANGUAGES:=$(TARGET_LANGUAGES),fortran
+TARGET_PREREQ += $(TARGET_DIR)/lib/libmpfr.so
+STAGING_PREREQ+= $(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.a
+GCC_WITH_TARGET_GMP:=--with-gmp=$(STAGING_DIR)
+GCC_WITH_TARGET_MPFR:=--with-mpfr=$(STAGING_DIR)
+GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR)
+GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)
 endif
 
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
@@ -61,6 +70,11 @@ else
 GCC_SHARED_LIBGCC:=--disable-shared
 endif
 
+ifneq ($(BR2_ENABLE_LOCALE),y)
+GCC_ENABLE_CLOCALE:=--disable-clocale
+endif
+
+
 #############################################################
 #
 # build the first pass gcc compiler
@@ -169,7 +183,7 @@ gcc_initial-dirclean:
 # guarantees.  mjn3
 
 GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
-$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/lib/libc.a
+$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_PREREQ)
        mkdir -p $(GCC_BUILD_DIR2)
        # Important!  Required for limits.h to be fixed.
        ln -snf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
@@ -184,6 +198,8 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/lib/libc.a
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
+               $(GCC_WITH_HOST_GMP) \
+               $(GCC_WITH_HOST_MPFR) \
                $(GCC_SHARED_LIBGCC) \
                $(DISABLE_NLS) \
                $(THREADS) \
@@ -311,6 +327,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
                --enable-target-optspace \
                --with-gnu-ld \
                $(GCC_SHARED_LIBGCC) \
+               $(GCC_WITH_HOST_GMP) \
+               $(GCC_WITH_HOST_MPFR) \
                $(DISABLE_NLS) \
                $(THREADS) \
                $(MULTILIB) \