Commit 3968d231 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- don't rely on buggy gmp/mpfr on the host but use our own build iff we are... 

- don't rely on buggy gmp/mpfr on the host but use our own build iff we are about to build a somewhat current toolchain.
parent 6440b9fd

package/gmp/gmp.mk

+8 −8
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ GMP_SITE:=http://ftp.sunet.se/pub/gnu/gmp/ 
GMP_CAT:=$(BZCAT)

GMP_DIR:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)

GMP_TARGET_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION)

GMP_BINARY:=libgmp.a

GMP_BINARY:=libgmp.so

GMP_LIBVERSION:=3.4.1



ifeq ($(BR2_ENDIAN),"BIG")
@@ -27,7 +27,7 @@ $(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE) 
	$(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch

	$(CONFIG_UPDATE) $(GMP_DIR)

	touch $(GMP_DIR)/.unpacked

	touch $@



$(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked

	mkdir -p $(GMP_TARGET_DIR)
@@ -54,7 +54,7 @@ $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked 
		--enable-shared \

		$(DISABLE_NLS) \

	);

	touch $(GMP_TARGET_DIR)/.configured

	touch $@



$(GMP_TARGET_DIR)/.libs/$(GMP_BINARY): $(GMP_TARGET_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(GMP_TARGET_DIR)
@@ -76,18 +76,18 @@ $(STAGING_DIR)/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY) 
	    mandir=$(STAGING_DIR)/man \

            -C $(GMP_TARGET_DIR) install



$(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION): $(STAGING_DIR)/lib/$(GMP_BINARY)

	cp -a $(STAGING_DIR)/lib/libgmp.so* $(STAGING_DIR)/lib/libgmp.a \

$(TARGET_DIR)/lib/libgmp.so $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/lib/libgmp.a: $(STAGING_DIR)/lib/$(GMP_BINARY)

	cp -dpf $(STAGING_DIR)/lib/libgmp.so* $(STAGING_DIR)/lib/libgmp.a \

		 $(TARGET_DIR)/lib/

ifeq ($(BR2_PACKAGE_LIBGMP_HEADERS),y)

	test -d $(TARGET_DIR)/usr/include || mkdir -p $(TARGET_DIR)/usr/include

	cp -a $(STAGING_DIR)/include/gmp.h $(TARGET_DIR)/usr/include/

	cp -dpf $(STAGING_DIR)/include/gmp.h $(TARGET_DIR)/usr/include/

endif

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgmp.so* \

		$(TARGET_DIR)/lib/libgmp.a



libgmp: uclibc $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION)

libgmp-stage: uclibc $(STAGING_DIR)/lib/$(GMP_BINARY)

stage-libgmp: uclibc $(STAGING_DIR)/lib/$(GMP_BINARY)



libgmp-clean:

	rm -f $(TARGET_DIR)/lib/$(GMP_BINARY) $(TARGET_DIR)/lib/libgmp.so* \
@@ -113,7 +113,7 @@ $(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked 
		--enable-static \

		$(DISABLE_NLS) \

	);

	touch $(GMP_DIR2)/.configured

	touch $@



$(GMP_HOST_DIR)/lib/$(GMP_BINARY): $(GMP_DIR2)/.configured

	$(MAKE) -C $(GMP_DIR2) install

package/mpfr/mpfr.mk

+8 −8
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ MPFR_CAT:=$(BZCAT) 
MPFR_SITE:=http://www.mpfr.org/mpfr-current/

MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)

MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)

MPFR_BINARY:=libmpfr.a

MPFR_BINARY:=libmpfr.so

MPFR_LIBVERSION:=1.0.1



ifeq ($(BR2_ENDIAN),"BIG")
@@ -33,7 +33,7 @@ ifneq ($(MPFR_PATCH),) 
	$(WGET) -P $(MPFR_DIR) $(MPFR_SITE)/$(MPFR_PATCH)

	( cd $(MPFR_DIR) ; patch -p1 < $(MPFR_PATCH) ; )

endif

	touch $(MPFR_DIR)/.unpacked

	touch $@



$(MPFR_TARGET_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/lib/$(GMP_BINARY)

	mkdir -p $(MPFR_TARGET_DIR)
@@ -83,18 +83,18 @@ $(STAGING_DIR)/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY) 
	    mandir=$(STAGING_DIR)/man \

	    -C $(MPFR_TARGET_DIR) install;



$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION): $(STAGING_DIR)/lib/$(MPFR_BINARY)

	cp -a $(STAGING_DIR)/lib/libmpfr.so* $(STAGING_DIR)/lib/libmpfr.a \

$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/lib/libmpfr.a: $(STAGING_DIR)/lib/$(MPFR_BINARY)

	cp -dpf $(STAGING_DIR)/lib/libmpfr.so* $(STAGING_DIR)/lib/libmpfr.a \

		$(TARGET_DIR)/lib/

ifeq ($(BR2_PACKAGE_LIBMPFR_HEADERS),y)

	cp -a $(STAGING_DIR)/include/mpfr.h $(STAGING_DIR)/include/mpf2mpfr.h \

	cp -dpf $(STAGING_DIR)/include/mpfr.h $(STAGING_DIR)/include/mpf2mpfr.h \

		$(TARGET_DIR)/usr/include/

