X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2FMakefile.am;h=7ed78e102580f8e6cd371bd0f1e7f7129af40b8a;hb=d4693039f950eefb983a66e3270209b738e4ce8a;hp=7bfba67ad51bdad8a4b66da17a062e3b71d04e0c;hpb=e79a4bad70029595e43cc536c0d1e60d5d6ee115;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/Makefile.am b/gold/Makefile.am
index 7bfba67ad5..7ed78e1025 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 #
-#  Copyright (C) 2006-2015 Free Software Foundation, Inc.
+#  Copyright (C) 2006-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,8 +31,12 @@ ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 ZLIB = @zlibdir@ -lz
 ZLIBINC = @zlibinc@
 
-AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) $(ZLIBINC)
-AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) $(ZLIBINC)
+THREADFLAGS = @PTHREAD_CFLAGS@
+THREADLIBS = @PTHREAD_LIBS@
+
+AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) $(ZLIBINC) $(THREADFLAGS)
+AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) $(ZLIBINC) $(THREADFLAGS)
+AM_LDFLAGS = $(THREADFLAGS)
 
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
@@ -46,10 +50,6 @@ if PLUGINS
 LIBDL = @DLOPEN_LIBS@
 endif
 
-if THREADS
-THREADSLIB = -lpthread
-endif
-
 AM_YFLAGS = -d
 
 # Automake 1.10+ disables lex and yacc output file regeneration if
@@ -187,7 +187,7 @@ libgold_a_LIBADD = $(LIBOBJS)
 sources_var = main.cc
 deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
 ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
-	 $(THREADSLIB) $(LIBDL) $(ZLIB)
+	 $(THREADLIBS) $(LIBDL) $(ZLIB)
 ldflags_var = $(GOLD_LDFLAGS)
 
 ld_new_SOURCES = $(sources_var)
@@ -201,11 +201,11 @@ incremental_dump_SOURCES = incremental-dump.cc
 incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
 	$(LIBINTL_DEP)
 incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
-	 $(THREADSLIB) $(LIBDL) $(ZLIB)
+	 $(THREADLIBS) $(LIBDL) $(ZLIB)
 
 dwp_SOURCES = dwp.cc
 dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
-dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADSLIB) \
+dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
 	$(LIBDL) $(ZLIB)
 dwp_LDFLAGS = $(GOLD_LDFLAGS)
 
@@ -260,25 +260,29 @@ po/POTFILES.in: @MAINT@ Makefile
 if GCC
 if NATIVE_LINKER
 
-gcctestdir1/ld: ld-new
+gcctestdir1/ld gcctestdir1/collect-ld: ld-new
 	test -d gcctestdir1 || mkdir -p gcctestdir1
-	rm -f gcctestdir1/ld
-	(cd gcctestdir1 && $(LN_S) ../ld-new ld)
+	rm -f $@
+	$(LN_S) $(abs_top_builddir)/ld-new $@
 
 ld1_SOURCES = $(sources_var)
-ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld
+ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
 ld1_LDADD = $(ldadd_var)
-ld1_LDFLAGS = -Bgcctestdir1/
+editcc1 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir1\/\2/'
+ld1_LINK = `echo $(CXXLD) | sed $(editcc1)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_LDFLAGS) $(LDFLAGS) -o $@
 
-gcctestdir2/ld: ld1
+gcctestdir2/ld gcctestdir2/collect-ld: ld1
 	test -d gcctestdir2 || mkdir -p gcctestdir2
-	rm -f gcctestdir2/ld
-	(cd gcctestdir2 && $(LN_S) ../ld1 ld)
+	rm -f $@
+	$(LN_S) $(abs_top_builddir)/ld1 $@
 
 ld2_SOURCES = $(sources_var)
-ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld
+ld2_DEPENDENCIES = $(deps_var) gcctestdir2/ld gcctestdir2/collect-ld
 ld2_LDADD = $(ldadd_var)
-ld2_LDFLAGS = -Bgcctestdir2/
+editcc2 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2\/\2/'
+ld2_LINK = `echo $(CXXLD) | sed $(editcc2)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(ld2_LDFLAGS) $(LDFLAGS) -o $@
 
 bootstrap-test: ld2
 	rm -f $@
@@ -290,22 +294,25 @@ 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_DEPENDENCIES = libgold-1-r.o $(deps_var) gcctestdir1/ld gcctestdir1/collect-ld
 ld1_r_LDADD = libgold-1-r.o $(ldadd_var)
