Merge branch 'rickard/ts_install_mXX_build'

* rickard/ts_install_mXX_build:
  Teach ts_install --enable-mXX-build flag

2 files changed, 66 insertions, 5 deletions

diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in
index 3815027721..067663feb4 100644
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
@@ -38,6 +38,35 @@ AC_ARG_ENABLE(debug-mode,
     *)  CFLAGS=$DEBUG_FLAGS ;;
   esac ], )
 
+AC_ARG_ENABLE(m64-build,
+AS_HELP_STRING([--enable-m64-build],
+               [build 64-bit binaries using the -m64 flag to (g)cc]),
+[ case "$enableval" in
+    no) enable_m64_build=no ;;
+    *)  enable_m64_build=yes ;;
+  esac
+],enable_m64_build=no)
+
+AC_ARG_ENABLE(m32-build,
+AS_HELP_STRING([--enable-m32-build],
+               [build 32-bit binaries using the -m32 flag to (g)cc]),
+[ case "$enableval" in
+    no) enable_m32_build=no ;;
+    *)  enable_m32_build=yes ;;
+  esac
+],enable_m32_build=no)
+
+no_mXX_LDFLAGS="$LDFLAGS"
+
+if test X${enable_m64_build} = Xyes; then
+	CFLAGS="-m64 $CFLAGS"
+	LDFLAGS="-m64 $LDFLAGS"
+fi
+if test X${enable_m32_build} = Xyes; then
+	CFLAGS="-m32 $CFLAGS"
+	LDFLAGS="-m32 $LDFLAGS"
+fi
+
 AC_CHECK_LIB(m, sin)
 
 #--------------------------------------------------------------------
@@ -132,6 +161,12 @@ case $system in
 	    AC_CHECK_HEADER(dld.h, [
 		SHLIB_LD="ld"
 		SHLIB_LDFLAGS="-shared"])
+	    if test X${enable_m64_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	    fi
+	    if test X${enable_m32_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	    fi
 	fi
 	SHLIB_EXTRACT_ALL=""
 	;;
@@ -142,11 +177,17 @@ case $system in
 	    SHLIB_LD="ld"
 	    SHLIB_LDFLAGS="$LDFLAGS -Bshareable -x"
 	    SHLIB_SUFFIX=".so"
+	    if test X${enable_m64_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	    fi
+	    if test X${enable_m32_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	    fi
 	], [
 	    # No dynamic loading.
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld"
-	    SHLIB_LDFLAGS="$LDFLAGS"
+	    SHLIB_LDFLAGS=""
 	    SHLIB_SUFFIX=""
 	    AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
 	])
@@ -155,7 +196,13 @@ case $system in
     *-solaris2*|*-sysv4*)
 	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld"
-	SHLIB_LDFLAGS="$LDFLAGS -G -z text"
+	SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -z text"
+	if test X${enable_m64_build} = Xyes; then
+	   SHLIB_LDFLAGS="-64 $SHLIB_LDFLAGS"
+	fi
+	if test X${enable_m32_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	fi
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL="-z allextract"
 	;;
@@ -170,6 +217,12 @@ case $system in
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_LD="ld"
 	SHLIB_LDFLAGS="$LDFLAGS -shared"
+	if test X${enable_m64_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	fi
+	if test X${enable_m32_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	fi
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL=""
 	;;
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index e9e559df5d..bc62015ac3 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -112,6 +112,12 @@ get_vars([], name, [], Result) ->
 get_vars(_, _, _, _) ->
     {error, fatal_bad_conf_vars}.
 
+config_flags() ->
+    case os:getenv("CONFIG_FLAGS") of
+	false -> [];
+	CF -> string:tokens(CF, " \t\n")
+    end.
+
 unix_autoconf(XConf) ->
     Configure = filename:absname("configure"),
     Flags = proplists:get_value(crossflags,XConf,[]),
@@ -122,11 +128,14 @@ unix_autoconf(XConf) ->
 		  erlang:system_info(threads) /= false],
     Debug = [" --enable-debug-mode" ||
 		string:str(erlang:system_info(system_version),"debug") > 0],
-    Args = Host ++ Build ++ Threads ++ Debug,
+    MXX_Build = [Y || Y <- config_flags(),
+		      Y == "--enable-m64-build"
+			  orelse Y == "--enable-m32-build"],
+    Args = Host ++ Build ++ Threads ++ Debug ++ " " ++ MXX_Build,
     case filelib:is_file(Configure) of
 	true ->
 	    OSXEnv = macosx_cflags(),
-	    io:format("Running ~sEnv: ~p~n",
+	    io:format("Running ~s~nEnv: ~p~n",
 		      [lists:flatten(Configure ++ Args),Env++OSXEnv]),
 	    Port = open_port({spawn, lists:flatten(["\"",Configure,"\"",Args])},
 			     [stream, eof, {env,Env++OSXEnv}]),
@@ -135,7 +144,6 @@ unix_autoconf(XConf) ->
 	    {error, no_configure_script}
     end.
 
-
 get_xcomp_flag(Flag, Flags) ->
     get_xcomp_flag(Flag, Flag, Flags).
 get_xcomp_flag(Flag, Tag, Flags) ->