* Merge in cygwin-64bit-branch.

winsup/cygwin/configure.ac

@@ -55,8 +55,6 @@ no)	 ;;
 esac
 ])
 
-MALLOC_OFILES=malloc.o
-
 dnl The only time we might want to transform the install names
 dnl is for unix x cygwin.  Otherwise we don't.  For now we don't
 dnl transform names.
@@ -73,16 +71,29 @@ dnl   fi
 dnl fi
 
 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"  ;;
    *)		AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;;
 esac
 
 AC_CONFIGURE_ARGS
-AC_SUBST(MALLOC_OFILES)
 AC_SUBST(LIBSERVER)
+AC_SUBST(DLL_NAME)
 AC_SUBST(DLL_ENTRY)
 AC_SUBST(DEF_DLL_ENTRY)
+AC_SUBST(DIN_FILE)
+AC_SUBST(TLSOFFSETS_H)
 AC_SUBST(CONFIG_DIR)
 AC_OUTPUT(Makefile)