summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autoconf/configure.ac18
-rwxr-xr-xconfigure31
-rw-r--r--include/llvm/Config/config.h.in3
3 files changed, 51 insertions, 1 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 3fe6d42009..b46fca5648 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -444,6 +444,24 @@ if test "$withval" != "Unknown" ; then
[Default FPU to use to all compiler invocations, in case of hard float.])
fi
+dnl Default hash-style to use to all linker invocations.
+AC_ARG_WITH(default-hash-style,
+ AS_HELP_STRING([--with-default-hash-style],
+ [Default hash-style to use to all linker invocations: gnu, sysv or both.]),,
+ withval="Unknown")
+
+if test "$withval" != "Unknown" ; then
+ case "$withval" in
+ gnu);;
+ sysv);;
+ both);;
+ *)
+ AC_MSG_ERROR([Invalid --with-default-hash-style. Use "sysv", "gnu" or "both"]);;
+ esac
+ AC_DEFINE_UNQUOTED(DEFAULT_TARGET_HASHSTYLE,"$withval",
+ [Default hash-style to use to all linker invocations.])
+fi
+
dnl Check for the endianness of the target
AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little]))
diff --git a/configure b/configure
index c11738495e..16e835be78 100755
--- a/configure
+++ b/configure
@@ -1446,6 +1446,9 @@ Optional Packages:
invocations.
--with-default-fpu Default FPU to use to all compiler invocations, in
case of hard float.
+ --with-default-hash-style
+ Default hash-style to use to all linker invocations:
+ gnu, sysv or both.
--with-optimize-option Select the compiler options to use for optimized
builds
--with-extra-options Specify additional options to compile LLVM with
@@ -4012,6 +4015,32 @@ _ACEOF
fi
+# Check whether --with-default-hash-style was given.
+if test "${with_default_hash_style+set}" = set; then
+ withval=$with_default_hash_style;
+else
+ withval="Unknown"
+fi
+
+
+if test "$withval" != "Unknown" ; then
+ case "$withval" in
+ gnu);;
+ sysv);;
+ both);;
+ *)
+ { { echo "$as_me:$LINENO: error: Invalid --with-default-hash-style. Use \"sysv\", \"gnu\" or \"both\"" >&5
+echo "$as_me: error: Invalid --with-default-hash-style. Use \"sysv\", \"gnu\" or \"both\"" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_TARGET_HASHSTYLE "$withval"
+_ACEOF
+
+fi
+
+
{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
@@ -10373,7 +10402,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10376 "configure"
+#line 10405 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 25e7d761e2..a3fc22a0e6 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -24,6 +24,9 @@
/* Default FPU to use to all compiler invocations, in case of hard float. */
#undef DEFAULT_TARGET_FPU
+/* Default hash-style to use to all linker invocations. */
+#undef DEFAULT_TARGET_HASHSTYLE
+
/* Default cpu (-mcpu=cpu) to use to all compiler invocations. */
#undef DEFAULT_TARGET_MCPU