git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@1219 f8d472c7-5700-0410-ac5a-87979cec3adf

4 files changed, 36 insertions, 35 deletions

diff --git a/rules/cross-gcc-first.in b/rules/cross-gcc-first.in
index a3c82fa..a830d64 100644
--- a/rules/cross-gcc-first.in
+++ b/rules/cross-gcc-first.in
@@ -25,11 +25,3 @@ config CROSS_GCC_FIRST_EXTRA_CONFIG
 	prompt "extra configure options"
 	help
 	  Add these extra options to the first stage gcc configure script.
-
-#config CROSS_GCC_FIRST_EXTRA_ENV
-#	depends on CROSS_GCC_FIRST
-#	string
-#	prompt "extra environment"
-#	help
-#	  Add this to the first stage gcc environment.
-
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make
index 019986d..731e95e 100644
--- a/rules/cross-gcc-first.make
+++ b/rules/cross-gcc-first.make
@@ -74,10 +74,10 @@ CROSS_GCC_FIRST_AUTOCONF :=  \
 	$(call remove_quotes,$(PTXCONF_CROSS_GCC_FIRST_EXTRA_CONFIG)) \
 	\
         --disable-nls \
+	--disable-multilib \
         --enable-symvers=gnu \
         --enable-__cxa_atexit \
 	\
-	--disable-multilib \
         --disable-shared \
 	--disable-threads \
         --enable-languages=c
@@ -123,22 +123,34 @@ $(STATEDIR)/cross-gcc-first.compile: $(cross-gcc-first_compile_deps_default)
 		if test -d $(CROSS_GCC_FIRST_DIR)/libdecnumber; then \
 			$(MAKE) configure-libdecnumber && \
 			$(MAKE) $(PARALLELMFLAGS) all-libdecnumber; \
-		fi && \
-		$(MAKE) configure-gcc && \
-		$(MAKE) configure-libcpp && \
-		$(MAKE) configure-build-libiberty && \
-		$(MAKE) $(PARALLELMFLAGS) all-libcpp && \
-		$(MAKE) $(PARALLELMFLAGS) all-build-libiberty; \
+		fi
 
 	cd $(CROSS_GCC_FIRST_BUILDDIR) && $(CROSS_GCC_FIRST_PATH) \
-		$(MAKE) $(PARALLELMFLAGS) -C gcc libgcc.mk
+		$(MAKE) configure-gcc
 
-	export $(CROSS_GCC_FIRST_PATH); \
-	cd $(CROSS_GCC_FIRST_BUILDDIR) && \
-		if test '!' -f gcc/libgcc.mk-ORIG ; then \
-			cp -p gcc/libgcc.mk gcc/libgcc.mk-ORIG; \
-		fi && \
-		sed 's@-lc@@g' < gcc/libgcc.mk-ORIG > gcc/libgcc.mk
+	cd $(CROSS_GCC_FIRST_BUILDDIR) && $(CROSS_GCC_FIRST_PATH) \
+		$(MAKE) configure-libcpp
+
+	cd $(CROSS_GCC_FIRST_BUILDDIR) && $(CROSS_GCC_FIRST_PATH) \
+		$(MAKE) configure-build-libiberty
+
+	cd $(CROSS_GCC_FIRST_BUILDDIR) && $(CROSS_GCC_FIRST_PATH) \
+		$(MAKE) $(PARALLELMFLAGS) all-libcpp
+
+	cd $(CROSS_GCC_FIRST_BUILDDIR) && $(CROSS_GCC_FIRST_PATH) \
+		$(MAKE) $(PARALLELMFLAGS) all-build-libiberty
+
+	cd $(CROSS_GCC_FIRST_BUILDDIR)/gcc && $(CROSS_GCC_FIRST_PATH) \
+		$(MAKE) $(PARALLELMFLAGS) libgcc.mk
+
+
+	if test '!' -f $(CROSS_GCC_FIRST_BUILDDIR)/gcc/libgcc.mk-ORIG; then \
+		cp -p $(CROSS_GCC_FIRST_BUILDDIR)/gcc/libgcc.mk \
+			$(CROSS_GCC_FIRST_BUILDDIR)/gcc/libgcc.mk-ORIG; \
+	fi
+
+	sed 's@-lc@@g' < $(CROSS_GCC_FIRST_BUILDDIR)/gcc/libgcc.mk-ORIG \
+		> $(CROSS_GCC_FIRST_BUILDDIR)/gcc/libgcc.mk
 
 	cd $(CROSS_GCC_FIRST_BUILDDIR)/gcc && $(CROSS_GCC_FIRST_PATH) \
 		$(MAKE) tree-check.h