-ld1_r_LDFLAGS = -Bgcctestdir1/
+ld1_r_LINK = `echo $(CXXLD) | sed $(editcc1)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
-gcctestdir2-r/ld: ld1-r
+gcctestdir2-r/ld gcctestdir2-r/collect-ld: ld1-r
 	test -d gcctestdir2-r || mkdir -p gcctestdir2-r
-	rm -f gcctestdir2-r/ld
-	(cd gcctestdir2-r && $(LN_S) ../ld1-r ld)
+	rm -f $@
+	$(LN_S) $(abs_top_builddir)/ld1-r $@
 
 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_DEPENDENCIES = libgold-2-r.o $(deps_var) gcctestdir2-r/ld gcctestdir2-r/collect-ld
 ld2_r_LDADD = libgold-2-r.o $(ldadd_var)
-ld2_r_LDFLAGS = -Bgcctestdir2-r/
+editcc2r = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir2-r\/\2/'
+ld2_r_LINK = `echo $(CXXLD) | sed $(editcc2r)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
 bootstrap-test-r: ld2-r
 	rm -f $@
@@ -315,6 +322,7 @@ bootstrap-test-r: ld2-r
 
 check_PROGRAMS = ld1 ld2 ld1-r ld2-r
 TESTS = bootstrap-test bootstrap-test-r
+MOSTLYCLEANFILES = bootstrap-test bootstrap-test-r
 
 # Verify that changing the number of threads doesn't change the
 # treehash computation, by building ld1 and ld3 the same way except
@@ -324,31 +332,36 @@ TESTS = bootstrap-test bootstrap-test-r
 # because the treehash can still operate in that mode.
 check_PROGRAMS += ld4
 TESTS += bootstrap-test-treehash-chunksize
+MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize
 
-gcctestdir3/ld: ld-new
+gcctestdir3/ld gcctestdir3/collect-ld: ld-new
 	test -d gcctestdir3 || mkdir -p gcctestdir3
-	rm -f gcctestdir3/ld
-	(cd gcctestdir3 && $(LN_S) ../ld-new ld)
+	rm -f $@
+	$(LN_S) $(abs_top_builddir)/ld-new $@
 
 ld3_SOURCES = $(sources_var)
-ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld
+ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld gcctestdir3/collect-ld
 ld3_LDADD = $(ldadd_var)
-ld3_LDFLAGS = -Bgcctestdir3/
+editcc3 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir3\/\2/'
+ld3_LINK = `echo $(CXXLD) | sed $(editcc3)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(ld3_LDFLAGS) $(LDFLAGS) -o $@
 
-gcctestdir4/ld: ld-new
+gcctestdir4/ld gcctestdir4/collect-ld: ld-new
 	test -d gcctestdir4 || mkdir -p gcctestdir4
-	rm -f gcctestdir4/ld
-	(cd gcctestdir4 && $(LN_S) ../ld-new ld)
+	rm -f $@
+	$(LN_S) $(abs_top_builddir)/ld-new $@
 
 ld4_SOURCES = $(sources_var)
-ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld
+ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld gcctestdir4/collect-ld
 ld4_LDADD = $(ldadd_var)
-ld4_LDFLAGS = -Bgcctestdir4/
+editcc4 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir4\/\2/'
+ld4_LINK = `echo $(CXXLD) | sed $(editcc4)`\
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(ld4_LDFLAGS) $(LDFLAGS) -o $@
 
-ld1_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
-ld2_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
-ld3_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
-ld4_LDFLAGS += -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12346 -Wl,--build-id-min-file-size-for-treehash=0
+ld1_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
+ld2_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
+ld3_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12345 -Wl,--build-id-min-file-size-for-treehash=0
+ld4_LDFLAGS = -Wl,--build-id=tree -Wl,--build-id-chunk-size-for-treehash=12346 -Wl,--build-id-min-file-size-for-treehash=0
 
 if THREADS
 
@@ -358,6 +371,7 @@ ld3_LDFLAGS += -Wl,--thread-count=13
 ld4_LDFLAGS += -Wl,--thread-count=3
 check_PROGRAMS += ld3
 TESTS += bootstrap-test-treehash-chunksize
+MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize
 
 bootstrap-test-treehash: ld1 ld3
 	rm -f $@