diff options
author | Guy Harris <guy@alum.mit.edu> | 2020-02-04 15:47:02 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2020-02-04 15:47:02 -0800 |
commit | 895e3dfd766bd2858e1514ec21554c22de587149 (patch) | |
tree | 7a817e90142a022d6829b5fc669efe8cf1a64e29 | |
parent | fa7028248974c27a5089988198e8171b4a061d56 (diff) | |
download | tcpdump-895e3dfd766bd2858e1514ec21554c22de587149.tar.gz |
Remove the hacks to avoid floating-point issues in the tcpdump checks.
I can't seem to make those issues pop up on my (x86-64) machine, and, if
they do show up on any platforms, the best hack to handle it is probably
to have a special tcpdump flag to force it to do a floating-point
calculation and see what result is generated, and report the result, so
we know what it'll do with the numbers in the test files, and have
tests/TESTrun run tcpdump with that flag.
If those tests *do* fail, we'll know what calculations to do.
-rw-r--r-- | aclocal.m4 | 8 | ||||
-rwxr-xr-x | configure | 54 | ||||
-rw-r--r-- | tests/isis-seg-fault-1-v.tests | 1 | ||||
-rw-r--r-- | tests/lmp-v.tests | 1 |
4 files changed, 2 insertions, 62 deletions
@@ -102,14 +102,6 @@ AC_DEFUN(AC_LBL_C_INIT, # -Werror forces warnings to be errors. # ac_lbl_cc_force_warning_errors=-Werror - - # - # Use -ffloat-store so that, on 32-bit x86, we don't - # do 80-bit arithmetic with the FPU; that way we should - # get the same results for floating-point calculations - # on x86-32 and x86-64. - # - AC_LBL_CHECK_COMPILER_OPT($1, -ffloat-store) else $2="$$2 -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" @@ -3392,62 +3392,11 @@ fi - if test "$GCC" = yes ; then # # -Werror forces warnings to be errors. # ac_lbl_cc_force_warning_errors=-Werror - - # - # Use -ffloat-store so that, on 32-bit x86, we don't - # do 80-bit arithmetic with the FPU; that way we should - # get the same results for floating-point calculations - # on x86-32 and x86-64. - # - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -ffloat-store option" >&5 -$as_echo_n "checking whether the compiler supports the -ffloat-store option... " >&6; } - save_CFLAGS="$CFLAGS" - if expr "x-ffloat-store" : "x-W.*" >/dev/null - then - CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -ffloat-store" - elif expr "x-ffloat-store" : "x-f.*" >/dev/null - then - CFLAGS="$CFLAGS -Werror -ffloat-store" - elif expr "x-ffloat-store" : "x-m.*" >/dev/null - then - CFLAGS="$CFLAGS -Werror -ffloat-store" - else - CFLAGS="$CFLAGS -ffloat-store" - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return 0 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$save_CFLAGS" - V_CCOPT="$V_CCOPT -ffloat-store" - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$save_CFLAGS" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else V_INCLS="$V_INCLS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" @@ -3542,7 +3491,8 @@ $as_echo_n "checking that Ultrix $CC hacks const in prototypes... " >&6; } if ${ac_cv_lbl_cc_const_proto+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> int diff --git a/tests/isis-seg-fault-1-v.tests b/tests/isis-seg-fault-1-v.tests index f90fc4a7..857f5374 100644 --- a/tests/isis-seg-fault-1-v.tests +++ b/tests/isis-seg-fault-1-v.tests @@ -6,7 +6,6 @@ $testlist = [ { - config_set => 'USING_GCC', name => 'isis-seg-fault-1-v', input => 'isis-seg-fault-1.pcapng', output => 'isis-seg-fault-1-v.out', diff --git a/tests/lmp-v.tests b/tests/lmp-v.tests index 27232512..01c4ede1 100644 --- a/tests/lmp-v.tests +++ b/tests/lmp-v.tests @@ -8,7 +8,6 @@ $testlist = [ { - config_set => 'USING_GCC', name => 'lmp-v', input => 'lmp.pcap', output => 'lmp-v.out', |