endif

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libmpfr.so* \

		$(TARGET_DIR)/lib/libmpfr.a



libmpfr: uclibc libgmp $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION)

libmpfr-stage: uclibc $(STAGING_DIR)/lib/$(MPFR_BINARY)

libmpfr: uclibc $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION)

stage-libmpfr: uclibc $(STAGING_DIR)/lib/$(MPFR_BINARY)



libmpfr-clean:

	rm -f $(TARGET_DIR)/lib/$(MPFR_BINARY) $(TARGET_DIR)/lib/libmpfr.so* \
@@ -105,7 +105,7 @@ libmpfr-clean: 
libmpfr-dirclean:

	rm -rf $(MPFR_TARGET_DIR)



MPFR_DIR2:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)

MPFR_DIR2:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)-host

MPFR_HOST_DIR:=$(TOOL_BUILD_DIR)/mpfr

$(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_BINARY)

	mkdir -p $(MPFR_DIR2)

toolchain/binutils/binutils.mk

+22 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION)))

#"))



EXTRA_BINUTILS_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS)))

EXTRA_BINUTILS_CONFIG_OPTIONS=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS)))

#"))

BINUTILS_SITE:=ftp://ftp.kernel.org/pub/linux/devel/binutils

ifeq ($(BINUTILS_VERSION),2.17)
@@ -31,6 +31,23 @@ ifeq ($(BINUTILS_VERSION),2.15.97) 
BINUTILS_SITE:=ftp://sources.redhat.com/pub/binutils/snapshots/

endif



# We do not rely on the host's gmp/mpfr but use a known working one

BINUTILS_HOST_PREREQ:= #nothing

BINUTILS_TARGET_PREREQ:= #nothing

ifeq ($(BR2_BINUTILS_VERSION_2_17_50_0_9),y)



BINUTILS_HOST_PREREQ:=$(TOOL_BUILD_DIR)/gmp/lib/libgmp.so \

	$(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so



BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/lib/libgmp.so \

	$(TARGET_DIR)/lib/libmpfr.so

EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp="$(GMP_HOST_DIR)"

EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)"



BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)"

BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"

endif



BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2

BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)

BINUTILS_CAT:=$(BZCAT)
@@ -53,7 +70,7 @@ $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked 
	toolchain/patch-kernel.sh $(BINUTILS_DIR) toolchain/binutils/$(BINUTILS_VERSION) \*.patch

	touch $(BINUTILS_DIR)/.patched



$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched

$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched $(BINUTILS_HOST_PREREQ)

	mkdir -p $(BINUTILS_DIR1)

	(cd $(BINUTILS_DIR1); \

		CC="$(HOSTCC)" \
@@ -98,7 +115,7 @@ binutils-dirclean: 
#

#############################################################

BINUTILS_DIR2:=$(BUILD_DIR)/binutils-$(BINUTILS_VERSION)-target

$(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched

$(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(BINUTILS_TARGET_PREREQ)

	mkdir -p $(BINUTILS_DIR2)

	(cd $(BINUTILS_DIR2); \

		CC_FOR_BUILD="$(HOSTCC)" \
@@ -113,6 +130,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched 
		--target=$(REAL_GNU_TARGET_NAME) \

		$(DISABLE_NLS) \

		$(MULTILIB) \

		$(BINUTILS_TARGET_CONFIG_OPTIONS) \

		--disable-werror \

		$(SOFT_FLOAT_CONFIG_OPTION) );

	touch $(BINUTILS_DIR2)/.configured
@@ -131,7 +149,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump 
	-$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1

	-$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1



binutils_target: $(GCC_DEPENDANCY) $(TARGET_DIR)/usr/bin/ld

binutils_target: $(TARGET_DIR)/usr/bin/ld



binutils_target-clean:

	(cd $(TARGET_DIR)/usr/bin; \

toolchain/gcc/4.2/900-gengtype-verbose-error.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Index: gcc-4.2/gcc/gengtype-lex.l

===================================================================

--- gcc-4.2/gcc/gengtype-lex.l	(revision 121000)

+++ gcc-4.2/gcc/gengtype-lex.l	(working copy)

@@ -535,13 +535,19 @@

 macro_input (char *buffer, unsigned size)

 {

   unsigned result;

+  int old_errno;

 

   result = fread (buffer, 1, size, yyin);

+  old_errno = errno;

   if (result)

     /*NOP*/;

-  else if (ferror (yyin))

-    YY_FATAL_ERROR ("read of source file failed");

-  else if (macro_expns)

+  else if (ferror (yyin)) {

+    char *err_msg;

+    err_msg = xasprintf ("read of source file '%s:%d' failed",

+    			lexer_line.file,

+    			lexer_line.line);

+    YY_FATAL_ERROR (err_msg);

+  } else if (macro_expns)

     {

       const char *expn;

       unsigned len;

toolchain/gcc/Config.in

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ config BR2_INSTALL_FORTRAN 
	select BR2_PACKAGE_LIBMPFR

	help

	    Build/install Fortran compiler and runtime?

	    Note that it is highly recommended NOT to use gfortran

	    from gcc older than 4.2.0



	    You have been warned..



config BR2_GCC_SHARED_LIBGCC

	bool "Build/install a shared libgcc?"