summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2019-02-09 21:38:49 +0000
committerMonty Taylor <mordred@inaugust.com>2019-02-09 21:39:17 +0000
commitd58179dba76b9ac50755fbfa6dffd5c5f54cba85 (patch)
treef4d7c6c75f83e7dd8405ca3f247a8ccb4c2e3461
parent2cabe5501cb720d5b715ea2ceba59140e6996ed1 (diff)
Strip more autoconf stuff we don't need
We're not building on solaris.
-rw-r--r--m4/pandora_optimize.m443
-rw-r--r--m4/zuul_canonical.m41
2 files changed, 2 insertions, 42 deletions
diff --git a/m4/pandora_optimize.m4 b/m4/pandora_optimize.m4
index fb2cd77..07eabcf 100644
--- a/m4/pandora_optimize.m4
+++ b/m4/pandora_optimize.m4
@@ -6,21 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
6AC_DEFUN([PANDORA_OPTIMIZE],[ 6AC_DEFUN([PANDORA_OPTIMIZE],[
7 dnl Build optimized or debug version ? 7 dnl Build optimized or debug version ?
8 dnl First check for gcc and g++ 8 dnl First check for gcc and g++
9 AS_IF([test "$GCC" = "yes" -a "$INTELCC" = "no"],[ 9 AS_IF([test "$GCC" = "yes"],[
10
11 dnl The following is required for portable results of floating point
12 dnl calculations on PowerPC. The same must also be done for IA-64, but
13 dnl this options is missing in the IA-64 gcc backend.
14 case "$target_cpu" in
15 *ppc* | *powerpc*)
16 AM_CFLAGS="-mno-fused-madd ${AM_CFLAGS}"
17 AM_CXXFLAGS="-mno-fused-madd ${AM_CXXFLAGS}"
18 ;;
19 esac
20
21 dnl Once we can use a modern autoconf, we can replace the std=gnu99 here
22 dnl with using AC_CC_STD_C99 above
23 CC="${CC} -std=gnu99"
24 10
25 AM_CPPFLAGS="-g ${AM_CPPFLAGS}" 11 AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
26 12
@@ -30,33 +16,6 @@ AC_DEFUN([PANDORA_OPTIMIZE],[
30 OPTIMIZE_CFLAGS="-O2" 16 OPTIMIZE_CFLAGS="-O2"
31 OPTIMIZE_CXXFLAGS="-O2" 17 OPTIMIZE_CXXFLAGS="-O2"
32 ]) 18 ])
33 AS_IF([test "$INTELCC" = "yes"],[
34 AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
35
36 DEBUG_CFLAGS="-O0"
37 DEBUG_CXXFLAGS="-O0"
38
39 OPTIMIZE_CFLAGS="-xHOST -O2 -no-prec-div -static"
40 OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}"
41
42 ])
43 AS_IF([test "$SUNCC" = "yes"],[
44 dnl Once we can use a modern autoconf, we can replace the -xc99=all here
45 dnl with using AC_CC_STD_C99 above
46 CC="${CC} -xc99=all"
47 CXX="${CXX} -xlang=c99"
48
49 AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}"
50 AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -library=Crun -template=no%extdef ${AM_CXXFLAGS}"
51
52 DEBUG_CXXFLAGS="-g"
53
54 dnl TODO: Make a test for -xO4 usability here
55 OPTIMIZE_FLAGS="-xO3 -xlibmil -xdepend -xbuiltin"
56 OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS}"
57 OPTIMIZE_CXXFLAGS="-g0 ${OPTIMIZE_FLAGS}"
58
59 ])
60 19
61 AC_ARG_WITH([debug], 20 AC_ARG_WITH([debug],
62 [AS_HELP_STRING([--with-debug], 21 [AS_HELP_STRING([--with-debug],
diff --git a/m4/zuul_canonical.m4 b/m4/zuul_canonical.m4
index 40a20e9..c52d1a2 100644
--- a/m4/zuul_canonical.m4
+++ b/m4/zuul_canonical.m4
@@ -77,6 +77,7 @@ AC_DEFUN([ZUUL_CANONICAL_TARGET],[
77 77
78 AC_REQUIRE([AC_PROG_CXX]) 78 AC_REQUIRE([AC_PROG_CXX])
79 AM_PROG_CC_C_O 79 AM_PROG_CC_C_O
80 AC_PROG_CC_STDC
80 81
81 PANDORA_OPTIMIZE 82 PANDORA_OPTIMIZE
82 83