X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2FMakefile.am;h=74db37a336dc668e4594d4ec330b2fa6392de72a;hb=8a498d38bec4ed8f542bf436882266fb19f3b2d9;hp=a01aef4aab138a5a413b43d71cab2edb764d4c80;hpb=14bfc3f55540e60253cc4aae73261325309f750a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/Makefile.am b/gold/Makefile.am
index a01aef4aab..74db37a336 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -2,70 +2,154 @@
 
 AUTOMAKE_OPTIONS =
 
-SUBDIRS = po
+SUBDIRS = po testsuite
 
 tooldir = $(exec_prefix)/$(target_alias)
 
 ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 
-AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS)
+AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS)
 
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
+	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
 	@INCINTL@
 
+LIBIBERTY = ../libiberty/libiberty.a
+
+if PLUGINS
+LIBDL = -ldl
+endif
+
+if THREADS
+THREADSLIB = -lpthread
+endif
+
+AM_YFLAGS = -d
+
 noinst_PROGRAMS = ld-new
+noinst_LIBRARIES = libgold.a
 
 CCFILES = \
+	archive.cc \
+	binary.cc \
+	common.cc \
+	compressed_output.cc \
+	copy-relocs.cc \
+	cref.cc \
+	defstd.cc \
+	descriptors.cc \
 	dirsearch.cc \
+	dynobj.cc \
+	dwarf_reader.cc \
+	ehframe.cc \
+	errors.cc \
+	expression.cc \
 	fileread.cc \
 	gold.cc \
 	gold-threads.cc \
+	layout.cc \
+	mapfile.cc \
+	merge.cc \
 	object.cc \
 	options.cc \
+	output.cc \
+	parameters.cc \
+	plugin.cc \
 	readsyms.cc \
+	reduced_debug_output.cc \
+	reloc.cc \
 	resolve.cc \
-	symtab.cc \
+	script-sections.cc \
+	script.cc \
 	stringpool.cc \
+	symtab.cc \
 	target-select.cc \
-	workqueue.cc
+	version.cc \
+	workqueue.cc \
+	workqueue-threads.cc
 
 HFILES = \
+	archive.h \
+	binary.h \
+	common.h \
+	compressed_output.h \
+	copy-relocs.h \
+	cref.h \
+	defstd.h \
 	dirsearch.h \
+	descriptors.h \
+	dynobj.h \
+	dwarf_reader.h \
+	ehframe.h \
+	errors.h \
 	fileread.h \
 	gold.h \
 	gold-threads.h \
+	layout.h \
+	mapfile.h \
+	merge.h \
 	object.h \
 	options.h \
+	output.h \
+	parameters.h \
+	plugin.h \
 	readsyms.h \
+	reduced_debug_output.h \
+	reloc.h \
+	reloc-types.h \
+	script-c.h \
+	script-sections.h \
+	script.h \
 	stringpool.h \
 	symtab.h \
 	target.h \
-	targetsize.h \
+	target-reloc.h \
 	target-select.h \
-	workqueue.h
+	tls.h \
+	token.h \
+	workqueue.h \
+	workqueue-internal.h
 
-TARGETFILES = \
-	i386.cc
+YFILES = \
+	yyscript.y
 
-OFILES = gold.o options.o
+EXTRA_DIST = yyscript.c yyscript.h
 
-POTFILES= $(CCFILES) $(HFILES) $(TARGETFILES)
+TARGETSOURCES = \
+	i386.cc x86_64.cc sparc.cc powerpc.cc
 
-po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
-	  && mv tmp $(srcdir)/po/POTFILES.in
+ALL_TARGETOBJS = \
+	i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT) powerpc.$(OBJEXT)
+
+libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
 
