From d38f048dca5b303681042a4e7e6874d6ec9aa77b Mon Sep 17 00:00:00 2001 From: corinna Date: Sun, 7 Aug 2005 09:21:07 +0000 Subject: [PATCH] * Makefile.in: Allow previous patch to work in a 64 bit environment. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 064f21f0c8..c4bd70ccaf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2005-08-06 Corinna Vinschen + + * Makefile.in: Allow previous patch to work in a 64 bit environment. + 2005-08-06 Christopher Faylor * Makefile.in: Warn when end of cygheap is not on 64k boundary. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 9949a1ee1a..e968f72a38 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -372,7 +372,7 @@ $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ $(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \ -lgcc $(DLL_IMPORTS) - @$(NM) $@ | perl -Minteger -n -e '/^(61[0-9a-f]+) A __cygheap_end/ and do {$$cygheap_end = $$1; exit;};\ + @$(NM) $@ | perl -Minteger -n -e '/^((0{8})?61[0-9a-f]+) A __cygheap_end/ and do {$$cygheap_end = $$1; exit;};\ END { \ die "ERROR: _cygheap_end not found in $@\n" unless defined($$cygheap_end); \ die "ERROR: _cygheap_end is not on a 64k boundary (0x$$cygheap_end)!\n" if (hex($$cygheap_end) & 0xffff);\ -- 2.11.0