From e1dfd97dc8612caea173c84807766ea9698a0113 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 10 Dec 1998 16:16:08 +0000 Subject: [PATCH] Thu Dec 10 11:12:28 1998 Andreas Schwab * Makefile.am (ALL_EMULATIONS): Remove pe-dll.o and deffilep.o. (ALL_EMUL_EXTRA_OFILES): New variable. Put them here instead. * configure.in: Set EMUL_EXTRA_OFILES to $(ALL_EMUL_EXTRA_OFILES) if configuring with all targets. * configure, Makefile.in, aclocal.m4: Rebuild. * emultempl/pe.em (pe_enable_stdcall_fixup): Make static. (pe_dll_do_default_excludes): Removed, unused. (pe_def_file, pe_dll_export_everything, pe_dll_kill_ats, pe_dll_stdcall_aliases): Don't initialize them, this file may be compiled more than once. * pe-dll.c (pe_def_file, pe_dll_export_everything, pe_dll_do_default_excludes, pe_dll_kill_ats, pe_dll_stdcall_aliases): Define and initialize them here instead. (generate_reloc): Fix allocation of reloc_addresses array to use bfd_vma instead of unsigned long. Fix element size in qsort call. (reloc_sort): Compare pointers to bfd_vma instead of unsigned long. --- ld/configure | 6 +++--- ld/configure.in | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ld/configure b/ld/configure index 21a278fc831..d52d28a3dba 100755 --- a/ld/configure +++ b/ld/configure @@ -1354,7 +1354,7 @@ case "$host" in CFLAGS="$CFLAGS -belf" ;; -*-*-cygwin32*) +*-*-cygwin*) # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 @@ -3472,7 +3472,7 @@ else #include "confdefs.h" int main() { -return __CYGWIN__; +return __CYGWIN32__; ; return 0; } EOF if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -4274,7 +4274,7 @@ if test x${all_targets} = xtrue; then else EMULATION_OFILES='$(ALL_EMULATIONS)' fi - EMUL_EXTRA_OFILES='' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' else EMULATION_OFILES=$all_emuls EMUL_EXTRA_OFILES=$all_emul_extras diff --git a/ld/configure.in b/ld/configure.in index 290560901df..6846641f544 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -42,7 +42,6 @@ AM_PROG_INSTALL ALL_LINGUAS= CY_GNU_GETTEXT -AM_CYGWIN32 AM_EXEEXT AC_PROG_YACC @@ -137,7 +136,7 @@ if test x${all_targets} = xtrue; then else EMULATION_OFILES='$(ALL_EMULATIONS)' fi - EMUL_EXTRA_OFILES='' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' else EMULATION_OFILES=$all_emuls EMUL_EXTRA_OFILES=$all_emul_extras -- 2.30.2