From Paul Mundt <[email protected]>: add SuperH to the list of CPUs

where we wire in the idea that it can't handle unaligned accesses.  (I
don't know why the test program doesn't work - but perhaps the test
program is the wrong answer anyway, as it doesn't work when
cross-compiling.)

diff --git a/CREDITS b/CREDITS
index bff46724551c48a27c60dd7bb50c1e59b9fc90c3..620b523035d995a1b6c039666e017a24abb790b2 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -84,6 +84,7 @@ Additional people who have contributed patches:
        Onno van der Linden             <[email protected]>
        Pascal Hennequin                <[email protected]>
        Pasvorn Boonmark                <[email protected]>
+       Paul Mundt                      <[email protected]>
        Paul S. Traina                  <[email protected]>
        Pavlin Radoslavov               <[email protected]>
        Pekka Savola                    <[email protected]>     

diff --git a/aclocal.m4 b/aclocal.m4
index bc1e6399a53007d370a00a4db00248ab9c517ca9..9109877bc448fc71af9787cb5adbffe30d0980d5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.94 2003-03-13 08:04:25 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.95 2003-03-28 08:36:35 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
@@ -589,8 +589,39 @@ AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
     AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
        [case "$host_cpu" in
 
+       #
+       # These are CPU types where:
+       #
+       #       the CPU faults on an unaligned access, but at least some
+       #       OSes that support that CPU catch the fault and simulate
+       #       the unaligned access (e.g., Alpha/{Digital,Tru64} UNIX) -
+       #       the simulation is slow, so we don't want to use it;
+       #
+       #       the CPU, I infer (from the old
+       #
        # XXX: should also check that they don't do weird things (like on arm)
-       alpha*|arm*|hp*|mips*|sparc*|ia64)
+       #
+       #       comment) doesn't fault on unaligned accesses, but doesn't
+       #       do a normal unaligned fetch, either (e.g., presumably, ARM);
+       #
+       #       for whatever reason, the test program doesn't work
+       #       (this has been claimed to be the case for several of those
+       #       CPUs - I don't know what the problem is; the problem
+       #       was reported as "the test program dumps core" for SuperH,
+       #       but that's what the test program is *supposed* to do -
+       #       it dumps core before it writes anything, so the test
+       #       for an empty output file should find an empty output
+       #       file and conclude that unaligned accesses don't work).
+       #
+       # This run-time test won't work if you're cross-compiling, so
+       # in order to support cross-compiling for a particular CPU,
+       # we have to wire in the list of CPU types anyway, as far as
+       # I know, so perhaps we should just have a set of CPUs on
+       # which we know it doesn't work, a set of CPUs on which we
+       # know it does work, and have the script just fail on other
+       # cpu types and update it when such a failure occurs.
+       #
+       alpha*|arm*|hp*|mips*|sh*|sparc*|ia64)
                ac_cv_lbl_unaligned_fail=yes
                ;;
 

diff --git a/configure b/configure
index 1fbb2a573129a2355c72b70a8ddfe805edd5655d..61cddd701059bfbcf635af680e341e7b20dda877 100755 (executable)
--- a/configure
+++ b/configure
@@ -4694,8 +4694,39 @@ echo "configure:4692: checking if unaligned accesses fail" >&5
 else
   case "$host_cpu" in
 
+       #
+       # These are CPU types where:
+       #
+       #       the CPU faults on an unaligned access, but at least some
+       #       OSes that support that CPU catch the fault and simulate
+       #       the unaligned access (e.g., Alpha/{Digital,Tru64} UNIX) -
+       #       the simulation is slow, so we don't want to use it;
+       #
+       #       the CPU, I infer (from the old
+       #
        # XXX: should also check that they don't do weird things (like on arm)
-       alpha*|arm*|hp*|mips*|sparc*|ia64)
+       #
+       #       comment) doesn't fault on unaligned accesses, but doesn't
+       #       do a normal unaligned fetch, either (e.g., presumably, ARM);
+       #
+       #       for whatever reason, the test program doesn't work
+       #       (this has been claimed to be the case for several of those
+       #       CPUs - I don't know what the problem is; the problem
+       #       was reported as "the test program dumps core" for SuperH,
+       #       but that's what the test program is *supposed* to do -
+       #       it dumps core before it writes anything, so the test
+       #       for an empty output file should find an empty output
+       #       file and conclude that unaligned accesses don't work).
+       #
+       # This run-time test won't work if you're cross-compiling, so
+       # in order to support cross-compiling for a particular CPU,
+       # we have to wire in the list of CPU types anyway, as far as
+       # I know, so perhaps we should just have a set of CPUs on
+       # which we know it doesn't work, a set of CPUs on which we
+       # know it does work, and have the script just fail on other
+       # cpu types and update it when such a failure occurs.
+       #
+       alpha*|arm*|hp*|mips*|sh*|sparc*|ia64)
                ac_cv_lbl_unaligned_fail=yes
                ;;
 
@@ -4753,12 +4784,12 @@ EOF
 
 
        echo $ac_n "checking for h_errno""... $ac_c" 1>&6
-echo "configure:4757: checking for h_errno" >&5
+echo "configure:4788: checking for h_errno" >&5
        if eval "test \"`echo '$''{'ac_cv_var_h_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4762 "configure"
+#line 4793 "configure"
 #include "confdefs.h"
 
 #              include <sys/types.h>
@@ -4767,7 +4798,7 @@ int main() {
 int foo = h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:4771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_var_h_errno=yes
 else
@@ -4795,7 +4826,7 @@ if test "${with_crypto+set}" = set; then
 else
   
 echo $ac_n "checking for SSLeay""... $ac_c" 1>&6
-echo "configure:4799: checking for SSLeay" >&5
+echo "configure:4830: checking for SSLeay" >&5
 ac_cv_ssleay_path=no
 incdir=no
 for dir in /usr/${host_alias} /usr /usr/local /usr/local/ssl /usr/pkg; do
@@ -4823,7 +4854,7 @@ if test "$ac_cv_ssleay_path" != no; then
                LIBS="$LIBS -lrsaref"
        fi
        echo $ac_n "checking for des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
-echo "configure:4827: checking for des_cbc_encrypt in -lcrypto" >&5
+echo "configure:4858: checking for des_cbc_encrypt in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4831,7 +4862,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4835 "configure"
+#line 4866 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4842,7 +4873,7 @@ int main() {
 des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4876,17 +4907,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4880: checking for $ac_hdr" >&5
+echo "configure:4911: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4885 "configure"
+#line 4916 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4915,7 +4946,7 @@ done
 
        if test "$ac_cv_header_openssl_cast_h" = "yes"; then
                echo $ac_n "checking for buggy CAST128""... $ac_c" 1>&6
-echo "configure:4919: checking for buggy CAST128" >&5
+echo "configure:4950: checking for buggy CAST128" >&5
                if eval "test \"`echo '$''{'td_cv_buggy_cast128'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4923,7 +4954,7 @@ else
   td_cv_buggy_cast128="cross-compiling, assume yes"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4927 "configure"
+#line 4958 "configure"
 #include "confdefs.h"
 
 #include <openssl/cast.h>
@@ -4942,7 +4973,7 @@ main()
                return 1;
 }
 EOF
-if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   td_cv_buggy_cast128=yes
 else
@@ -4976,17 +5007,17 @@ for ac_hdr in openssl/rc5.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4980: checking for $ac_hdr" >&5
+echo "configure:5011: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4985 "configure"
+#line 5016 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5031,7 +5062,7 @@ done
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:5035: checking for a BSD compatible install" >&5
+echo "configure:5066: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6