* Makefile.in (OBJS-common, OBJS-md, OBJS-archive): Merge into OBJS.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae560b6..8adc625 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,8 @@
 2011-05-20  Michael Matz  <matz@suse.de>
+
+       * Makefile.in (OBJS-common, OBJS-md, OBJS-archive): Merge into OBJS.
+
+2011-05-20  Michael Matz  <matz@suse.de>
            Richard Guenther  <rguenther@suse.de>
 
        * lto-streamer.c (lto_record_common_node): Don't track seen nodes,

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 27ffbbc..fd3a676 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1189,7 +1189,7 @@ C_OBJS = c-lang.o c-family/stub-objc.o $(C_AND_OBJC_OBJS)
 # We put the insn-*.o files first so that a parallel make will build
 # them sooner, because they are large and otherwise tend to be the
 # last objects to finish building.
-OBJS-common = \
+OBJS = \
        insn-attrtab.o \
        insn-automata.o \
        insn-emit.o \
@@ -1222,11 +1222,16 @@ OBJS-common = \
        cfgloopanal.o \
        cfgloopmanip.o \
        cfgrtl.o \
+       cgraph.o \
+       cgraphbuild.o \
+       cgraphunit.o \
        combine.o \
        combine-stack-adj.o \
        compare-elim.o \
        convert.o \
        coverage.o \
+       cppbuiltin.o \
+       cppdefault.o \
        cprop.o \
        cse.o \
        cselib.o \
@@ -1287,11 +1292,23 @@ OBJS-common = \
        hwint.o \
        ifcvt.o \
        implicit-zee.o \
+       incpath.o \
        init-regs.o \
        input.o \
        integrate.o \
        internal-fn.o \
        intl.o \
+       ipa-cp.o \
+       ipa-split.o \
+       ipa-inline.o \
+       ipa-inline-analysis.o \
+       ipa-inline-transform.o \
+       ipa-prop.o \
+       ipa-pure-const.o \
+       ipa-reference.o \
+       ipa-ref.o \
+       ipa-utils.o \
+       ipa.o \
        ira.o \
        ira-build.o \
        ira-costs.o \
@@ -1319,6 +1336,7 @@ OBJS-common = \
        lto-opts.o \
        lto-streamer.o \
        lto-compress.o \
+       matrix-reorg.o \
        mcf.o \
        mode-switching.o \
        modulo-sched.o \
@@ -1336,6 +1354,7 @@ OBJS-common = \
        postreload-gcse.o \
        postreload.o \
        predict.o \
+       prefix.o \
        pretty-print.o \
        print-rtl.o \
        print-tree.o \
@@ -1394,10 +1413,12 @@ OBJS-common = \
        tree-eh.o \
        tree-emutls.o \
        tree-if-conv.o \
+       tree-inline.o \
        tree-into-ssa.o \
        tree-iterator.o \
        tree-loop-distribution.o \
        tree-nested.o \
+       tree-nomudflap.o \
        tree-nrv.o \
        tree-object-size.o \
        tree-optimize.o \
@@ -1452,54 +1473,26 @@ OBJS-common = \
        tree-tailcall.o \
        tree-vect-generic.o \
        tree-vect-patterns.o \
-        tree-vect-data-refs.o \
-        tree-vect-stmts.o \
-        tree-vect-loop.o \
-        tree-vect-loop-manip.o \
-        tree-vect-slp.o \
+       tree-vect-data-refs.o \
+       tree-vect-stmts.o \
+       tree-vect-loop.o \
+       tree-vect-loop-manip.o \
+       tree-vect-slp.o \
        tree-vectorizer.o \
        tree-vrp.o \
        tree.o \
        value-prof.o \
        var-tracking.o \
        varasm.o \
+       varpool.o \
        vec.o \
        version.o \
        vmsdbgout.o \
        web.o \
-       xcoffout.o
-
-# Target object files.
-OBJS-md = $(out_object_file)
-
-# Language independent object files which are not used by all languages.
-OBJS-archive = \
+       xcoffout.o \
+       $(out_object_file) \
        $(EXTRA_OBJS) \
-       $(host_hook_obj) \
-       cgraph.o \
-       cgraphbuild.o \
-       cgraphunit.o \
-       cppbuiltin.o \
-       cppdefault.o \
-       incpath.o \
-       ipa-cp.o \
-        ipa-split.o \
-       ipa-inline.o \
-       ipa-inline-analysis.o \
-       ipa-inline-transform.o \
-       ipa-prop.o \
-       ipa-pure-const.o \
-       ipa-reference.o \
-       ipa-ref.o \
-       ipa-utils.o \
-       ipa.o \
-       matrix-reorg.o \
-       prefix.o \
-       tree-inline.o \
-       tree-nomudflap.o \
-       varpool.o
-
-OBJS = $(OBJS-common) $(OBJS-md) $(OBJS-archive)
+       $(host_hook_obj)
 
 # This lists all host objects for the front ends.
 ALL_HOST_FRONTEND_OBJS = $(C_OBJS) \