* 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.
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
#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
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
ALL_LINGUAS=
CY_GNU_GETTEXT
-AM_CYGWIN32
AM_EXEEXT
AC_PROG_YACC
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