2014-03-17 Christopher Faylor <me.cygwin2014@cgf.cx>

	* Makefile.am: Use host version of windres.
	* Makefile.in: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9c728aee74605b9e06a3d32dd5e2063629675927..af8924d37e283418002cd8e4108718c805abbde0 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,18 @@
+2014-03-17  Christopher Faylor  <me.cygwin2014@cgf.cx>
+
+       * Makefile.am: Use host version of windres.
+       * Makefile.in: Regenerate.
+
+2014-03-14  Christopher Faylor  <me.cygwin2013@cgf.cx>
+
+       * 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  <romain.geissler@amadeus.com>
            Alan Modra  <amodra@gmail.com>
 

diff --git a/ld/Makefile.am b/ld/Makefile.am
index fe674c4c64853692e29bd6764830a4b786c9f504..e89a6c193f360f86615b877a75796debb5200681 100644 (file)
--- 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 46126f8e62c11c740ca1b08c67d712beaaae7b13..0c14694fb50b1e62c39637f363878840afac844e 100644 (file)
--- 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; \