Disallow odd nails sizes.

Inherit default gcc_cflags/gcc_64_cflags everywhere.
(sparc): Remove -fast, it causes documented miscompilation.

1 files changed, 19 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index 141e15e43..9bdc390ec 100644
--- a/configure.in
+++ b/configure.in
@@ -150,8 +150,11 @@ AM_CONDITIONAL(WANT_MPBSD, test "$enable_mpbsd" = "yes")
 AC_ARG_ENABLE(nails,
 AC_HELP_STRING([--enable-nails],[use nails on limbs [[default=no]]]),
 [case $enableval in
-[yes|no|[0-9]|[0-9][0-9]]) ;;
-*) AC_MSG_ERROR([bad value $enableval for --enable-nails, need yes/no/number]) ;;
+[yes|no|[02468]|[0-9][02468]]) ;;
+[*[13579]])
+  AC_MSG_ERROR([bad value $enableval for --enable-nails, only even nail sizes supported]) ;;
+*)
+  AC_MSG_ERROR([bad value $enableval for --enable-nails, need yes/no/number]) ;;
 esac],
 [enable_nails=no])
 
@@ -372,8 +375,8 @@ abilist="standard"
 #
 cclist="gcc cc"
 
-gcc_cflags="-O3"
-gcc_64_cflags="-O3"
+gcc_cflags="-O3 -pedantic"
+gcc_64_cflags="-O3 -pedantic"
 cc_cflags="-O"
 cc_64_cflags="-O"
 
@@ -707,7 +710,7 @@ case $host in
         cc_64_cppflags="+DD64"
         cc_64_cflags_optlist="opt"
         cc_64_cflags_opt="+O3 +O2 +O1"
-        gcc_64_cflags="-mlp64 -O2"
+        gcc_64_cflags="$gcc_64_cflags -mlp64"
         ;;
     esac
     ;;
@@ -718,7 +721,7 @@ case $host in
   M68K_PATTERN)
     AC_DEFINE(HAVE_HOST_CPU_FAMILY_m68k)
     GMP_INCLUDE_MPN(m68k/m68k-defs.m4)
-    gcc_cflags="-O2 $fomit_frame_pointer"
+    gcc_cflags="$gcc_cflags $fomit_frame_pointer"
     gcc_cflags_optlist="arch"
 
     # gcc 2.7.2 knows -m68000, -m68020, -m68030, -m68040.
@@ -749,8 +752,7 @@ case $host in
     path="m88k"
     ;;
   m88110*-*-*)
-    # FIXME: Use `-O2'?
-    gcc_cflags="-O -m88110"
+    gcc_cflags="$gcc_cflags -m88110"
     path="m88k/mc88110 m88k"
     ;;
 
@@ -795,7 +797,7 @@ case $host in
         path_n32="mips64"
 
         cclist_64="gcc cc"
-        gcc_64_cflags="-O2 -mabi=64"
+        gcc_64_cflags="$gcc_64_cflags -mabi=64"
         gcc_64_ldflags="-Wc,-mabi=64"
         cc_64_cflags="-O2 -64"		# no -g, it disables all optimizations
         cc_64_ldflags="-Wc,-64"
@@ -833,7 +835,7 @@ case $host in
     abilist="32"
     cclist="gcc cc"
     cc_cflags="-O2"
-    gcc_cflags="-O2 -mpowerpc"
+    gcc_cflags="$gcc_cflags -mpowerpc"
     gcc_cflags_optlist="precomp subtype asm cpu"
     gcc_cflags_precomp="-no-cpp-precomp"
     gcc_cflags_subtype="-force_cpusubtype_ALL"	# for vmx on darwin
@@ -1056,7 +1058,7 @@ case $host in
 
   # IBM s/370 and similar
   [s3[6-9]0*-*-*])
-    gcc_cflags="-O2 $fomit_frame_pointer"
+    gcc_cflags="$gcc_cflags $fomit_frame_pointer"
     path="s390"
     extra_functions="udiv_w_sdiv"
     ;;
@@ -1107,9 +1109,9 @@ case $host in
     #
     case $host_cpu in
       sparc64 | sparcv9* | ultrasparc*)
-        gcc_cflags="-O2 -Wa,-xarch=v8plus" ;;
+        gcc_cflags="$gcc_cflags -Wa,-xarch=v8plus" ;;
       *)
-        gcc_cflags="-O2" ;;
+        gcc_cflags="$gcc_cflags" ;;
     esac
     gcc_32_cflags_maybe="-m32"
     gcc_cflags_optlist="cpu"
@@ -1214,7 +1216,7 @@ case $host in
         # it until we're sure.  (Might want -xarch=v9a or -xarch=v9b for the
         # higher cpu types instead.)
         #
-        gcc_64_cflags="-O2 -m64 -mptr64"
+        gcc_64_cflags="$gcc_64_cflags -m64 -mptr64"
         gcc_64_ldflags="-Wc,-m64"
         gcc_64_cflags_optlist="cpu"
 
@@ -1248,7 +1250,7 @@ case $host in
     # (config/vax/vax.h FRAME_POINTER_REQUIRED=1), so -fomit-frame-pointer
     # will be ignored.
     #
-    gcc_cflags="-O2 $fomit_frame_pointer"
+    gcc_cflags="$gcc_cflags $fomit_frame_pointer"
     path="vax"
     extra_functions="udiv_w_sdiv"
     ;;
@@ -1272,7 +1274,7 @@ case $host in
   X86_PATTERN | athlon64-*-* | core2-*-* | x86_64-*-*)
     abilist="32"
     cclist="gcc icc cc"
-    gcc_cflags="-O2 $fomit_frame_pointer"
+    gcc_cflags="$gcc_cflags $fomit_frame_pointer"
     gcc_32_cflags_maybe="-m32"
     icc_cflags="-no-gcc"
     icc_cflags_optlist="opt"
@@ -1444,7 +1446,7 @@ case $host in
     case $host_cpu in
       athlon64 | core2 | pentium4 | x86_64)
         cclist_64="gcc"
-        gcc_64_cflags="-O2 -m64"
+        gcc_64_cflags="$gcc_64_cflags -m64"
         gcc_64_cflags_optlist="cpu"
         CALLING_CONVENTIONS_OBJS_64='amd64call.lo amd64check$U.lo'
         SPEED_CYCLECOUNTER_OBJ_64=x86_64.lo