Make Win64 build work both under MSYS and Cygwin

3 files changed, 45 insertions, 15 deletions

diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 34237fcb43..339a15a2bb 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -132,7 +132,7 @@ if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then
 		AC_MSG_RESULT([Cygwin and VC])
 		MIXED_CYGWIN_VC=yes
 		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
-	elif test -x /usr/bin/i686-pc-msys-gcc.exe; then
+	elif test -x /usr/bin/msysinfo; then
 	        CFLAGS="-O2"
 		MIXED_MSYS=yes
 		AC_MSG_RESULT([MSYS and VC])
diff --git a/erts/configure.in b/erts/configure.in
index 8798adf3a5..a171c6ec2b 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -383,12 +383,6 @@ case $host_os in
 	# The ethread library requires _WIN32_WINNT of at least 0x0403.
 	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
 	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500"
-	# _USE_32BIT_TIME_T is needed when using VC++ 2005 (ctime() will fail
-	# otherwise since we pass it a 32-bit value).
-	#
-	# FIXME: Use time_t all the way and remove _USE_32BIT_TIME_T.
-	# AC_MSG_WARN([Reverting to 32-bit time_t])
-	# CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T"
 	;;
     darwin*)
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE"
@@ -619,6 +613,19 @@ esac
 AC_SUBST(OPSYS)
 AC_SUBST(ARCH)
 
+# Need to add this adjustment after we know the architecture, will fail on 64bit
+# This should be temporary, USE_32BIT_TIME_T should go away before R15B
+case $host_os in
+    win32)
+	# FIXME: Use time_t all the way and remove _USE_32BIT_TIME_T.
+	if test "x$ARCH" != "xamd64"; then
+	  AC_MSG_WARN([Reverting to 32-bit time_t])
+	  CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T"
+	fi
+	;;
+	*)
+	;;
+esac	
 dnl Check consistency of os and darwin-switches
 
 
@@ -3703,16 +3710,23 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
     	AC_CHECK_PROG(REGTOOL, regtool, regtool, false)
 	if test "$ac_cv_prog_REGTOOL" != false; then
 		wrp="/machine/software/microsoft/windows/currentversion/"
-		urp="uninstall/openssl_is1/inno setup: app path"
+	   	if test "x$ARCH" = "xamd64"; then
+		   urp="uninstall/openssl (64-bit)_is1/inno setup: app path"
+		   regtool_subsystem=-w
+		else
+		   urp="uninstall/openssl (32-bit)_is1/inno setup: app path"
+		   regtool_subsystem=-W
+		fi	
 		rp="$wrp$urp"
-		if regtool -q get "$rp" > /dev/null; then
+		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
 		   true
 		else
-		   urp="uninstall/openssl (32-bit)_is1/inno setup: app path"
+		   # Fallback to unspecified wordlength
+		   urp="uninstall/openssl_is1/inno setup: app path"
 		   rp="$wrp$urp"
 		fi	
-		if regtool -q get "$rp" > /dev/null; then
-			ssl_install_dir=`regtool -q get "$rp"`
+		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
+			ssl_install_dir=`regtool -q $regtool_subsystem get "$rp"`
 			# Try hard to get rid of spaces...
 			if cygpath -d "$ssl_install_dir" > /dev/null 2>&1; then
 				ssl_install_dir=`cygpath -d "$ssl_install_dir"`
@@ -3742,9 +3756,20 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 
     SSL_CRYPTO_LIBNAME=crypto
     SSL_SSL_LIBNAME=ssl
+    
+    if  test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
+    	if test "x$ARCH" = "xamd64"; then
+	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win64 /c/OpenSSL-Win64 /opt/local64/pgm/OpenSSL"
+	else
+	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win32 /c/OpenSSL-Win32 /cygdrive/c/OpenSSL /c/OpenSSL /opt/local/pgm/OpenSSL"
+	fi
+    else
+        std_win_ssl_locations=""
+    fi
+
 
     AC_MSG_CHECKING(for OpenSSL >= 0.9.7 in standard locations)
-    for rdir in $extra_dir /cygdrive/c/OpenSSL $std_ssl_locations; do
+    for rdir in $extra_dir $std_win_ssl_locations $std_ssl_locations; do
 	dir="$erl_xcomp_sysroot$rdir"
 	if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
 		is_real_ssl=yes
diff --git a/erts/etc/win32/cygwin_tools/vc/emu_cc.sh b/erts/etc/win32/cygwin_tools/vc/emu_cc.sh
index c74c35111b..f7c34a4564 100755
--- a/erts/etc/win32/cygwin_tools/vc/emu_cc.sh
+++ b/erts/etc/win32/cygwin_tools/vc/emu_cc.sh
@@ -17,6 +17,11 @@
 # 
 # %CopyrightEnd%
 # 
+if [ X"$CONFIG_SUBTYPE" = X"win64" ]; then
+    GCC="x86_64-w64-mingw32-gcc.exe"
+else 
+    GCC="gcc"
+fi
 TOOLDIR=$ERL_TOP/erts/etc/win32/cygwin_tools/vc
 COFFIX=$TOOLDIR/coffix
 WTOOLDIR=`(cygpath -d $TOOLDIR 2>/dev/null || cygpath -w $TOOLDIR)`
@@ -71,7 +76,7 @@ if [ $SKIP_COFFIX = false ]; then
     if [ "X$EMU_CC_SH_DEBUG_LOG" != "X" ]; then
 	echo "gcc -o $TEMPFILE -D__WIN32__ -DWIN32 -DWINDOWS -fomit-frame-pointer $CMD" >> $EMU_CC_SH_DEBUG_LOG 2>&1
     fi
-    eval gcc -o $TEMPFILE -D__WIN32__ -DWIN32 -DWINDOWS -fomit-frame-pointer $CMD
+    eval $GCC -o $TEMPFILE -D__WIN32__ -DWIN32 -DWINDOWS -fomit-frame-pointer $CMD
     RES=$?
     if [ $RES = 0 ]; then
 	$COFFIX.exe -e `(cygpath -d $TEMPFILE 2>/dev/null || cygpath -w $TEMPFILE)`
@@ -85,6 +90,6 @@ if [ $SKIP_COFFIX = false ]; then
     rm -f $TEMPFILE
     exit $RES
 else
-    eval gcc -D__WIN32__ -DWIN32 -DWINDOWS -fomit-frame-pointer -fno-tree-copyrename $CMD 2>/dev/null
+    eval $GCC -D__WIN32__ -DWIN32 -DWINDOWS -fomit-frame-pointer -fno-tree-copyrename $CMD 2>/dev/null
     exit $?
 fi