Re: libgcc move to the top level

[Daniel Jacobowitz <drow@false.org>]

[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]

On Wed, Dec 20, 2006 at 08:56:39AM +0100, Paolo Bonzini wrote:
> >>If possible, I would like a proof of concept that it is possible to 
> >>migrate the building of the extra parts incrementally without breaking 
> >>non-converted targets, before committing (unless another maintainer 
> >>overrules me).
> >
> >OK, I'll do that (later).
> 
> Just to make it clearer, I'm ok with having to convert a directory at a 
> time (arm, rs6000, i386, ...).  So, if your proof-of-concept works only 
> with one target, but breaks only those targets that share the same cpu 
> directory, I'm fine with this.

I'd rather have it break nothing.  So that's what I did.  Of course,
the risk of collateral damage here is quite high; our configuration is
a terrible maze today.  So, I have not removed any information about
which startfiles to build from the gcc directory yet.  If information
is provided by both the gcc and libgcc configury, then they are
compared and there will be loud failure if they differ.

The attached two patches correct some omissions in my previous
config.host file, and move building of EXTRA_PARTS to the libgcc
subdirectory for all GNU/Linux targets.  It involves updating
config.host to indicate which parts, and adding the necessary
rules.  The rules are similar to the ones in gcc/ with only
minor adjustments (for automatic dependency tracking, using $(CC),
removal of $(T), et cetera).  It's easy to do other targets.

Both patches committed to the branch.  Look good?

-- 
Daniel Jacobowitz
CodeSourcery

[-- Attachment #2: libgcc-extra-targets.patch --]
[-- Type: text/x-diff, Size: 1380 bytes --]

2006-12-28  Daniel Jacobowitz  <dan@codesourcery.com>

	* config.host: Add missed targets.

--- config.host	(revision 120094)
+++ config.host	(local)
@@ -162,6 +162,8 @@ case ${host} in
   ;;
 *-*-vxworks*)
   ;;
+*-*-elf)
+  ;;
 esac
 
 case ${host} in
@@ -214,6 +216,8 @@ arm*-*-eabi* | arm*-*-symbianelf* )
 	;;
 arm*-*-rtems*)
 	;;
+arm*-*-elf | ep9312-*-elf)
+	;;
 arm*-wince-pe*)
 	;;
 arm-*-pe*)
@@ -291,6 +295,8 @@ x86_64-*-freebsd*)
 	;;
 i[34567]86-*-netbsdelf*)
 	;;
+i[34567]86-*-netbsd*)
+	;;
 x86_64-*-netbsd*)
 	;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
@@ -301,6 +307,8 @@ i[34567]86-*-coff*)
 	;;
 i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
 	;;
+x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+	;;
 i[34567]86-*-gnu*)
 	;;
 i[34567]86-pc-msdosdjgpp*)
@@ -338,8 +346,12 @@ i[34567]86-*-interix3*)
 	;;
 i[34567]86-*-kaos*)
 	;;
+ia64*-*-elf*)
+	;;
 ia64*-*-freebsd*)
 	;;
+ia64*-*-linux*)
+	;;
 ia64*-*-hpux*)
 	;;
 iq2000*-*-elf*)
@@ -384,6 +396,8 @@ mips*-*-netbsd*)			# NetBSD/mips, either
 	;;
 mips64*-*-linux*)
 	;;
+mips*-*-linux*)				# Linux MIPS, either endian.
+	;;
 mips*-*-openbsd*)
 	;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
@@ -534,6 +548,8 @@ sparc-*-rtems*)
 	;;
 sparc64-*-solaris2* | sparcv9-*-solaris2*)
 	;;
+sparc-*-solaris2*)
+	;;
 sparc-*-sysv4*)
 	;;
 sparc64-*-elf*)

