From c712f1e3f711d0f3b694cdfcf4a965d8419fde94 Mon Sep 17 00:00:00 2001 From: Chris Faylor Date: Mon, 17 Mar 2014 13:09:15 -0400 Subject: [PATCH] 2014-03-17 Christopher Faylor * Makefile.am: Use host version of windres. * Makefile.in: Regenerate. --- ld/ChangeLog | 15 +++++++++++++++ ld/Makefile.am | 2 +- ld/Makefile.in | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 9c728aee746..af8924d37e2 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,18 @@ +2014-03-17 Christopher Faylor + + * Makefile.am: Use host version of windres. + * Makefile.in: Regenerate. + +2014-03-14 Christopher Faylor + + * ld.texinfo: Document change in handling of --enable-auto-image-base. + * emultempl/pe.em (pe_auto_image_base): Set to default base. + (gld_${EMULATION_NAME}_list_options): Change usage message to reflect + optional --enable-auto-image-base argument. + (gld${EMULATION_NAME}_handle_option): Handle optional + --enable-auto-image-base argument. + (compute_dll_image_base): Eliminate constant. Use pe_auto_image_base. + 2014-03-14 Romain Geissler Alan Modra diff --git a/ld/Makefile.am b/ld/Makefile.am index fe674c4c648..e89a6c193f3 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1927,7 +1927,7 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \ # Rule to create a manifest file for Cygwin and Mingw. default-manifest.o: $(srcdir)/emultempl/default-manifest.rc - ../binutils/windres -o $@ $< + ${WINDRES} -o $@ $< # We need this for automake to use YLWRAP. EXTRA_ld_new_SOURCES = deffilep.y ldlex.l diff --git a/ld/Makefile.in b/ld/Makefile.in index 46126f8e62c..0c14694fb50 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -3359,7 +3359,7 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \ # Rule to create a manifest file for Cygwin and Mingw. default-manifest.o: $(srcdir)/emultempl/default-manifest.rc - ../binutils/windres -o $@ $< + ${WINDRES} -o $@ $< check-DEJAGNU: site.exp srcroot=`cd $(srcdir) && pwd`; export srcroot; \ -- 2.30.2