summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-01 14:46:14 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-01 14:46:14 +0100
commitab38b966e20ecfc5ea0fd6ea1576eb8925071a62 (patch)
tree5529edeb315bb7aa2e964fd53890c5430afa02d3
parent40ab4b2b76189804cbf3f778cbe936ca9466fa2c (diff)
downloadllvm-ab38b966e20ecfc5ea0fd6ea1576eb8925071a62.tar.gz
llvm-ab38b966e20ecfc5ea0fd6ea1576eb8925071a62.tar.bz2
llvm-ab38b966e20ecfc5ea0fd6ea1576eb8925071a62.tar.xz
[EMBK] autoconf: use more safe with_package variables in recently added defaults
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--autoconf/configure.ac28
-rwxr-xr-xconfigure32
2 files changed, 30 insertions, 30 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index b46fca5648..709fbb5ba3 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -415,10 +415,10 @@ dnl Default cpu (-mcpu=cpu) to use to all compiler invocations
AC_ARG_WITH(default-cpu,
AS_HELP_STRING([--with-default-cpu],
[Add by default -mcpu=cpu to all compiler invocations.]),,
- withval="Unknown")
+ with_default_cpu="Unknown")
-if test "$withval" != "Unknown" ; then
- AC_DEFINE_UNQUOTED(DEFAULT_TARGET_MCPU,"$withval",
+if test "$with_default_cpu" != "Unknown" ; then
+ AC_DEFINE_UNQUOTED(DEFAULT_TARGET_MCPU,"$with_default_cpu",
[Default cpu (-mcpu=cpu) to use to all compiler invocations.])
fi
@@ -426,21 +426,21 @@ dnl Default float abi to use to all compiler invocations
AC_ARG_WITH(default-float,
AS_HELP_STRING([--with-default-float],
[Default float abi to use to all compiler invocations.]),,
- withval="Unknown")
+ with_default_float="Unknown")
-if test "$withval" != "Unknown" ; then
- AC_DEFINE_UNQUOTED(DEFAULT_TARGET_FLOAT,"$withval",
+if test "$with_default_float" != "Unknown" ; then
+ AC_DEFINE_UNQUOTED(DEFAULT_TARGET_FLOAT,"$with_default_float",
[Default float abi to use to all compiler invocations.])
fi
dnl Default FPU to use to all compiler invocations, in case of hard float
-AC_ARG_WITH(default-float,
+AC_ARG_WITH(default-fpu,
AS_HELP_STRING([--with-default-fpu],
[Default FPU to use to all compiler invocations, in case of hard float.]),,
- withval="Unknown")
+ with_default_fpu="Unknown")
-if test "$withval" != "Unknown" ; then
- AC_DEFINE_UNQUOTED(DEFAULT_TARGET_FPU,"$withval",
+if test "$with_default_fpu" != "Unknown" ; then
+ AC_DEFINE_UNQUOTED(DEFAULT_TARGET_FPU,"$with_default_fpu",
[Default FPU to use to all compiler invocations, in case of hard float.])
fi
@@ -448,17 +448,17 @@ 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")
+ with_default_hash_style="Unknown")
-if test "$withval" != "Unknown" ; then
- case "$withval" in
+if test "$with_default_hash_style" != "Unknown" ; then
+ case "$with_default_hash_style" 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",
+ AC_DEFINE_UNQUOTED(DEFAULT_TARGET_HASHSTYLE,"$with_default_hash_style",
[Default hash-style to use to all linker invocations.])
fi
diff --git a/configure b/configure
index 16e835be78..3966624d51 100755
--- a/configure
+++ b/configure
@@ -3968,14 +3968,14 @@ HOST_ARCH=$host_arch
if test "${with_default_cpu+set}" = set; then
withval=$with_default_cpu;
else
- withval="Unknown"
+ with_default_cpu="Unknown"
fi
-if test "$withval" != "Unknown" ; then
+if test "$with_default_cpu" != "Unknown" ; then
cat >>confdefs.h <<_ACEOF
-#define DEFAULT_TARGET_MCPU "$withval"
+#define DEFAULT_TARGET_MCPU "$with_default_cpu"
_ACEOF
fi
@@ -3985,31 +3985,31 @@ fi
if test "${with_default_float+set}" = set; then
withval=$with_default_float;
else
- withval="Unknown"
+ with_default_float="Unknown"
fi
-if test "$withval" != "Unknown" ; then
+if test "$with_default_float" != "Unknown" ; then
cat >>confdefs.h <<_ACEOF
-#define DEFAULT_TARGET_FLOAT "$withval"
+#define DEFAULT_TARGET_FLOAT "$with_default_float"
_ACEOF
fi
-# Check whether --with-default-float was given.
-if test "${with_default_float+set}" = set; then
- withval=$with_default_float;
+# Check whether --with-default-fpu was given.
+if test "${with_default_fpu+set}" = set; then
+ withval=$with_default_fpu;
else
- withval="Unknown"
+ with_default_fpu="Unknown"
fi
-if test "$withval" != "Unknown" ; then
+if test "$with_default_fpu" != "Unknown" ; then
cat >>confdefs.h <<_ACEOF
-#define DEFAULT_TARGET_FPU "$withval"
+#define DEFAULT_TARGET_FPU "$with_default_fpu"
_ACEOF
fi
@@ -4019,12 +4019,12 @@ fi
if test "${with_default_hash_style+set}" = set; then
withval=$with_default_hash_style;
else
- withval="Unknown"
+ with_default_hash_style="Unknown"
fi
-if test "$withval" != "Unknown" ; then
- case "$withval" in
+if test "$with_default_hash_style" != "Unknown" ; then
+ case "$with_default_hash_style" in
gnu);;
sysv);;
both);;
@@ -4035,7 +4035,7 @@ echo "$as_me: error: Invalid --with-default-hash-style. Use \"sysv\", \"gnu\" or
esac
cat >>confdefs.h <<_ACEOF
-#define DEFAULT_TARGET_HASHSTYLE "$withval"
+#define DEFAULT_TARGET_HASHSTYLE "$with_default_hash_style"
_ACEOF
fi