diff --git a/rules/cross-gcc-second.make b/rules/cross-gcc-second.make
index 09bc2cb..622885c 100644
--- a/rules/cross-gcc-second.make
+++ b/rules/cross-gcc-second.make
@@ -35,7 +35,7 @@ $(STATEDIR)/cross-gcc-second.get: $(STATEDIR)/cross-gcc-first.get
 
 cross-gcc-second_extract: $(STATEDIR)/cross-gcc-second.extract
 
-$(STATEDIR)/cross-gcc-second.extract: $(cross-gcc-second_extract_deps_default)
+$(STATEDIR)/cross-gcc-second.extract: $(cross-gcc-second_extract_deps_default) $(STATEDIR)/cross-gcc-first.extract
 	@$(call targetinfo, $@)
 	@$(call clean, $(CROSS_GCC_SECOND_BUILDDIR))
 	mkdir -p $(CROSS_GCC_SECOND_BUILDDIR)
@@ -61,10 +61,10 @@ CROSS_GCC_SECOND_AUTOCONF := \
 	$(call remove_quotes,$(PTXCONF_CROSS_GCC_FIRST_EXTRA_CONFIG)) \
 	\
         --disable-nls \
+	--disable-multilib \
 	--enable-symvers=gnu \
 	--enable-__cxa_atexit \
 	\
-	--disable-multilib \
 	--enable-shared \
 	--enable-threads=posix \
 	--enable-languages=$(PTXCONF_CROSS_GCC_SECOND_LANG) \
diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make
index 8b3d9c4..abc6f34 100644
--- a/rules/glibc-headers.make
+++ b/rules/glibc-headers.make
@@ -25,7 +25,7 @@ GLIBC_HEADERS_DIR	= $(BUILDDIR)/$(GLIBC)-headers
 
 glibc-headers_get: $(STATEDIR)/glibc-headers.get
 
-$(STATEDIR)/glibc-headers.get: $(glibc-headers_get_deps_default)
+$(STATEDIR)/glibc-headers.get: $(STATEDIR)/glibc.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -35,7 +35,7 @@ $(STATEDIR)/glibc-headers.get: $(glibc-headers_get_deps_default)
 
 glibc-headers_extract: $(STATEDIR)/glibc-headers.extract
 
-$(STATEDIR)/glibc-headers.extract: $(glibc-headers_extract_deps_default)
+$(STATEDIR)/glibc-headers.extract: $(glibc-headers_extract_deps_default) $(STATEDIR)/glibc.extract
 	@$(call targetinfo, $@)
 	@$(call clean, $(GLIBC_HEADERS_DIR))
 	mkdir -p $(GLIBC_HEADERS_DIR)
@@ -106,6 +106,12 @@ glibc-headers_compile: $(STATEDIR)/glibc-headers.compile
 
 $(STATEDIR)/glibc-headers.compile: $(glibc-headers_compile_deps_default)
 	@$(call targetinfo, $@)
+	cd $(GLIBC_HEADERS_DIR) && \
+		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
+		$(MAKE) sysdeps/gnu/errlist.c; \
+
+	mkdir -p $(GLIBC_HEADERS_DIR)/stdio-common
+	touch $(GLIBC_HEADERS_DIR)/stdio-common/errlist-compat.c
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -116,14 +122,6 @@ glibc-headers_install: $(STATEDIR)/glibc-headers.install
 
 $(STATEDIR)/glibc-headers.install: $(glibc-headers_install_deps_default)
 	@$(call targetinfo, $@)
-
-	cd $(GLIBC_HEADERS_DIR) && \
-		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
-		$(MAKE) sysdeps/gnu/errlist.c; \
-
-	mkdir -p $(GLIBC_HEADERS_DIR)/stdio-common
-	touch $(GLIBC_HEADERS_DIR)/stdio-common/errlist-compat.c
-
 	cd $(GLIBC_HEADERS_DIR) && \
 		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
 		$(MAKE) compiling=yes install_root=$(SYSROOT) install-headers
@@ -133,7 +131,6 @@ $(STATEDIR)/glibc-headers.install: $(glibc-headers_install_deps_default)
 
 	cp $(GLIBC_DIR)/include/features.h $(SYSROOT)/usr/include/features.h
 	cp $(GLIBC_HEADERS_DIR)/bits/stdio_lim.h $(SYSROOT)/usr/include/bits/stdio_lim.h
-
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------