* Makefile.in (VPATH): Drop CONFIG_DIR.
(EXTRA_DLL_OFILES): Remove. (DLL_OFILES): Remove EXTRA_DLL_OFILES. (ASFLAGS): Define as -D_WIN64 on x86_64. (GMON_OFILES): Add mcountFunc.o. ($(srcdir)/$(TLSOFFSETS_H)): Use target_cpu rather than CONFIG_DIR. * configure.ac (CONFIG_DIR): Remove definition. * configure: Regenerate. * gcrt0.c: Use latest version from Mingw-w64 project. * gmon.c: Ditto. * gmon.h: Ditto. * mcount.c: Ditto. * mcountFunc.S: Ditto, new file. * profil.c: Ditto. * profil.h: Ditto. * config: Remove entire directory.
This commit is contained in:
@ -77,14 +77,14 @@ case "$target_cpu" in
|
||||
DEF_DLL_ENTRY="dll_entry@12"
|
||||
DIN_FILE="i686.din"
|
||||
TLSOFFSETS_H="tlsoffsets.h"
|
||||
CONFIG_DIR="i386" ;;
|
||||
;;
|
||||
x86_64)
|
||||
DLL_NAME="cygwin1.dll"
|
||||
DLL_ENTRY="dll_entry"
|
||||
DEF_DLL_ENTRY="dll_entry"
|
||||
DIN_FILE="x86_64.din"
|
||||
TLSOFFSETS_H="tlsoffsets64.h"
|
||||
CONFIG_DIR="x86_64" ;;
|
||||
;;
|
||||
*) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;;
|
||||
esac
|
||||
|
||||
@ -95,5 +95,4 @@ AC_SUBST(DLL_ENTRY)
|
||||
AC_SUBST(DEF_DLL_ENTRY)
|
||||
AC_SUBST(DIN_FILE)
|
||||
AC_SUBST(TLSOFFSETS_H)
|
||||
AC_SUBST(CONFIG_DIR)
|
||||
AC_OUTPUT(Makefile)
|
||||
|
Reference in New Issue
Block a user