X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2FMakefile.am;h=3860e7981069a5be64ae6ea3078dc36c2e06d964;hb=57d87c09a33acdce280f4c9ae4f55b885a5cee99;hp=e0665e04f81d7bedb9be4f371fd55e2dd820068b;hpb=0d31c79dad789b6e82620d842e8ba8c5d71cde88;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/Makefile.am b/gold/Makefile.am index e0665e04f8..3860e79810 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -1,4 +1,21 @@ -# Process this file with automake to generate Makefile.in +## Process this file with automake to generate Makefile.in +# +# Copyright (C) 2006-2020 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING3. If not see +# . +# AUTOMAKE_OPTIONS = foreign @@ -8,23 +25,29 @@ tooldir = $(exec_prefix)/$(target_alias) ACLOCAL_AMFLAGS = -I ../bfd -I ../config -AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) -AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz +ZLIBINC = @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 \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ - @INCINTL@ + -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@ LIBIBERTY = ../libiberty/libiberty.a if PLUGINS -LIBDL = -ldl -endif - -if THREADS -THREADSLIB = -lpthread +LIBDL = @DLOPEN_LIBS@ endif AM_YFLAGS = -d @@ -34,6 +57,8 @@ AM_YFLAGS = -d am__skiplex = am__skipyacc = +bin_PROGRAMS = dwp + noinst_PROGRAMS = ld-new incremental-dump noinst_LIBRARIES = libgold.a @@ -55,6 +80,7 @@ CCFILES = \ expression.cc \ fileread.cc \ gc.cc \ + gdb-index.cc \ gold.cc \ gold-threads.cc \ icf.cc \ @@ -63,6 +89,7 @@ CCFILES = \ layout.cc \ mapfile.cc \ merge.cc \ + nacl.cc \ object.cc \ options.cc \ output.cc \ @@ -85,6 +112,7 @@ CCFILES = \ HFILES = \ arm-reloc-property.h \ + aarch64-reloc-property.h \ archive.h \ attributes.h \ binary.h \ @@ -102,6 +130,7 @@ HFILES = \ fileread.h \ freebsd.h \ gc.h \ + gdb-index.h \ gold.h \ gold-threads.h \ icf.h \ @@ -109,6 +138,7 @@ HFILES = \ layout.h \ mapfile.h \ merge.h \ + nacl.h \ object.h \ options.h \ output.h \ @@ -135,28 +165,35 @@ HFILES = \ YFILES = \ yyscript.y -DEFFILES = arm-reloc.def +DEFFILES = arm-reloc.def aarch64-reloc.def EXTRA_DIST = yyscript.c yyscript.h +diststuff: $(EXTRA_DIST) + TARGETSOURCES = \ - i386.cc x86_64.cc sparc.cc powerpc.cc arm.cc arm-reloc-property.cc + i386.cc x86_64.cc sparc.cc powerpc.cc arm.cc arm-reloc-property.cc tilegx.cc \ + mips.cc aarch64.cc aarch64-reloc-property.cc s390.cc ALL_TARGETOBJS = \ i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT) powerpc.$(OBJEXT) \ - arm.$(OBJEXT) arm-reloc-property.$(OBJEXT) + arm.$(OBJEXT) arm-reloc-property.$(OBJEXT) tilegx.$(OBJEXT) \ + mips.$(OBJEXT) aarch64.$(OBJEXT) aarch64-reloc-property.$(OBJEXT) \ + s390.$(OBJEXT) libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES) libgold_a_LIBADD = $(LIBOBJS) sources_var = main.cc deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP) -ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \ - $(THREADSLIB) $(LIBDL) +ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \ + $(THREADLIBS) $(LIBDL) $(ZLIB) +ldflags_var = $(GOLD_LDFLAGS) ld_new_SOURCES = $(sources_var) ld_new_DEPENDENCIES = $(deps_var) ld_new_LDADD = $(ldadd_var) +ld_new_LDFLAGS = $(ldflags_var) EXTRA_ld_new_SOURCES = $(TARGETSOURCES) @@ -164,7 +201,15 @@ 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) + $(THREADLIBS) $(LIBDL) $(ZLIB) + +dwp_SOURCES = dwp.cc +dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP) +dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \ + $(LIBDL) $(ZLIB) +dwp_LDFLAGS = $(GOLD_LDFLAGS) + +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/../bfd/development.sh # Use an explicit dependency for the bison generated header file. expression.$(OBJEXT): yyscript.h @@ -178,12 +223,24 @@ check: libgold.a install-exec-local: ld-new$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin - n=`echo ld | sed '$(transform)'`; \ - $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \ + n=`echo $(installed_linker) | sed '$(transform)'`; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \ + ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \ if test "$(bindir)" != "$(tooldir)/bin"; then \ - rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ - ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ + rm -f $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ + fi; \ + if test "x$(install_as_default)" = "xyes"; then \ + ld=`echo ld | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ + if test "$(bindir)" != "$(tooldir)/bin"; then \ + rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ + fi; \ fi # We want install to imply install-info as per GNU standards, despite @@ -203,61 +260,132 @@ 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 $@ echo "#!/bin/sh" > $@ - echo "cmp ld1 ld2" > $@ + 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_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 $@ echo "#!/bin/sh" > $@ - echo "cmp ld1-r ld2-r" > $@ + echo "cmp ld1-r ld2-r" >> $@ chmod +x $@ 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 +# for the number of threads. However, the build ID should change if +# we change the chunk size for --build-id=tree, so ld4 should be +# different. We run the latter test even if multithreading is unavailable, +# because the treehash can still operate in that mode. +check_PROGRAMS += ld4 +TESTS += bootstrap-test-treehash-chunksize +MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize + +gcctestdir3/ld gcctestdir3/collect-ld: ld-new + test -d gcctestdir3 || mkdir -p gcctestdir3 + rm -f $@ + $(LN_S) $(abs_top_builddir)/ld-new $@ + +ld3_SOURCES = $(sources_var) +ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld gcctestdir3/collect-ld +ld3_LDADD = $(ldadd_var) +editcc3 = -e 's/\([^ ]*\)\(.*\)/\1 -Bgcctestdir3\/\2/' +ld3_LINK = `echo $(CXXLD) | sed $(editcc3)`\ + $(AM_CXXFLAGS) $(CXXFLAGS) $(ld3_LDFLAGS) $(LDFLAGS) -o $@ + +gcctestdir4/ld gcctestdir4/collect-ld: ld-new + test -d gcctestdir4 || mkdir -p gcctestdir4 + rm -f $@ + $(LN_S) $(abs_top_builddir)/ld-new $@ + +ld4_SOURCES = $(sources_var) +ld4_DEPENDENCIES = $(deps_var) gcctestdir4/ld gcctestdir4/collect-ld +ld4_LDADD = $(ldadd_var) +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 + +if THREADS + +ld1_LDFLAGS += -Wl,--thread-count=3 +ld2_LDFLAGS += -Wl,--thread-count=3 +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 $@ + echo "#!/bin/sh" > $@ + echo "cmp ld1 ld3" >> $@ + chmod +x $@ + +endif + +bootstrap-test-treehash-chunksize: ld1 ld4 + rm -f $@ + echo "#!/bin/sh" > $@ + echo "cmp ld1 ld4 | grep ." >> $@ + chmod +x $@ endif endif