[-- Attachment #3: libgcc-move-crtbegin.patch --]
[-- Type: text/x-diff, Size: 15077 bytes --]

2006-12-28  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.in (GCC_EXTRA_PARTS): New.
	(libgcc.mvars): Use it.  Also record CRTSTUFF_CFLAGS,
	CRTSTUFF_T_CFLAGS, and CRTSTUFF_T_CFLAGS_S.

2006-12-28  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.in (EXTRA_PARTS, compile_deps): New.
	(GCC_EXTRA_PARTS): Renamed from EXTRA_MULTILIB_PARTS.
	(gcc_compile): Use compile_deps.
	(ALL_CRT_CFLAGS, crt_compile, INSTALL_PARTS): New.
	(gcc-extra-parts): Renamed from extra-parts.
	(extra-parts, crtbegin.o, crtbeginS.o, crtbeginT.o, crtend.o)
	(crtendS.o): New rules.
	(intstall): Use INSTALL_PARTS.
	* config/i386/t-crtfm, config/alpha/t-crtfm, config/ia64/t-ia64,
	libgcc/config/sparc/t-crtfm: New files.
	* config.host (extra_parts): New variable.  Set it and tmake_file in
	various GNU/Linux configurations.
	* configure.ac: Substitute extra_parts.
	* configure: Regenerated.

--- gcc/Makefile.in	(revision 120285)
+++ gcc/Makefile.in	(local)
@@ -1409,6 +1409,10 @@ LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
 srcdirify = $(patsubst $(srcdir)%,$$(gcc_srcdir)%,$(filter $(srcdir)%,$(1))) \
             $(patsubst %,$$(gcc_objdir)/%,$(filter-out $(srcdir)%,$(1)))
 
+# The distinction between these two variables is no longer relevant,
+# so we combine them.  Sort removes duplicates.
+GCC_EXTRA_PARTS := $(sort $(EXTRA_MULTILIB_PARTS) $(EXTRA_PARTS))
+
 libgcc-support: libgcc.mvars stmp-int-hdrs $(STMP_FIXPROTO) $(TCONFIG_H) \
 	$(MACHMODE_H) $(FPBIT) $(DPBIT) $(TPBIT) $(LIB2ADD) \
 	$(LIB2ADD_ST) $(LIB2ADDEH) gcov-iov.h $(SFP_MACHINE)
@@ -1445,8 +1449,7 @@ libgcc.mvars: config.status Makefile $(L
 	echo D64PBIT_FUNCS='$(D64PBIT_FUNCS)' >> tmp-libgcc.mvars
 	echo D128PBIT='$(D128PBIT)' >> tmp-libgcc.mvars
 	echo D128PBIT_FUNCS='$(D128PBIT_FUNCS)' >> tmp-libgcc.mvars
-	echo EXTRA_MULTILIB_PARTS = '$(EXTRA_MULTILIB_PARTS)' >> tmp-libgcc.mvars
-	echo EXTRA_PARTS = '$(EXTRA_PARTS)' >> tmp-libgcc.mvars
+	echo GCC_EXTRA_PARTS = '$(GCC_EXTRA_PARTS)' >> tmp-libgcc.mvars
 	echo SHLIB_LINK = '$(subst $(GCC_FOR_TARGET),$$(GCC_FOR_TARGET),$(SHLIB_LINK))' >> tmp-libgcc.mvars
 	echo SHLIB_INSTALL = '$(SHLIB_INSTALL)' >> tmp-libgcc.mvars
 	echo SHLIB_EXT = '$(SHLIB_EXT)' >> tmp-libgcc.mvars
@@ -1456,6 +1459,9 @@ libgcc.mvars: config.status Makefile $(L
 	echo SHLIB_NM_FLAGS = '$(SHLIB_NM_FLAGS)' >> tmp-libgcc.mvars
 	echo ASM_HIDDEN_OP = '$(ASM_HIDDEN_OP)' >> tmp-libgcc.mvars
 	echo LIBGCC2_CFLAGS = '$(LIBGCC2_CFLAGS)' >> tmp-libgcc.mvars
+	echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
+	echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
+	echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
 
 	mv tmp-libgcc.mvars libgcc.mvars
 
--- libgcc/Makefile.in	(revision 120285)
+++ libgcc/Makefile.in	(local)
@@ -38,6 +38,10 @@ decimal_float = @decimal_float@
 
 host_noncanonical = @host_noncanonical@
 
+# List of extra object files that should be compiled for this target machine.
+# The rules for compiling them should be in the t-* file for the machine.
+EXTRA_PARTS = @extra_parts@
+
 # Multilib support variables.
 MULTISRCTOP =
 MULTIBUILDTOP =
@@ -203,7 +207,8 @@ inst_libdir = $(libsubdir)$(MULTISUBDIR)
 inst_slibdir = $(slibdir)$(MULTIOSSUBDIR)
 
 gcc_compile_bare = $(CC) $(INTERNAL_CFLAGS)
-gcc_compile = $(gcc_compile_bare) -o $@ -MT $@ -MD -MP -MF $(basename $@).dep
+compile_deps = -MT $@ -MD -MP -MF $(basename $@).dep
+gcc_compile = $(gcc_compile_bare) -o $@ $(compile_deps)
 gcc_s_compile = $(gcc_compile) -DSHARED
 
 objects = $(filter %$(objext),$^)
@@ -269,11 +274,12 @@ vis_hide =
 gen-hide-list = echo > \$@
 endif
 
-# The distinction between these two variables is no longer relevant.
-EXTRA_MULTILIB_PARTS := $(sort $(EXTRA_MULTILIB_PARTS) $(EXTRA_PARTS))
-
-ifneq ($(EXTRA_MULTILIB_PARTS),)
+ifneq ($(EXTRA_PARTS),)
   extra-parts = extra-parts
+else
+ifneq ($(GCC_EXTRA_PARTS),)
+  extra-parts = gcc-extra-parts
+endif
 endif
 
 # Library members defined in libgcc2.c.
@@ -647,10 +653,66 @@ libunwind$(SHLIB_EXT): $(libunwind-s-obj
 
 endif
 
-extra-parts:
+# Build the standard GCC startfiles and endfiles.
+ALL_CRT_CFLAGS = $(CFLAGS) $(CRTSTUFF_CFLAGS) $(INCLUDES)
+crt_compile = $(CC) $(ALL_CRT_CFLAGS) -o $@ $(compile_deps)
+
+ifeq ($(CUSTOM_CRTSTUFF),)
+crtbegin.o: $(gcc_srcdir)/crtstuff.c
+	$(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN
+
+crtend.o: $(gcc_srcdir)/crtstuff.c
+	$(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_END
+
+# These are versions of crtbegin and crtend for shared libraries.
+crtbeginS.o: $(gcc_srcdir)/crtstuff.c
+	$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O
+
+crtendS.o: $(gcc_srcdir)/crtstuff.c
+	$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_END -DCRTSTUFFS_O
+
+# This is a version of crtbegin for -static links.
+crtbeginT.o: $(gcc_srcdir)/crtstuff.c
+	$(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
+endif
+
+# Build extra startfiles in the libgcc directory.
+extra-parts: $(EXTRA_PARTS)
+ifneq ($(GCC_EXTRA_PARTS),)
+ifneq ($(sort $(EXTRA_PARTS)),$(GCC_EXTRA_PARTS))
+	# If the gcc directory specifies which extra parts to
+	# build for this target, and the libgcc configuration also
+	# specifies, make sure they match.  This can be removed
+	# when the gcc directory no longer holds libgcc configuration;
+	# it is useful when migrating a target.
+	@echo "Configuration mismatch!"
+	@echo "Extra parts from gcc directory: $(GCC_EXTRA_PARTS)"
+	@echo "Extra parts from libgcc: $(EXTRA_PARTS)"
+	exit 1
+endif
+endif
+
+	# Early copyback; see "all" above for the rationale.  The
+	# early copy is necessary so that the gcc -B options find
+	# the right startup files when linking shared libgcc.
+	$(mkinstalldirs) $(gcc_objdir)$(MULTISUBDIR)
+	parts="$(EXTRA_PARTS)";					\
+	for file in $$parts; do					\
+	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
+	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	done
+
+# Build extra startfiles in the gcc directory, for unconverted
+# targets.
+gcc-extra-parts:
 	# Recursively invoke make in the GCC directory to build any
 	# startfiles (for now).  We must do this just once, passing
-	# it all the EXTRA_MULTILIB_PARTS as simultaneous goal targets,
+	# it all the GCC_EXTRA_PARTS as simultaneous goal targets,
 	# so that rules which cannot execute simultaneously are properly
 	# serialized.  We indirect through T_TARGET in case any multilib
 	# directories contain an equals sign, to prevent make from
@@ -664,18 +726,17 @@ extra-parts:
 	&& $(MAKE) GCC_FOR_TARGET="$(CC)" \
 	  MULTILIB_CFLAGS="$(CFLAGS)" \
 	  T=$$T \
-	  T_TARGET="$(patsubst %,$${T}%,$(EXTRA_MULTILIB_PARTS))" \
+	  T_TARGET="$(patsubst %,$${T}%,$(GCC_EXTRA_PARTS))" \
 	  T_TARGET
 
 	# Early copyback; see "all" above for the rationale.  The
 	# early copy is necessary so that the gcc -B options find
 	# the right startup files when linking shared libgcc.
 	$(mkinstalldirs) $(gcc_objdir)$(MULTISUBDIR)
-	for file in dummy $(EXTRA_MULTILIB_PARTS); do		\
-	  if test $$file != dummy; then				\
-	    rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
-	    $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;\
-	  fi;							\
+	parts="$(GCC_EXTRA_PARTS)";				\
+	for file in $$parts; do					\
+	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
+	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
 	done
 
 all: $(extra-parts)
@@ -706,6 +767,12 @@ install-shared:
 		@shlib_base_name@,libgcc_s,$(subst \
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
 
+ifneq ($(EXTRA_PARTS),)
+  INSTALL_PARTS = $(EXTRA_PARTS)
+else
+  INSTALL_PARTS = $(GCC_EXTRA_PARTS)
+endif
+
 install: $(install-shared) $(install-libunwind)
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
 
@@ -716,11 +783,10 @@ install: $(install-shared) $(install-lib
 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
 
-	for file in dummy $(EXTRA_MULTILIB_PARTS); do		\
-	  if test $$file != dummy; then				\
-	    rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
-	  fi;							\
+	parts="$(INSTALL_PARTS)";				\
+	for file in $$parts; do					\
+	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
 	done
 
 .PHONY: install install-shared install-libunwind
--- libgcc/config/i386/t-crtfm	(revision 120285)
+++ libgcc/config/i386/t-crtfm	(local)
@@ -0,0 +1,2 @@
+crtfastmath.o: $(gcc_srcdir)/config/i386/crtfastmath.c
+	$(gcc_compile) -msse -c $(gcc_srcdir)/config/i386/crtfastmath.c
--- libgcc/config/alpha/t-crtfm	(revision 120285)
+++ libgcc/config/alpha/t-crtfm	(local)
@@ -0,0 +1,6 @@
+# FIXME drow/20061228 - I have preserved this -frandom-seed option
+# while migrating this rule from the GCC directory, but I do not
+# know why it is necessary if no other crt file uses it.
+crtfastmath.o: $(gcc_srcdir)/config/alpha/crtfastmath.c
+	$(gcc_compile) -frandom-seed=gcc-crtfastmath -c \
+		$(gcc_srcdir)/config/alpha/crtfastmath.c
--- libgcc/config/ia64/t-ia64	(revision 120285)
+++ libgcc/config/ia64/t-ia64	(local)
@@ -0,0 +1,18 @@
+CUSTOM_CRTSTUFF = yes
+
+# Assemble startup files.
+crtbegin.o: $(gcc_srcdir)/config/ia64/crtbegin.asm
+	$(CC) $(compile_deps) -I. -I$(gcc_objdir) -c -x assembler-with-cpp \
+		-o $@ $(gcc_srcdir)/config/ia64/crtbegin.asm
+crtend.o: $(gcc_srcdir)/config/ia64/crtend.asm
+	$(CC) $(compile_deps) -I. -I$(gcc_objdir) -c -x assembler-with-cpp \
+		-o $@ $(gcc_srcdir)/config/ia64/crtend.asm
+crtbeginS.o: $(gcc_srcdir)/config/ia64/crtbegin.asm
+	$(CC) $(compile_deps) -I. -I$(gcc_objdir) -c -x assembler-with-cpp \
+		-o $@ -DSHARED $(gcc_srcdir)/config/ia64/crtbegin.asm
+crtendS.o: $(gcc_srcdir)/config/ia64/crtend.asm
+	$(CC) $(compile_deps) -I. -I$(gcc_objdir) -c -x assembler-with-cpp \
+		-o $@ -DSHARED $(gcc_srcdir)/config/ia64/crtend.asm
+
+crtfastmath.o: $(gcc_srcdir)/config/ia64/crtfastmath.c
+	$(gcc_compile) -c $(gcc_srcdir)/config/ia64/crtfastmath.c
--- libgcc/config/sparc/t-crtfm	(revision 120285)
+++ libgcc/config/sparc/t-crtfm	(local)
@@ -0,0 +1,2 @@
+crtfastmath.o: $(gcc_srcdir)/config/sparc/crtfastmath.c
+	$(gcc_compile) -c $(gcc_srcdir)/config/sparc/crtfastmath.c
--- libgcc/config.host	(revision 120285)
+++ libgcc/config.host	(local)
@@ -41,10 +41,17 @@
 #
 #  cpu_type		The name of the cpu, if different from the first
 #			chunk of the canonical host name.
+#  extra_parts		List of extra object files that should be compiled
+#			for this target machine.  This may be overridden
+#			by setting EXTRA_PARTS in a tmake_file fragment.
+#			If either is set, EXTRA_PARTS and
+#			EXTRA_MULTILIB_PARTS inherited from the GCC
+#			subdirectory will be ignored.
 #  tmake_file		A list of machine-description-specific
 #			makefile-fragments, if different from
 #			"$cpu_type/t-$cpu_type".
 
+extra_parts=
 tmake_file=
 
 # Set default cpu_type so it can be updated in each machine entry.
@@ -151,6 +158,7 @@ case ${host} in
   ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
   # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
+  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
   ;;
 *-*-gnu*)
   ;;
@@ -177,6 +185,7 @@ case ${host} in
 alpha*-*-unicosmk*)
 	;;
 alpha*-*-linux*)
+	tmake_file="${tmake_file} alpha/t-crtfm"
 	;;
 alpha*-*-gnu*)
 	;;
@@ -306,8 +315,12 @@ i[34567]86-*-openbsd*)
 i[34567]86-*-coff*)
 	;;
 i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
+	extra_parts="$extra_parts crtfastmath.o"
+	tmake_file="${tmake_file} i386/t-crtfm"
 	;;
 x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+	extra_parts="$extra_parts crtfastmath.o"
+	tmake_file="${tmake_file} i386/t-crtfm"
 	;;
 i[34567]86-*-gnu*)
 	;;
@@ -351,6 +364,7 @@ ia64*-*-elf*)
 ia64*-*-freebsd*)
 	;;
 ia64*-*-linux*)
