From 31866b2cd49643af39501f9ae5ca2d4a9b36872e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 23 Feb 2016 08:24:18 -0800 Subject: [PATCH] Replace $(ELF_DEPS) with $(ELF_X86_DEPS) Define ELF_X86_DEPS with $(ELF_DEPS) plus emulparams/plt_unwind.sh, extern_protected_data.sh and call_nop.sh. * Makefile.am (ELF_X86_DEPS): New. (eelf_i386.c): Replace $(ELF_DEPS) with $(ELF_X86_DEPS). (eelf_i386_chaos.c): Likewise. (eelf_i386_fbsd.c): Likewise. (eelf_i386_ldso.c): Likewise. (eelf_i386_nacl.c): Likewise. (eelf_i386_sol2.c): Likewise. (eelf_iamcu.c): Likewise. (eelf32_x86_64.c): Likewise. (eelf32_x86_64_nacl.c): Likewise. (eelf_l1om.c): Likewise. (eelf_l1om_fbsd.c): Likewise. (eelf_k1om.c): Likewise. (eelf_k1om_fbsd.c): Likewise. (eelf_x86_64.c): Likewise. (eelf_x86_64_cloudabi.c): Likewise. (eelf_x86_64_fbsd.c): Likewise. (eelf_x86_64_sol2.c): Likewise. * Makefile.in: Regenerated. --- ld/ChangeLog | 22 ++++++++++++++++++++++ ld/Makefile.am | 39 +++++++++++++++++++++------------------ ld/Makefile.in | 40 ++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 36 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 665f4f4408..7eacba8fe2 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,25 @@ +2016-02-23 H.J. Lu + + * Makefile.am (ELF_X86_DEPS): New. + (eelf_i386.c): Replace $(ELF_DEPS) with $(ELF_X86_DEPS). + (eelf_i386_chaos.c): Likewise. + (eelf_i386_fbsd.c): Likewise. + (eelf_i386_ldso.c): Likewise. + (eelf_i386_nacl.c): Likewise. + (eelf_i386_sol2.c): Likewise. + (eelf_iamcu.c): Likewise. + (eelf32_x86_64.c): Likewise. + (eelf32_x86_64_nacl.c): Likewise. + (eelf_l1om.c): Likewise. + (eelf_l1om_fbsd.c): Likewise. + (eelf_k1om.c): Likewise. + (eelf_k1om_fbsd.c): Likewise. + (eelf_x86_64.c): Likewise. + (eelf_x86_64_cloudabi.c): Likewise. + (eelf_x86_64_fbsd.c): Likewise. + (eelf_x86_64_sol2.c): Likewise. + * Makefile.in: Regenerated. + 2016-02-23 H.J. Lu * testsuite/ld-frv/fdpic-pie-6.d: Updated. diff --git a/ld/Makefile.am b/ld/Makefile.am index 818af5aa5c..7339298fa9 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -669,6 +669,9 @@ GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed ELF_DEPS = $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/scripttempl/DWARF.sc ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/emultempl/genelf.em $(srcdir)/scripttempl/DWARF.sc +ELF_X86_DEPS = $(ELF_DEPS) $(srcdir)/emulparams/plt_unwind.sh \ + $(srcdir)/emulparams/extern_protected_data.sh \ + $(srcdir)/emulparams/call_nop.sh @TDIRS@ @@ -1299,37 +1302,37 @@ eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \ $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS} eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \ $(srcdir)/emulparams/elf_i386.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \ $(srcdir)/emulparams/elf_i386.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ $(srcdir)/emulparams/solaris2.sh \ $(srcdir)/emultempl/solaris2.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_iamcu.c: $(srcdir)/emulparams/elf_iamcu.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -1864,12 +1867,12 @@ ez8002.c: $(srcdir)/emulparams/z8002.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS} eelf32_x86_64.c: $(srcdir)/emulparams/elf32_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf32_x86_64_nacl.c: $(srcdir)/emulparams/elf32_x86_64_nacl.sh \ $(srcdir)/emulparams/elf32_x86_64.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf64_aix.c: $(srcdir)/emulparams/elf64_aix.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -1977,40 +1980,40 @@ eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \ $(srcdir)/emulparams/elf_l1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \ $(srcdir)/emulparams/elf_k1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_cloudabi.c: $(srcdir)/emulparams/elf_x86_64_cloudabi.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_nacl.c: $(srcdir)/emulparams/elf_x86_64_nacl.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_sol2.c: $(srcdir)/emulparams/elf_x86_64_sol2.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ $(srcdir)/emulparams/solaris2.sh \ $(srcdir)/emultempl/solaris2.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index cc13a1e15c..8803e22c7f 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -885,6 +885,10 @@ GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed ELF_DEPS = $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/scripttempl/DWARF.sc ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/emultempl/genelf.em $(srcdir)/scripttempl/DWARF.sc +ELF_X86_DEPS = $(ELF_DEPS) $(srcdir)/emulparams/plt_unwind.sh \ + $(srcdir)/emulparams/extern_protected_data.sh \ + $(srcdir)/emulparams/call_nop.sh + # We need this for automake to use YLWRAP. # Allow dependency tracking to work for these files, too. @@ -2805,37 +2809,37 @@ eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \ $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS} eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \ $(srcdir)/emulparams/elf_i386.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \ $(srcdir)/emulparams/elf_i386.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ $(srcdir)/emulparams/solaris2.sh \ $(srcdir)/emultempl/solaris2.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_iamcu.c: $(srcdir)/emulparams/elf_iamcu.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -3370,12 +3374,12 @@ ez8002.c: $(srcdir)/emulparams/z8002.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS} eelf32_x86_64.c: $(srcdir)/emulparams/elf32_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf32_x86_64_nacl.c: $(srcdir)/emulparams/elf32_x86_64_nacl.sh \ $(srcdir)/emulparams/elf32_x86_64.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf64_aix.c: $(srcdir)/emulparams/elf64_aix.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -3483,40 +3487,40 @@ eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \ $(srcdir)/emulparams/elf_l1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \ $(srcdir)/emulparams/elf_k1om.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_cloudabi.c: $(srcdir)/emulparams/elf_x86_64_cloudabi.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_nacl.c: $(srcdir)/emulparams/elf_x86_64_nacl.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ $(srcdir)/emulparams/elf_nacl.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf_x86_64_sol2.c: $(srcdir)/emulparams/elf_x86_64_sol2.sh \ $(srcdir)/emulparams/elf_x86_64.sh \ $(srcdir)/emulparams/solaris2.sh \ $(srcdir)/emultempl/solaris2.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -- 2.34.1