diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-08-07 09:21:09 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-08-07 09:21:09 +0000 |
| commit | 1e0cb9ee0afd1bb6ba9674cb46989a1f87608be3 (patch) | |
| tree | 5ef7eef3f79c1afa10dc2b3b670184f084330dbe | |
| parent | 45a2f09e55c4aa38078efa6ca877062095b162a6 (diff) | |
| download | cygnal-1e0cb9ee0afd1bb6ba9674cb46989a1f87608be3.tar.gz cygnal-1e0cb9ee0afd1bb6ba9674cb46989a1f87608be3.tar.bz2 cygnal-1e0cb9ee0afd1bb6ba9674cb46989a1f87608be3.zip | |
* Makefile.in: Allow previous patch to work in a 64 bit environment.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 064f21f0c..c4bd70cca 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2005-08-06 Corinna Vinschen <corinna@vinschen.de> + + * Makefile.in: Allow previous patch to work in a 64 bit environment. + 2005-08-06 Christopher Faylor <cgf@timesys.com> * 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 9949a1ee1..e968f72a3 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);\ |