+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
 	;;
 ia64*-*-hpux*)
 	;;
@@ -543,6 +557,8 @@ sparc64-*-openbsd*)
 sparc-*-elf*)
 	;;
 sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
+	extra_parts="$extra_parts crtfastmath.o"
+	tmake_file="${tmake_file} sparc/t-crtfm"
 	;;
 sparc-*-rtems*)
 	;;
@@ -557,6 +573,8 @@ sparc64-*-elf*)
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
 	;;
 sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+	extra_parts="$extra_parts crtfastmath.o"
+	tmake_file="${tmake_file} sparc/t-crtfm"
 	;;
 sparc64-*-netbsd*)
 	;;
@@ -597,6 +615,7 @@ xtensa-*-elf*)
 xtensa-*-linux*)
 	;;
 am33_2.0-*-linux*)
+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	;;
 m32c-*-elf*)
  	;;
--- libgcc/configure	(revision 120285)
+++ libgcc/configure	(local)
@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="static-object.mk"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float tmake_file LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float tmake_file extra_parts LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3247,6 +3247,9 @@ done
 tmake_file="${tmake_file_}"
 
 
+# Substitute configuration variables
+
+
 # We need multilib support.
           ac_config_files="$ac_config_files Makefile"
 
@@ -3945,6 +3948,7 @@ s,@OBJEXT@,$OBJEXT,;t t
 s,@CPP@,$CPP,;t t
 s,@decimal_float@,$decimal_float,;t t
 s,@tmake_file@,$tmake_file,;t t
+s,@extra_parts@,$extra_parts,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
--- libgcc/configure.ac	(revision 120285)
+++ libgcc/configure.ac	(local)
@@ -111,6 +111,9 @@ done
 tmake_file="${tmake_file_}"
 AC_SUBST(tmake_file)
 
+# Substitute configuration variables
+AC_SUBST(extra_parts)
+
 # We need multilib support.
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_COMMANDS([default],