PR fortran/31546

	* (configure.ac): Add --enable-intermodule for onestep build.
	* (Makefile.am): Handle onestep build.
	* (configure, Makefile.in): Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128654 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 594 insertions, 31 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 79c7e137ba1..7452bb66780 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-21  Bernhard Fischer  <aldot>
+
+	PR fortran/31546
+	* (configure.ac): Add --enable-intermodule for onestep build.
+	* (Makefile.am): Handle onestep build.
+	* (configure, Makefile.in): Regenerate.
+
 2007-09-21  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR libfortran/26253
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index aa2629e2d2d..16fcd1f9da3 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -645,9 +645,41 @@ selected_real_kind.lo selected_int_kind.lo: AM_FCFLAGS += -fallow-leading-unders
 
 BUILT_SOURCES=$(gfor_built_src) $(gfor_built_specific_src) \
     $(gfor_built_specific2_src) $(gfor_misc_specifics)
-libgfortran_la_SOURCES = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \
+
+prereq_SRC = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \
     $(gfor_helper_src) $(gfor_io_headers) $(gfor_specific_src)
 
+if onestep
+# dummy sources for libtool
+BUILT_SOURCES+=libgfortran_c.c libgfortran_f.f90
+libgfortran_c.c libgfortran_f.f90 libgfortran_F.F90:
+	echo > $@
+# overrides for libtool perusing the dummy sources
+libgfortran_c.o: $(filter %.c,$(prereq_SRC))
+	$(COMPILE) -c $^ -o $@ -combine
+
+libgfortran_c.lo: $(filter %.c,$(prereq_SRC))
+	$(LTCOMPILE) -c -o $@ $^ -combine
+
+#libgfortran_f.o: $(filter %.f %.f90,$(prereq_SRC))
+#	$(FCCOMPILE) -c $^ -o $@ -combine
+
+#libgfortran_f.lo: $(filter %.f %.f90,$(prereq_SRC))
+#	$(LTFCCOMPILE) -c -o $@ $^ -combine
+# not currently used:
+#libgfortran_F.o: $(filter %.F %.F90,$(prereq_SRC))
+#	$(PPFCCOMPILE) -c $^ -o $@ -combine
+#
+#libgfortran_F.lo: 
+#	$(LTPPFCCOMPILE) -c -o $@ $^ -combine
+
+libgfortran_la_SOURCES = libgfortran_c.c $(filter-out %.c,$(prereq_SRC))
+
+else
+libgfortran_la_SOURCES = $(prereq_SRC)
+
+endif
+
 I_M4_DEPS=m4/iparm.m4
 I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 9d78ad24823..ebc8a4bc2bd 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -37,6 +37,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+