-ld_new_SOURCES = $(CCFILES) $(HFILES) $(TARGETFILES)
-ld_new_DEPENDENCIES = $(LIBINTL_DEP)
-ld_new_LDADD = $(LIBINTL)
+sources_var = main.cc
+deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
+ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
+	 $(THREADSLIB) $(LIBDL)
+
+ld_new_SOURCES = $(sources_var)
+ld_new_DEPENDENCIES = $(deps_var) $(LIBOBJS)
+ld_new_LDADD = $(ldadd_var) $(LIBOBJS)
+
+EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
+
+# Use an explicit dependency for the bison generated header file.
+expression.$(OBJEXT): yyscript.h
+script-sections.$(OBJEXT): yyscript.h
+script.$(OBJEXT): yyscript.h
+
+# We have to build libgold.a before we run the tests.
+check: libgold.a
 
 .PHONY: install-exec-local
 
 install-exec-local: ld-new$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin
-	n=`echo ld | sed '$(transform)'; \
+	n=`echo ld | sed '$(transform)'`; \
 	$(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \
 	if test "$(bindir)" != "$(tooldir)/bin"; then \
 	  rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
@@ -76,3 +160,75 @@ install-exec-local: ld-new$(EXEEXT)
 # We want install to imply install-info as per GNU standards, despite
 # the cygnus option.
 install-data-local: install-info
+
+POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
+
+po/POTFILES.in: @MAINT@ Makefile
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
+	  && mv tmp $(srcdir)/po/POTFILES.in
+
+# Bootstrap test support.  We use ld-new to build ld1, then use ld1 to
+# build ld2.  ld1 and ld2 should be identical.  ld-new need not be
+# identical to ld1, since it was linked with the host linker.
+
+if GCC
+if NATIVE_LINKER
+
+gcctestdir1/ld: ld-new
+	test -d gcctestdir1 || mkdir -p gcctestdir1
+	rm -f gcctestdir1/ld
+	(cd gcctestdir1 && $(LN_S) ../ld-new ld)
+
+ld1_SOURCES = $(sources_var)
+ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld
+ld1_LDADD = $(ldadd_var)
+ld1_LDFLAGS = -Bgcctestdir1/
+
+gcctestdir2/ld: ld1
+	test -d gcctestdir2 || mkdir -p gcctestdir2
+	rm -f gcctestdir2/ld
+	(cd gcctestdir2 && $(LN_S) ../ld1 ld)
+
+ld2_SOURCES = $(sources_var)
+ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld
+ld2_LDADD = $(ldadd_var)
+ld2_LDFLAGS = -Bgcctestdir2/
+
+bootstrap-test: ld2
+	rm -f $@
+	echo "#!/bin/sh" > $@
+	echo "cmp ld1 ld2" > $@
+	chmod +x $@
+
+libgold-1-r.o: gcctestdir1/ld libgold.a
+	gcctestdir1/ld -o $@ -r --whole-archive libgold.a
+
+ld1_r_SOURCES = $(sources_var)
+ld1_r_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld
+ld1_r_LDADD = libgold-1-r.o $(ldadd_var)
+ld1_r_LDFLAGS = -Bgcctestdir1/
+
+gcctestdir2-r/ld: ld1-r
+	test -d gcctestdir2-r || mkdir -p gcctestdir2-r
+	rm -f gcctestdir2-r/ld
+	(cd gcctestdir2-r && $(LN_S) ../ld1-r ld)
+
+libgold-2-r.o: gcctestdir2-r/ld libgold.a
+	gcctestdir2-r/ld -o $@ -r --whole-archive libgold.a
+
+ld2_r_SOURCES = $(sources_var)
+ld2_r_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld
+ld2_r_LDADD = libgold-2-r.o $(ldadd_var)
+ld2_r_LDFLAGS = -Bgcctestdir2-r/
+
+bootstrap-test-r: ld2-r
+	rm -f $@
+	echo "#!/bin/sh" > $@
+	echo "cmp ld1-r ld2-r" > $@
+	chmod +x $@
+
+check_PROGRAMS = ld1 ld2 ld1-r ld2-r
+TESTS = bootstrap-test bootstrap-test-r
+
+endif
+endif