aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog15
-rw-r--r--ld/Makefile.am2
-rw-r--r--ld/Makefile.in2
3 files changed, 17 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9c728ae..af8924d 100644
--- 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 fe674c4..e89a6c1 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 46126f8..0c14694 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; \