+# dummy sources for libtool
+@onestep_TRUE@am__append_1 = libgfortran_c.c libgfortran_f.f90
 DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
 	$(srcdir)/../config.sub $(srcdir)/../depcomp \
 	$(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
@@ -73,6 +76,451 @@ myexeclibLTLIBRARIES_INSTALL = $(INSTALL)
 toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(myexeclib_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 libgfortran_la_LIBADD =
+am__libgfortran_la_SOURCES_DIST = runtime/backtrace.c \
+	runtime/compile_options.c runtime/environ.c runtime/error.c \
+	runtime/fpu.c runtime/main.c runtime/memory.c runtime/pause.c \
+	runtime/stop.c runtime/string.c runtime/select.c \
+	$(srcdir)/generated/all_l4.c $(srcdir)/generated/all_l8.c \
+	$(srcdir)/generated/all_l16.c $(srcdir)/generated/any_l4.c \
+	$(srcdir)/generated/any_l8.c $(srcdir)/generated/any_l16.c \
+	$(srcdir)/generated/count_4_l4.c \
+	$(srcdir)/generated/count_8_l4.c \
+	$(srcdir)/generated/count_16_l4.c \
+	$(srcdir)/generated/count_4_l8.c \
+	$(srcdir)/generated/count_8_l8.c \
+	$(srcdir)/generated/count_16_l8.c \
+	$(srcdir)/generated/count_4_l16.c \
+	$(srcdir)/generated/count_8_l16.c \
+	$(srcdir)/generated/count_16_l16.c \
+	$(srcdir)/generated/maxloc0_4_i1.c \
+	$(srcdir)/generated/maxloc0_8_i1.c \
+	$(srcdir)/generated/maxloc0_16_i1.c \
+	$(srcdir)/generated/maxloc0_4_i2.c \
+	$(srcdir)/generated/maxloc0_8_i2.c \
+	$(srcdir)/generated/maxloc0_16_i2.c \
+	$(srcdir)/generated/maxloc0_4_i4.c \
+	$(srcdir)/generated/maxloc0_8_i4.c \
+	$(srcdir)/generated/maxloc0_16_i4.c \
+	$(srcdir)/generated/maxloc0_4_i8.c \
+	$(srcdir)/generated/maxloc0_8_i8.c \
+	$(srcdir)/generated/maxloc0_16_i8.c \
+	$(srcdir)/generated/maxloc0_4_i16.c \
+	$(srcdir)/generated/maxloc0_8_i16.c \
+	$(srcdir)/generated/maxloc0_16_i16.c \
+	$(srcdir)/generated/maxloc0_4_r4.c \
+	$(srcdir)/generated/maxloc0_8_r4.c \
+	$(srcdir)/generated/maxloc0_16_r4.c \
+	$(srcdir)/generated/maxloc0_4_r8.c \
+	$(srcdir)/generated/maxloc0_8_r8.c \
+	$(srcdir)/generated/maxloc0_16_r8.c \
+	$(srcdir)/generated/maxloc0_4_r10.c \
+	$(srcdir)/generated/maxloc0_8_r10.c \
+	$(srcdir)/generated/maxloc0_16_r10.c \
+	$(srcdir)/generated/maxloc0_4_r16.c \
+	$(srcdir)/generated/maxloc0_8_r16.c \
+	$(srcdir)/generated/maxloc0_16_r16.c \
+	$(srcdir)/generated/maxloc1_4_i1.c \
+	$(srcdir)/generated/maxloc1_8_i1.c \
+	$(srcdir)/generated/maxloc1_16_i1.c \
+	$(srcdir)/generated/maxloc1_4_i2.c \
+	$(srcdir)/generated/maxloc1_8_i2.c \
+	$(srcdir)/generated/maxloc1_16_i2.c \
+	$(srcdir)/generated/maxloc1_4_i4.c \
+	$(srcdir)/generated/maxloc1_8_i4.c \
+	$(srcdir)/generated/maxloc1_16_i4.c \
+	$(srcdir)/generated/maxloc1_4_i8.c \
+	$(srcdir)/generated/maxloc1_8_i8.c \
+	$(srcdir)/generated/maxloc1_16_i8.c \
+	$(srcdir)/generated/maxloc1_4_i16.c \
+	$(srcdir)/generated/maxloc1_8_i16.c \
+	$(srcdir)/generated/maxloc1_16_i16.c \
+	$(srcdir)/generated/maxloc1_4_r4.c \
+	$(srcdir)/generated/maxloc1_8_r4.c \
+	$(srcdir)/generated/maxloc1_16_r4.c \
+	$(srcdir)/generated/maxloc1_4_r8.c \
+	$(srcdir)/generated/maxloc1_8_r8.c \
+	$(srcdir)/generated/maxloc1_16_r8.c \
+	$(srcdir)/generated/maxloc1_4_r10.c \
+	$(srcdir)/generated/maxloc1_8_r10.c \
+	$(srcdir)/generated/maxloc1_16_r10.c \
+	$(srcdir)/generated/maxloc1_4_r16.c \
+	$(srcdir)/generated/maxloc1_8_r16.c \
+	$(srcdir)/generated/maxloc1_16_r16.c \
+	$(srcdir)/generated/maxval_i1.c \
+	$(srcdir)/generated/maxval_i2.c \
+	$(srcdir)/generated/maxval_i4.c \
+	$(srcdir)/generated/maxval_i8.c \
+	$(srcdir)/generated/maxval_i16.c \
+	$(srcdir)/generated/maxval_r4.c \
+	$(srcdir)/generated/maxval_r8.c \
+	$(srcdir)/generated/maxval_r10.c \
+	$(srcdir)/generated/maxval_r16.c \
+	$(srcdir)/generated/minloc0_4_i1.c \
+	$(srcdir)/generated/minloc0_8_i1.c \
+	$(srcdir)/generated/minloc0_16_i1.c \
+	$(srcdir)/generated/minloc0_4_i2.c \
+	$(srcdir)/generated/minloc0_8_i2.c \
+	$(srcdir)/generated/minloc0_16_i2.c \
+	$(srcdir)/generated/minloc0_4_i4.c \
+	$(srcdir)/generated/minloc0_8_i4.c \
+	$(srcdir)/generated/minloc0_16_i4.c \
+	$(srcdir)/generated/minloc0_4_i8.c \
+	$(srcdir)/generated/minloc0_8_i8.c \
+	$(srcdir)/generated/minloc0_16_i8.c \
+	$(srcdir)/generated/minloc0_4_i16.c \
+	$(srcdir)/generated/minloc0_8_i16.c \
+	$(srcdir)/generated/minloc0_16_i16.c \
+	$(srcdir)/generated/minloc0_4_r4.c \
+	$(srcdir)/generated/minloc0_8_r4.c \
+	$(srcdir)/generated/minloc0_16_r4.c \
+	$(srcdir)/generated/minloc0_4_r8.c \
+	$(srcdir)/generated/minloc0_8_r8.c \
+	$(srcdir)/generated/minloc0_16_r8.c \
+	$(srcdir)/generated/minloc0_4_r10.c \
+	$(srcdir)/generated/minloc0_8_r10.c \
+	$(srcdir)/generated/minloc0_16_r10.c \
+	$(srcdir)/generated/minloc0_4_r16.c \
+	$(srcdir)/generated/minloc0_8_r16.c \
+	$(srcdir)/generated/minloc0_16_r16.c \
+	$(srcdir)/generated/minloc1_4_i1.c \
+	$(srcdir)/generated/minloc1_8_i1.c \
+	$(srcdir)/generated/minloc1_16_i1.c \
+	$(srcdir)/generated/minloc1_4_i2.c \
+	$(srcdir)/generated/minloc1_8_i2.c \
+	$(srcdir)/generated/minloc1_16_i2.c \
+	$(srcdir)/generated/minloc1_4_i4.c \
+	$(srcdir)/generated/minloc1_8_i4.c \
+	$(srcdir)/generated/minloc1_16_i4.c \
+	$(srcdir)/generated/minloc1_4_i8.c \
+	$(srcdir)/generated/minloc1_8_i8.c \
+	$(srcdir)/generated/minloc1_16_i8.c \
+	$(srcdir)/generated/minloc1_4_i16.c \
+	$(srcdir)/generated/minloc1_8_i16.c \
+	$(srcdir)/generated/minloc1_16_i16.c \
+	$(srcdir)/generated/minloc1_4_r4.c \
+	$(srcdir)/generated/minloc1_8_r4.c \
+	$(srcdir)/generated/minloc1_16_r4.c \
+	$(srcdir)/generated/minloc1_4_r8.c \
+	$(srcdir)/generated/minloc1_8_r8.c \
+	$(srcdir)/generated/minloc1_16_r8.c \
+	$(srcdir)/generated/minloc1_4_r10.c \
+	$(srcdir)/generated/minloc1_8_r10.c \
+	$(srcdir)/generated/minloc1_16_r10.c \
+	$(srcdir)/generated/minloc1_4_r16.c \
+	$(srcdir)/generated/minloc1_8_r16.c \
+	$(srcdir)/generated/minloc1_16_r16.c \
+	$(srcdir)/generated/minval_i1.c \
+	$(srcdir)/generated/minval_i2.c \
+	$(srcdir)/generated/minval_i4.c \
+	$(srcdir)/generated/minval_i8.c \
+	$(srcdir)/generated/minval_i16.c \
+	$(srcdir)/generated/minval_r4.c \
+	$(srcdir)/generated/minval_r8.c \
+	$(srcdir)/generated/minval_r10.c \
+	$(srcdir)/generated/minval_r16.c \
+	$(srcdir)/generated/product_i1.c \
+	$(srcdir)/generated/product_i2.c \
+	$(srcdir)/generated/product_i4.c \
+	$(srcdir)/generated/product_i8.c \
+	$(srcdir)/generated/product_i16.c \
+	$(srcdir)/generated/product_r4.c \
+	$(srcdir)/generated/product_r8.c \
+	$(srcdir)/generated/product_r10.c \
+	$(srcdir)/generated/product_r16.c \
+	$(srcdir)/generated/product_c4.c \
+	$(srcdir)/generated/product_c8.c \
+	$(srcdir)/generated/product_c10.c \
+	$(srcdir)/generated/product_c16.c $(srcdir)/generated/sum_i1.c \
+	$(srcdir)/generated/sum_i2.c $(srcdir)/generated/sum_i4.c \
+	$(srcdir)/generated/sum_i8.c $(srcdir)/generated/sum_i16.c \
+	$(srcdir)/generated/sum_r4.c $(srcdir)/generated/sum_r8.c \
+	$(srcdir)/generated/sum_r10.c $(srcdir)/generated/sum_r16.c \
+	$(srcdir)/generated/sum_c4.c $(srcdir)/generated/sum_c8.c \
+	$(srcdir)/generated/sum_c10.c $(srcdir)/generated/sum_c16.c \
+	$(srcdir)/generated/matmul_i1.c \
+	$(srcdir)/generated/matmul_i2.c \
+	$(srcdir)/generated/matmul_i4.c \
+	$(srcdir)/generated/matmul_i8.c \
+	$(srcdir)/generated/matmul_i16.c \
+	$(srcdir)/generated/matmul_r4.c \
+	$(srcdir)/generated/matmul_r8.c \
+	$(srcdir)/generated/matmul_r10.c \
+	$(srcdir)/generated/matmul_r16.c \
+	$(srcdir)/generated/matmul_c4.c \
+	$(srcdir)/generated/matmul_c8.c \
+	$(srcdir)/generated/matmul_c10.c \
+	$(srcdir)/generated/matmul_c16.c \
+	$(srcdir)/generated/matmul_l4.c \
+	$(srcdir)/generated/matmul_l8.c \
+	$(srcdir)/generated/matmul_l16.c \
+	$(srcdir)/generated/transpose_i4.c \
+	$(srcdir)/generated/transpose_i8.c \
+	$(srcdir)/generated/transpose_i16.c \
+	$(srcdir)/generated/transpose_r4.c \
+	$(srcdir)/generated/transpose_r8.c \
+	$(srcdir)/generated/transpose_r10.c \
+	$(srcdir)/generated/transpose_r16.c \
+	$(srcdir)/generated/transpose_c4.c \
+	$(srcdir)/generated/transpose_c8.c \
+	$(srcdir)/generated/transpose_c10.c \
+	$(srcdir)/generated/transpose_c16.c \
+	$(srcdir)/generated/shape_i4.c $(srcdir)/generated/shape_i8.c \
+	$(srcdir)/generated/shape_i16.c \
+	$(srcdir)/generated/eoshift1_4.c \
+	$(srcdir)/generated/eoshift1_8.c \
+	$(srcdir)/generated/eoshift1_16.c \
+	$(srcdir)/generated/eoshift3_4.c \
+	$(srcdir)/generated/eoshift3_8.c \
+	$(srcdir)/generated/eoshift3_16.c \
+	$(srcdir)/generated/cshift1_4.c \
+	$(srcdir)/generated/cshift1_8.c \
+	$(srcdir)/generated/cshift1_16.c \
+	$(srcdir)/generated/reshape_i4.c \
+	$(srcdir)/generated/reshape_i8.c \
+	$(srcdir)/generated/reshape_i16.c \
+	$(srcdir)/generated/reshape_r4.c \
+	$(srcdir)/generated/reshape_r8.c \
+	$(srcdir)/generated/reshape_r10.c \
+	$(srcdir)/generated/reshape_r16.c \
+	$(srcdir)/generated/reshape_c4.c \
+	$(srcdir)/generated/reshape_c8.c \
+	$(srcdir)/generated/reshape_c10.c \
+	$(srcdir)/generated/reshape_c16.c \
+	$(srcdir)/generated/in_pack_i4.c \
+	$(srcdir)/generated/in_pack_i8.c \
+	$(srcdir)/generated/in_pack_i16.c \
+	$(srcdir)/generated/in_pack_c4.c \
+	$(srcdir)/generated/in_pack_c8.c \
+	$(srcdir)/generated/in_pack_c10.c \
+	$(srcdir)/generated/in_pack_c16.c \
+	$(srcdir)/generated/in_unpack_i4.c \
+	$(srcdir)/generated/in_unpack_i8.c \
+	$(srcdir)/generated/in_unpack_i16.c \
+	$(srcdir)/generated/in_unpack_c4.c \
+	$(srcdir)/generated/in_unpack_c8.c \
+	$(srcdir)/generated/in_unpack_c10.c \
+	$(srcdir)/generated/in_unpack_c16.c \
+	$(srcdir)/generated/exponent_r4.c \
+	$(srcdir)/generated/exponent_r8.c \
+	$(srcdir)/generated/exponent_r10.c \
+	$(srcdir)/generated/exponent_r16.c \
+	$(srcdir)/generated/fraction_r4.c \
+	$(srcdir)/generated/fraction_r8.c \
+	$(srcdir)/generated/fraction_r10.c \
+	$(srcdir)/generated/fraction_r16.c \
+	$(srcdir)/generated/nearest_r4.c \
+	$(srcdir)/generated/nearest_r8.c \
+	$(srcdir)/generated/nearest_r10.c \
+	$(srcdir)/generated/nearest_r16.c \
+	$(srcdir)/generated/set_exponent_r4.c \
+	$(srcdir)/generated/set_exponent_r8.c \
+	$(srcdir)/generated/set_exponent_r10.c \
+	$(srcdir)/generated/set_exponent_r16.c \
+	$(srcdir)/generated/pow_i4_i4.c \
+	$(srcdir)/generated/pow_i8_i4.c \
+	$(srcdir)/generated/pow_i16_i4.c \
+	$(srcdir)/generated/pow_c4_i4.c \
+	$(srcdir)/generated/pow_c8_i4.c \
+	$(srcdir)/generated/pow_c10_i4.c \
+	$(srcdir)/generated/pow_c16_i4.c \
+	$(srcdir)/generated/pow_i4_i8.c \
+	$(srcdir)/generated/pow_i8_i8.c \
+	$(srcdir)/generated/pow_i16_i8.c \
+	$(srcdir)/generated/pow_r4_i8.c \
+	$(srcdir)/generated/pow_r8_i8.c \
+	$(srcdir)/generated/pow_r10_i8.c \
+	$(srcdir)/generated/pow_r16_i8.c \
+	$(srcdir)/generated/pow_c4_i8.c \
+	$(srcdir)/generated/pow_c8_i8.c \
+	$(srcdir)/generated/pow_c10_i8.c \
+	$(srcdir)/generated/pow_c16_i8.c \
+	$(srcdir)/generated/pow_i4_i16.c \
+	$(srcdir)/generated/pow_i8_i16.c \
+	$(srcdir)/generated/pow_i16_i16.c \
+	$(srcdir)/generated/pow_r4_i16.c \
+	$(srcdir)/generated/pow_r8_i16.c \
+	$(srcdir)/generated/pow_r10_i16.c \
+	$(srcdir)/generated/pow_r16_i16.c \
+	$(srcdir)/generated/pow_c4_i16.c \
+	$(srcdir)/generated/pow_c8_i16.c \
+	$(srcdir)/generated/pow_c10_i16.c \
+	$(srcdir)/generated/pow_c16_i16.c \
+	$(srcdir)/generated/rrspacing_r4.c \
+	$(srcdir)/generated/rrspacing_r8.c \
+	$(srcdir)/generated/rrspacing_r10.c \
+	$(srcdir)/generated/rrspacing_r16.c \
+	$(srcdir)/generated/spacing_r4.c \
+	$(srcdir)/generated/spacing_r8.c \
+	$(srcdir)/generated/spacing_r10.c \
+	$(srcdir)/generated/spacing_r16.c selected_int_kind.inc \
+	selected_real_kind.inc kinds.h kinds.inc c99_protos.inc \
+	fpu-target.h io/close.c io/file_pos.c io/format.c io/inquire.c \
+	io/intrinsics.c io/list_read.c io/lock.c io/open.c io/read.c \
+	io/size_from_kind.c io/transfer.c io/unit.c io/unix.c \
+	io/write.c intrinsics/associated.c intrinsics/abort.c \
+	intrinsics/access.c intrinsics/args.c \
+	intrinsics/c99_functions.c intrinsics/chdir.c \
+	intrinsics/chmod.c intrinsics/clock.c intrinsics/cpu_time.c \
+	intrinsics/cshift0.c intrinsics/ctime.c \
+	intrinsics/date_and_time.c intrinsics/env.c \
+	intrinsics/eoshift0.c intrinsics/eoshift2.c intrinsics/etime.c \
+	intrinsics/exit.c intrinsics/fnum.c intrinsics/gerror.c \
+	intrinsics/getcwd.c intrinsics/getlog.c intrinsics/getXid.c \
+	intrinsics/hostnm.c intrinsics/ierrno.c intrinsics/ishftc.c \
+	intrinsics/iso_c_generated_procs.c intrinsics/iso_c_binding.c \
+	intrinsics/kill.c intrinsics/link.c intrinsics/malloc.c \
+	intrinsics/mvbits.c intrinsics/move_alloc.c \
+	intrinsics/pack_generic.c intrinsics/perror.c \
+	intrinsics/signal.c intrinsics/size.c intrinsics/sleep.c \
+	intrinsics/spread_generic.c intrinsics/string_intrinsics.c \
+	intrinsics/system.c intrinsics/rand.c intrinsics/random.c \
+	intrinsics/rename.c intrinsics/reshape_generic.c \
+	intrinsics/reshape_packed.c intrinsics/selected_int_kind.f90 \
+	intrinsics/selected_real_kind.f90 intrinsics/stat.c \
+	intrinsics/symlnk.c intrinsics/system_clock.c \
+	intrinsics/time.c intrinsics/transpose_generic.c \
+	intrinsics/umask.c intrinsics/unlink.c \
+	intrinsics/unpack_generic.c runtime/in_pack_generic.c \
+	runtime/in_unpack_generic.c io/io.h \
+	$(srcdir)/generated/_abs_c4.F90 \
+	$(srcdir)/generated/_abs_c8.F90 \
+	$(srcdir)/generated/_abs_c10.F90 \
+	$(srcdir)/generated/_abs_c16.F90 \
+	$(srcdir)/generated/_abs_i4.F90 \
+	$(srcdir)/generated/_abs_i8.F90 \
+	$(srcdir)/generated/_abs_i16.F90 \
+	$(srcdir)/generated/_abs_r4.F90 \
+	$(srcdir)/generated/_abs_r8.F90 \
+	$(srcdir)/generated/_abs_r10.F90 \
+	$(srcdir)/generated/_abs_r16.F90 \
+	$(srcdir)/generated/_aimag_c4.F90 \
+	$(srcdir)/generated/_aimag_c8.F90 \
+	$(srcdir)/generated/_aimag_c10.F90 \
+	$(srcdir)/generated/_aimag_c16.F90 \
+	$(srcdir)/generated/_exp_r4.F90 \
+	$(srcdir)/generated/_exp_r8.F90 \
+	$(srcdir)/generated/_exp_r10.F90 \
+	$(srcdir)/generated/_exp_r16.F90 \
+	$(srcdir)/generated/_exp_c4.F90 \
+	$(srcdir)/generated/_exp_c8.F90 \
+	$(srcdir)/generated/_exp_c10.F90 \
+	$(srcdir)/generated/_exp_c16.F90 \
+	$(srcdir)/generated/_log_r4.F90 \
+	$(srcdir)/generated/_log_r8.F90 \
+	$(srcdir)/generated/_log_r10.F90 \
+	$(srcdir)/generated/_log_r16.F90 \
+	$(srcdir)/generated/_log_c4.F90 \
+	$(srcdir)/generated/_log_c8.F90 \
+	$(srcdir)/generated/_log_c10.F90 \
+	$(srcdir)/generated/_log_c16.F90 \
+	$(srcdir)/generated/_log10_r4.F90 \
+	$(srcdir)/generated/_log10_r8.F90 \
+	$(srcdir)/generated/_log10_r10.F90 \
+	$(srcdir)/generated/_log10_r16.F90 \
+	$(srcdir)/generated/_sqrt_r4.F90 \
+	$(srcdir)/generated/_sqrt_r8.F90 \
+	$(srcdir)/generated/_sqrt_r10.F90 \
+	$(srcdir)/generated/_sqrt_r16.F90 \
+	$(srcdir)/generated/_sqrt_c4.F90 \
+	$(srcdir)/generated/_sqrt_c8.F90 \
+	$(srcdir)/generated/_sqrt_c10.F90 \
+	$(srcdir)/generated/_sqrt_c16.F90 \
+	$(srcdir)/generated/_asin_r4.F90 \
+	$(srcdir)/generated/_asin_r8.F90 \
+	$(srcdir)/generated/_asin_r10.F90 \
+	$(srcdir)/generated/_asin_r16.F90 \
+	$(srcdir)/generated/_asinh_r4.F90 \
+	$(srcdir)/generated/_asinh_r8.F90 \
+	$(srcdir)/generated/_asinh_r10.F90 \
+	$(srcdir)/generated/_asinh_r16.F90 \
+	$(srcdir)/generated/_acos_r4.F90 \
+	$(srcdir)/generated/_acos_r8.F90 \
+	$(srcdir)/generated/_acos_r10.F90 \
+	$(srcdir)/generated/_acos_r16.F90 \
+	$(srcdir)/generated/_acosh_r4.F90 \
+	$(srcdir)/generated/_acosh_r8.F90 \
+	$(srcdir)/generated/_acosh_r10.F90 \
+	$(srcdir)/generated/_acosh_r16.F90 \
+	$(srcdir)/generated/_atan_r4.F90 \
+	$(srcdir)/generated/_atan_r8.F90 \
+	$(srcdir)/generated/_atan_r10.F90 \
+	$(srcdir)/generated/_atan_r16.F90 \
+	$(srcdir)/generated/_atanh_r4.F90 \
+	$(srcdir)/generated/_atanh_r8.F90 \
+	$(srcdir)/generated/_atanh_r10.F90 \
+	$(srcdir)/generated/_atanh_r16.F90 \
+	$(srcdir)/generated/_sin_r4.F90 \
+	$(srcdir)/generated/_sin_r8.F90 \
+	$(srcdir)/generated/_sin_r10.F90 \
+	$(srcdir)/generated/_sin_r16.F90 \
+	$(srcdir)/generated/_sin_c4.F90 \
+	$(srcdir)/generated/_sin_c8.F90 \
+	$(srcdir)/generated/_sin_c10.F90 \
+	$(srcdir)/generated/_sin_c16.F90 \
+	$(srcdir)/generated/_cos_r4.F90 \
+	$(srcdir)/generated/_cos_r8.F90 \
+	$(srcdir)/generated/_cos_r10.F90 \
+	$(srcdir)/generated/_cos_r16.F90 \
+	$(srcdir)/generated/_cos_c4.F90 \
+	$(srcdir)/generated/_cos_c8.F90 \
+	$(srcdir)/generated/_cos_c10.F90 \
+	$(srcdir)/generated/_cos_c16.F90 \
+	$(srcdir)/generated/_tan_r4.F90 \
+	$(srcdir)/generated/_tan_r8.F90 \
+	$(srcdir)/generated/_tan_r10.F90 \
+	$(srcdir)/generated/_tan_r16.F90 \
+	$(srcdir)/generated/_sinh_r4.F90 \
+	$(srcdir)/generated/_sinh_r8.F90 \
+	$(srcdir)/generated/_sinh_r10.F90 \
+	$(srcdir)/generated/_sinh_r16.F90 \
+	$(srcdir)/generated/_cosh_r4.F90 \
+	$(srcdir)/generated/_cosh_r8.F90 \
+	$(srcdir)/generated/_cosh_r10.F90 \
+	$(srcdir)/generated/_cosh_r16.F90 \
+	$(srcdir)/generated/_tanh_r4.F90 \
+	$(srcdir)/generated/_tanh_r8.F90 \
+	$(srcdir)/generated/_tanh_r10.F90 \
+	$(srcdir)/generated/_tanh_r16.F90 \
+	$(srcdir)/generated/_conjg_c4.F90 \
+	$(srcdir)/generated/_conjg_c8.F90 \
+	$(srcdir)/generated/_conjg_c10.F90 \
+	$(srcdir)/generated/_conjg_c16.F90 \
+	$(srcdir)/generated/_aint_r4.F90 \
+	$(srcdir)/generated/_aint_r8.F90 \
+	$(srcdir)/generated/_aint_r10.F90 \
+	$(srcdir)/generated/_aint_r16.F90 \
+	$(srcdir)/generated/_anint_r4.F90 \
+	$(srcdir)/generated/_anint_r8.F90 \
+	$(srcdir)/generated/_anint_r10.F90 \
+	$(srcdir)/generated/_anint_r16.F90 \
+	$(srcdir)/generated/_sign_i4.F90 \
+	$(srcdir)/generated/_sign_i8.F90 \
+	$(srcdir)/generated/_sign_i16.F90 \
+	$(srcdir)/generated/_sign_r4.F90 \
+	$(srcdir)/generated/_sign_r8.F90 \
+	$(srcdir)/generated/_sign_r10.F90 \
+	$(srcdir)/generated/_sign_r16.F90 \
+	$(srcdir)/generated/_dim_i4.F90 \
+	$(srcdir)/generated/_dim_i8.F90 \
+	$(srcdir)/generated/_dim_i16.F90 \
+	$(srcdir)/generated/_dim_r4.F90 \
+	$(srcdir)/generated/_dim_r8.F90 \
+	$(srcdir)/generated/_dim_r10.F90 \
+	$(srcdir)/generated/_dim_r16.F90 \
+	$(srcdir)/generated/_atan2_r4.F90 \
+	$(srcdir)/generated/_atan2_r8.F90 \
+	$(srcdir)/generated/_atan2_r10.F90 \
+	$(srcdir)/generated/_atan2_r16.F90 \
+	$(srcdir)/generated/_mod_i4.F90 \
+	$(srcdir)/generated/_mod_i8.F90 \
+	$(srcdir)/generated/_mod_i16.F90 \
+	$(srcdir)/generated/_mod_r4.F90 \
+	$(srcdir)/generated/_mod_r8.F90 \
+	$(srcdir)/generated/_mod_r10.F90 \
+	$(srcdir)/generated/_mod_r16.F90 \
+	$(srcdir)/generated/misc_specifics.F90 intrinsics/dprod_r8.f90 \
+	intrinsics/f2c_specifics.F90 libgfortran_c.c $(filter-out \
+	%.c,$(prereq_SRC))
 am__objects_1 = backtrace.lo compile_options.lo environ.lo error.lo \
 	fpu.lo main.lo memory.lo pause.lo stop.lo string.lo select.lo
 am__objects_2 = all_l4.lo all_l8.lo all_l16.lo
@@ -230,9 +678,10 @@ am__objects_35 = _sign_i4.lo _sign_i8.lo _sign_i16.lo _sign_r4.lo \
 am__objects_36 = misc_specifics.lo
 am__objects_37 = $(am__objects_34) $(am__objects_35) $(am__objects_36) \
 	dprod_r8.lo f2c_specifics.lo
-am_libgfortran_la_OBJECTS = $(am__objects_1) $(am__objects_30) \
-	$(am__objects_31) $(am__objects_32) $(am__objects_33) \
-	$(am__objects_37)
+am__objects_38 = $(am__objects_1) $(am__objects_30) $(am__objects_31) \
+	$(am__objects_32) $(am__objects_33) $(am__objects_37)
+@onestep_FALSE@am_libgfortran_la_OBJECTS = $(am__objects_38)
+@onestep_TRUE@am_libgfortran_la_OBJECTS = libgfortran_c.lo
 libgfortran_la_OBJECTS = $(am_libgfortran_la_OBJECTS)
 libgfortranbegin_la_LIBADD =
 am_libgfortranbegin_la_OBJECTS = fmain.lo
@@ -259,7 +708,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
 LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
 SOURCES = $(libgfortran_la_SOURCES) $(libgfortranbegin_la_SOURCES)
-DIST_SOURCES = $(libgfortran_la_SOURCES) \
+DIST_SOURCES = $(am__libgfortran_la_SOURCES_DIST) \
 	$(libgfortranbegin_la_SOURCES)
 MULTISRCTOP = 
 MULTIBUILDTOP = 
@@ -387,6 +836,9 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 multi_basedir = @multi_basedir@
 oldincludedir = @oldincludedir@
+onestep = @onestep@
+onestep_FALSE = @onestep_FALSE@
+onestep_TRUE = @onestep_TRUE@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
@@ -1017,11 +1469,25 @@ intrinsics/dprod_r8.f90 \
 intrinsics/f2c_specifics.F90
 
 BUILT_SOURCES = $(gfor_built_src) $(gfor_built_specific_src) \
-    $(gfor_built_specific2_src) $(gfor_misc_specifics)
-
-libgfortran_la_SOURCES = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \
+	$(gfor_built_specific2_src) $(gfor_misc_specifics) \
+	$(am__append_1)
+prereq_SRC = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \
     $(gfor_helper_src) $(gfor_io_headers) $(gfor_specific_src)
 
+@onestep_FALSE@libgfortran_la_SOURCES = $(prereq_SRC)
+
+#libgfortran_f.o: $(filter %.f %.f90,$(prereq_SRC))
+#	$(FCCOMPILE) -c $^ -o $@ -combine
+
+#libgfortran_f.lo: $(filter %.f %.f90,$(prereq_SRC))
+#	$(LTFCCOMPILE) -c -o $@ $^ -combine
+# not currently used:
+#libgfortran_F.o: $(filter %.F %.F90,$(prereq_SRC))
+#	$(PPFCCOMPILE) -c $^ -o $@ -combine
+#
+#libgfortran_F.lo: 
+#	$(LTPPFCCOMPILE) -c -o $@ $^ -combine
+@onestep_TRUE@libgfortran_la_SOURCES = libgfortran_c.c $(filter-out %.c,$(prereq_SRC))
 I_M4_DEPS = m4/iparm.m4
 I_M4_DEPS0 = $(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1 = $(I_M4_DEPS) m4/ifunction.m4
@@ -1233,6 +1699,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso_c_binding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso_c_generated_procs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgfortran_c.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_read.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Plo@am__quote@
@@ -4847,6 +5314,14 @@ $(patsubst %.c,%.lo,$(notdir $(i_matmull_c))): AM_CFLAGS += -funroll-loops
 # Add the -fallow-leading-underscore option when needed
 $(patsubst %.F90,%.lo,$(patsubst %.f90,%.lo,$(notdir $(gfor_specific_src)))): AM_FCFLAGS += -fallow-leading-underscore
 selected_real_kind.lo selected_int_kind.lo: AM_FCFLAGS += -fallow-leading-underscore
+@onestep_TRUE@libgfortran_c.c libgfortran_f.f90 libgfortran_F.F90:
+@onestep_TRUE@	echo > $@
+# overrides for libtool perusing the dummy sources
+@onestep_TRUE@libgfortran_c.o: $(filter %.c,$(prereq_SRC))
+@onestep_TRUE@	$(COMPILE) -c $^ -o $@ -combine
+
+@onestep_TRUE@libgfortran_c.lo: $(filter %.c,$(prereq_SRC))
+@onestep_TRUE@	$(LTCOMPILE) -c -o $@ $^ -combine
 
 kinds.h: $(srcdir)/mk-kinds-h.sh
 	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@ || rm $@
diff --git a/libgfortran/configure b/libgfortran/configure
index 21e1e416ef5..5132c28bdca 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -457,7 +457,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-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 build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AM_FCFLAGS AM_CFLAGS CFLAGS LIBGFOR_USE_SYMVER_TRUE LIBGFOR_USE_SYMVER_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S lt_ECHO CPP CPPFLAGS enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran FPU_HOST_HEADER 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 build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir onestep_TRUE onestep_FALSE onestep host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AM_FCFLAGS AM_CFLAGS CFLAGS LIBGFOR_USE_SYMVER_TRUE LIBGFOR_USE_SYMVER_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S lt_ECHO CPP CPPFLAGS enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran FPU_HOST_HEADER LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1001,6 +1001,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-version-specific-runtime-libs    Specify that runtime libraries should be installed in a compiler-specific directory
+  --enable-intermodule    build the library in one step
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-multilib       build many library versions (default)
@@ -1609,6 +1610,32 @@ fi;
 echo "$as_me:$LINENO: result: $version_specific_libs" >&5
 echo "${ECHO_T}$version_specific_libs" >&6
 
+# Build with intermodule optimisations
+echo "$as_me:$LINENO: checking for --enable-intermodule" >&5
+echo $ECHO_N "checking for --enable-intermodule... $ECHO_C" >&6
+# Check whether --enable-intermodule or --disable-intermodule was given.
+if test "${enable_intermodule+set}" = set; then
+  enableval="$enable_intermodule"
+  case "$enable_intermodule" in
+  yes) onestep="-onestep";;
+    *) onestep="";;
+esac
+else
+  onestep=""
+fi;
+echo "$as_me:$LINENO: result: $enable_intermodule" >&5
+echo "${ECHO_T}$enable_intermodule" >&6
+
+
+if test x$onestep = x-onestep; then
+  onestep_TRUE=
+  onestep_FALSE='#'
+else
+  onestep_TRUE='#'
+  onestep_FALSE=
+fi
+
+
 
 # Gets build, host, target, *_vendor, *_cpu, *_os, etc.
 #
@@ -4321,13 +4348,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4324: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4351: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4327: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4354: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4330: output\"" >&5)
+  (eval echo "\"\$as_me:4357: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5382,7 +5409,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5385 "configure"' > conftest.$ac_ext
+  echo '#line 5412 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6487,11 +6514,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6490: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6517: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6494: \$? = $ac_status" >&5
+   echo "$as_me:6521: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6809,11 +6836,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6812: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6839: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6816: \$? = $ac_status" >&5
+   echo "$as_me:6843: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6914,11 +6941,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6944: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6921: \$? = $ac_status" >&5
+   echo "$as_me:6948: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -6969,11 +6996,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6972: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6999: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6976: \$? = $ac_status" >&5
+   echo "$as_me:7003: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9821,7 +9848,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9824 "configure"
+#line 9851 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9921,7 +9948,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9924 "configure"
+#line 9951 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10251,7 +10278,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:10254:" \
+echo "$as_me:10281:" \
      "checking for Fortran compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10487,7 +10514,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:10490:" \
+echo "$as_me:10517:" \
      "checking for Fortran compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -11203,11 +11230,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11206: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11233: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11210: \$? = $ac_status" >&5
+   echo "$as_me:11237: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11302,11 +11329,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11305: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11332: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11309: \$? = $ac_status" >&5
+   echo "$as_me:11336: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11354,11 +11381,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11357: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11384: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11361: \$? = $ac_status" >&5
+   echo "$as_me:11388: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -32944,6 +32971,13 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${onestep_TRUE}" && test -z "${onestep_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"onestep\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"onestep\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -33877,6 +33911,9 @@ s,@build_libsubdir@,$build_libsubdir,;t t
 s,@build_subdir@,$build_subdir,;t t
 s,@host_subdir@,$host_subdir,;t t
 s,@target_subdir@,$target_subdir,;t t
+s,@onestep_TRUE@,$onestep_TRUE,;t t
+s,@onestep_FALSE@,$onestep_FALSE,;t t
+s,@onestep@,$onestep,;t t
 s,@host@,$host,;t t
 s,@host_cpu@,$host_cpu,;t t
 s,@host_vendor@,$host_vendor,;t t
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 78dce5519f4..0d153d47ec9 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -21,6 +21,18 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
 [version_specific_libs=no])
 AC_MSG_RESULT($version_specific_libs)
 
+# Build with intermodule optimisations
+AC_MSG_CHECKING([for --enable-intermodule])
+AC_ARG_ENABLE(intermodule,
+[  --enable-intermodule    build the library in one step],
+[case "$enable_intermodule" in
+  yes) onestep="-onestep";;
+    *) onestep="";;
+esac],
+[onestep=""])
+AC_MSG_RESULT($enable_intermodule)
+AM_CONDITIONAL(onestep,[test x$onestep = x-onestep])
+AC_SUBST(onestep)
 
 # Gets build, host, target, *_vendor, *_cpu, *_os, etc.
 #