Merge OBJS-common,-md,-archive

[Michael Matz]

Hi,

On Fri, 20 May 2011, Joseph S. Myers wrote:

> (Apart from the arbitrary division between GCC_OBJS and the xgcc link 
> rule, mentioned above, there are other arbitrary divisions that don't 
> make sense to me.  In particular, the separation between OBJS-common, 
> OBJS-md and OBJS-archive, all used only in the definition of OBJS and 
> all ending up in libbackend.a.

Indeed, this split doesn't make sense since some years.  I have this local 
patch since I don't know when.

Okay for trunk?  (regstrapped multiple times on x86_64-linux, with all 
languages)


Ciao,
Michael.

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

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 173940)
+++ Makefile.in	(working copy)
@@ -1189,7 +1189,7 @@ C_OBJS = c-lang.o c-family/stub-objc.o $
 # 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) \