Makefile.in (OBJS-onestep): Remove.

2010-09-24  Richard Guenther  <rguenther@suse.de>

	* Makefile.in (OBJS-onestep): Remove.
	(ALL_HOST_BACKEND_OBJS): Remove libbackend.o.
	(libbackend.a): Remove onestep support.
	(libbackend.o): Remove.
	* configure.ac (--enable-intermodule): Remove.
	* configure: Regenerate.

From-SVN: r164590

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d85ec51f496277a427162304371056f4fc9812d..75d35baf4522ca1e37028dc55a38c83fa5904bc9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-24  Richard Guenther  <rguenther@suse.de>
+
+       * Makefile.in (OBJS-onestep): Remove.
+       (ALL_HOST_BACKEND_OBJS): Remove libbackend.o.
+       (libbackend.a): Remove onestep support.
+       (libbackend.o): Remove.
+       * configure.ac (--enable-intermodule): Remove.
+       * configure: Regenerate.
+
 2010-09-24  Bernd Schmidt  <bernds@codesourcery.com>
 
        * cfgcleanup.c (flow_find_head_matching_sequence): Terminate when

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 54643e3f79b6b80a7576647182f0f673d51b46cb..0243accac6005206dfa69da73c0f67a3c89fd91f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1469,13 +1469,11 @@ OBJS-archive = \
 
 OBJS = $(OBJS-common) $(OBJS-md) $(OBJS-archive)
 
-OBJS-onestep = libbackend.o $(OBJS-archive)
-
 # This lists all host objects for the front ends.
 ALL_HOST_FRONTEND_OBJS = $(C_OBJS) \
   $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
 
-ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) libbackend.o \
+ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) \
   @TREEBROWSER@ main.o gccspec.o version.o intl.o prefix.o cppspec.o \
   $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \
   $(GCOV_OBJS) $(GCOV_DUMP_OBJS)
@@ -1800,9 +1798,9 @@ rest.cross: specs
 compilations: $(BACKEND)
 
 # This archive is strictly for the host.
-libbackend.a: $(OBJS@onestep@)
+libbackend.a: $(OBJS)
        -rm -rf libbackend.a
-       $(AR) $(AR_FLAGS) libbackend.a $(OBJS@onestep@)
+       $(AR) $(AR_FLAGS) libbackend.a $(OBJS)
        -$(RANLIB) $(RANLIB_FLAGS) libbackend.a
 
 # We call this executable `xgcc' rather than `gcc'
@@ -3525,19 +3523,6 @@ mips-tdump: mips-tdump.o version.o $(LIBDEPS)
 mips-tdump.o : mips-tdump.c $(CONFIG_H) $(RTL_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) version.h $(srcdir)/../include/getopt.h stab.def
 
-# FIXME: writing proper dependencies for this is a *LOT* of work.
-libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
-  insn-config.h insn-flags.h insn-codes.h insn-constants.h \
-  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
-       $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
-         -DTARGET_NAME=\"$(target_noncanonical)\" \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -c $(filter %.c,$^) -o $@  \
-         -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
-         -DREVISION=$(REVISION_s) \
-         -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
-         -DBUGURL=$(BUGURL_s) -combine
-
 #\f
 # Generate header and source files from the machine description,
 # and compile them.

diff --git a/gcc/configure b/gcc/configure
index 7686c435441b56c6edb0b56640bb0298b4e8751e..c392323c643377b38d8595b56ce671902737139d 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -759,7 +759,6 @@ SET_MAKE
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
 PKGVERSION
-onestep
 CONFIGURE_SPECS
 CROSS_SYSTEM_HEADER_DIR
 TARGET_SYSTEM_ROOT_DEFINE
@@ -885,7 +884,6 @@ enable_shared
 with_build_sysroot
 with_sysroot
 with_specs
-enable_intermodule
 with_pkgversion
 with_bugurl
 enable_languages
@@ -1588,7 +1586,6 @@ Optional Features:
   --enable-objc-gc       enable the use of Boehm's garbage collector with
                          the GNU Objective-C runtime
   --disable-shared        don't provide a shared libgcc
-  --enable-intermodule    build the compiler in one step
   --enable-languages=LIST specify which front-ends to build
   --disable-rpath         do not hardcode runtime library paths
   --enable-initfini-array      use .init_array/.fini_array sections
@@ -6886,19 +6883,6 @@ fi
 
 
 
-# Build with intermodule optimisations
-# Check whether --enable-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
-
-
-
 
 
 # Check whether --with-pkgversion was given.
@@ -17139,7 +17123,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17142 "configure"
+#line 17126 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17245,7 +17229,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17248 "configure"
+#line 17232 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 278cc4f7469ecf0928ea7ff788d6e3e1c9af4635..6ada451f2fe4ebef2c1921ab0c4a454623d269b7 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -754,16 +754,6 @@ AC_ARG_WITH(specs,
 )
 AC_SUBST(CONFIGURE_SPECS)
 
-# Build with intermodule optimisations
-AC_ARG_ENABLE(intermodule,
-[  --enable-intermodule    build the compiler in one step],
-[case ${enable_intermodule} in
-  yes) onestep="-onestep";;
-  *) onestep="";;
-esac],
-[onestep=""])
-AC_SUBST(onestep)
-
 ACX_PKGVERSION([GCC])
 ACX_BUGURL([http://gcc.gnu.org/bugs.html])