diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/configure | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/configure')
| -rwxr-xr-x | winsup/cygwin/configure | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index 87d97b55a..55a5c58e4 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -566,10 +566,12 @@ ac_no_link=no ac_subst_vars='LTLIBOBJS LIBOBJS CONFIG_DIR +TLSOFFSETS_H +DIN_FILE DEF_DLL_ENTRY DLL_ENTRY +DLL_NAME LIBSERVER -MALLOC_OFILES configure_args SET_MAKE WINDRES @@ -4410,14 +4412,23 @@ esac fi -MALLOC_OFILES=malloc.o - case "$target_cpu" in - i?86) DLL_ENTRY="_dll_entry@12" + i?86) + DLL_NAME="cygwin1.dll" + DLL_ENTRY="_dll_entry@12" DEF_DLL_ENTRY="dll_entry@12" + DIN_FILE="cygwin.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="cygwin64.din" + TLSOFFSETS_H="tlsoffsets64.h" + CONFIG_DIR="x86_64" ;; *) as_fn_error $? "Invalid target processor \"$target_cpu\"" "$LINENO" 5 ;; esac @@ -4437,6 +4448,8 @@ configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)') + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF |