Changeset 1186

Timestamp:

01/02/08 02:00:22 (8 months ago)

Author:

shawnw

Message:

#7484: Test for some more gcc and/or os/processor specific optimization flags

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (2 diffs)
• 1.8.3/branches/devel/configure (modified) (7 diffs)
• 1.8.3/branches/devel/configure.in (modified) (3 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -5 +5 @@
-chronological order (most recent first)
-
-[TAP] is T. Alexander Popiel, a PennMUSH developer (aka Talek)
-[SW] is Shawn Wagner, a PennMUSH developer (aka Raevnos)
-[EEH] is Ervin Hearn III, a PennMUSH developer (aka Noltar)
@@ -12 +11 @@
-[MUX] refers to code by (or inspired by) TinyMUX 2.x
-[Rhost] refers to code by (or inspired by) RhostMUSH
+[TAP] is T. Alexander Popiel, a former PennMUSH developer (aka Talek)
-
-==========================================================================
+
+Version 1.8.3 patchlevel 7                      ??? ??, 2008
+
+Minor changes:
+ * If compiling with a recent enough version of gcc to support the
+   -fstack-protector option to detect buffer overruns, use it.
+ * Compile with -mdynamic-no-pic on powerpc OS X, resulting in a smaller
+   binary.
-
-Version 1.8.3 patchlevel 6                      Jan 01, 2008

1.8.3/branches/devel/configure

@@ -655 +655 @@
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CAT
-CC
@@ -1277 +1273 @@
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
@@ -1818 +1813 @@
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-if test "x$CFLAGS" = "x"; then
@@ -3070 +3028 @@
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-# Set good debug and warning options if using gcc
-# and custom CFLAGS aren't being used.
-# Todo: Look into the warnings setting macros in the autoconf archive,
-# maybe use them instead?
-if test $DEFAULT_CFLAGS = yes; then
- if test "x$GDB" != x; then
-  if test "x$ac_cv_c_compiler_gnu" = xyes; then
-CFLAGS="-ggdb $CFLAGS -W -Wall -pedantic -Wno-comment"
-   else
-CFLAGS="-g $CFLAGS -W"
-  fi
- else
-CFLAGS="-g $CFLAGS -W"
- fi
-fi
-
-
-
-
-  { echo "$as_me:$LINENO: checking if gcc accepts -fstack-protector option" >&5
-echo $ECHO_N "checking if gcc accepts -fstack-protector option... $ECHO_C" >&6; }
-
-  if  test "x$GCC" = "xyes" ; then
-
-    if  test -z "" ; then
-
-      ax_gcc_option_test="int main()
-{
-    return 0;
-}"
-
-else
-
-      ax_gcc_option_test=""
-
-fi
-
-
-    # Dump the test program to file
-    cat <<EOF > conftest.c
-$ax_gcc_option_test
-EOF
-
-    # Dump back the file to the log, useful for debugging purposes
-    { ac_try='cat conftest.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }
-
-    if  { ac_try='$CC  -fstack-protector -c conftest.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } ; then
-
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-                   CFLAGS="$CFLAGS -fstack-protector"
-
-
-else
-
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-
-fi
-
-
-else
-
-    { echo "$as_me:$LINENO: result: no gcc available" >&5
-echo "${ECHO_T}no gcc available" >&6; }
-
-fi
-
-
-
-
@@ -3727 +3601 @@
-fi
-
+
+
+# Set good debug and warning options if using gcc
+# and custom CFLAGS aren't being used.
+# Todo: Look into the warnings setting macros in the autoconf archive,
+# maybe use them instead?
+if test $DEFAULT_CFLAGS = yes; then
+ if test "x$GDB" != x; then
+  if test "x$ac_cv_c_compiler_gnu" = xyes; then
+CFLAGS="-ggdb $CFLAGS -W -Wall -pedantic -Wno-comment"
+   else
+CFLAGS="-g $CFLAGS -W"
+  fi
+ else
+CFLAGS="-g $CFLAGS -W"
+ fi
+fi
+
+
+
+
+  { echo "$as_me:$LINENO: checking if gcc accepts -fstack-protector option" >&5
+echo $ECHO_N "checking if gcc accepts -fstack-protector option... $ECHO_C" >&6; }
+
+  if  test "x$GCC" = "xyes" ; then
+
+    if  test -z "" ; then
+
+      ax_gcc_option_test="int main()
+{
+    return 0;
+}"
+
+else
+
+      ax_gcc_option_test=""
+
+fi
+
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    { ac_try='cat conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+
+    if  { ac_try='$CC  -fstack-protector -c conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } ; then
+
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+   CFLAGS="$CFLAGS -fstack-protector"
+
+
+else
+
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+fi
+
+
+else
+
+    { echo "$as_me:$LINENO: result: no gcc available" >&5
+echo "${ECHO_T}no gcc available" >&6; }
+
+fi
+
+
+
+if test $build_os = darwin -a $build_cpu = powerpc; then
+
+
+
+  { echo "$as_me:$LINENO: checking if gcc accepts -mdynamic-no-pic option" >&5
+echo $ECHO_N "checking if gcc accepts -mdynamic-no-pic option... $ECHO_C" >&6; }
+
+  if  test "x$GCC" = "xyes" ; then
+
+    if  test -z "" ; then
+
+      ax_gcc_option_test="int main()
+{
+    return 0;
+}"
+
+else
+
+      ax_gcc_option_test=""
+
+fi
+
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    { ac_try='cat conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+
+    if  { ac_try='$CC  -mdynamic-no-pic -c conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } ; then
+
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+     CFLAGS="$CFLAGS -mdynamic-no-pic"
+
+
+else
+
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+fi
+
+
+else
+
+    { echo "$as_me:$LINENO: result: no gcc available" >&5
+echo "${ECHO_T}no gcc available" >&6; }
+
+fi
+
+
+fi
-
-
@@ -17048 +17073 @@
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CAT!$CAT$ac_delim
-CC!$CC$ac_delim
@@ -17100 +17121 @@
-_ACEOF
-
-91
+87
-    break
-  elif $ac_last_try; then

1.8.3/branches/devel/configure.in

@@ -7 +7 @@
-AC_INIT(configure.in)
-AC_CONFIG_HEADERS(config.h)
-HOST
+BUILD
-
-if test "x$CFLAGS" = "x"; then
@@ -24 +24 @@
-AC_PROG_CC_C99
-AC_PATH_PROG(GDB, gdb)
-
-# Set good debug and warning options if using gcc
-# and custom CFLAGS aren't being used.
-# Todo: Look into the warnings setting macros in the autoconf archive,
-# maybe use them instead?
-if test $DEFAULT_CFLAGS = yes; then
- if test "x$GDB" != x; then
-  if test "x$ac_cv_c_compiler_gnu" = xyes; then
-CFLAGS="-ggdb $CFLAGS -W -Wall -pedantic -Wno-comment"
-   else
-CFLAGS="-g $CFLAGS -W"
-  fi
- else
-CFLAGS="-g $CFLAGS -W"
- fi
-fi
-
-AX_GCC_OPTION([-fstack-protector], [], [], [
-                   CFLAGS="$CFLAGS -fstack-protector"
-                   ], [])
-                   
-
-AC_PATH_PROG(CHMOD, chmod)
-AC_PATH_PROG(CP, cp)
@@ -61 +39 @@
-AC_PATH_PROG(ETAGS, etags)
-AC_PATH_PROG(EXCTAGS, exctags)
+
+# Set good debug and warning options if using gcc
+# and custom CFLAGS aren't being used.
+# Todo: Look into the warnings setting macros in the autoconf archive,
+# maybe use them instead?
+if test $DEFAULT_CFLAGS = yes; then
+ if test "x$GDB" != x; then
+  if test "x$ac_cv_c_compiler_gnu" = xyes; then
+CFLAGS="-ggdb $CFLAGS -W -Wall -pedantic -Wno-comment"
+   else
+CFLAGS="-g $CFLAGS -W"
+  fi
+ else
+CFLAGS="-g $CFLAGS -W"
+ fi
+fi
+
+AX_GCC_OPTION([-fstack-protector], [], [], [
+   CFLAGS="$CFLAGS -fstack-protector"
+], [])
+                   
+if test $build_os = darwin -a $build_cpu = powerpc; then
+  AX_GCC_OPTION([-mdynamic-no-pic], [], [], [
+     CFLAGS="$CFLAGS -mdynamic-no-pic"
+  ], [])
+fi
+
-
-if test "x$CTAGS" = x -a "x$EXCTAGS" != x; then