3858. [bug] Disable GCC 4.9 "delete null pointer check".

                        [RT #35968]

(cherry picked from commit 603a78708343f063b44affb882ef93bb19a5142a)

diff --git a/CHANGES b/CHANGES
index 27698afb5edd09749a4cc8b708c3ca89bda21c5c..3ee9755dbcb0735950976371b52810ad848ab179 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3858.  [bug]           Disable GCC 4.9 "delete null pointer check".
+                       [RT #35968]
+
 3857.  [bug]           Make it harder for a incorrect NOEDNS classification
                        to be made. [RT #36020]
 

diff --git a/configure b/configure
index bcd3d18ffdda1e026a7691ca525afa5a805d37a4..f094c6e31536cd50680cfdf2147605acd7391150 100755 (executable)
--- a/configure
+++ b/configure
@@ -16566,9 +16566,10 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
+       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"$CC\" supports -fno-strict-aliasing" >&5
 $as_echo_n "checking if \"$CC\" supports -fno-strict-aliasing... " >&6; }
-       SAVE_CFLAGS=$CFLAGS
+       SAVE_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fno-strict-aliasing"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16587,15 +16588,47 @@ else
   FNOSTRICTALIASING=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       CFLAGS=$SAVE_CFLAGS
+       CFLAGS="$SAVE_CFLAGS"
        if test "$FNOSTRICTALIASING" = "yes"; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith -fno-strict-aliasing"
+               STD_CWARNINGS="$STD_CWARNINGS -fno-strict-aliasing"
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       fi
+       #
+       # turn off delete null pointer checks
+       #
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"$CC\" supports -fno-delete-null-pointer-checks" >&5
+$as_echo_n "checking if \"$CC\" supports -fno-delete-null-pointer-checks... " >&6; }
+       SAVE_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  FNODELETENULLPOINTERCHECKS=yes
+else
+  FNODELETENULLPOINTERCHECKS=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$SAVE_CFLAGS"
+       if test "$FNODELETENULLPOINTERCHECKS" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               STD_CWARNINGS="$STD_CWARNINGS -fno-delete-null-pointer-checks"
        else
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
        fi
        case "$host" in
        *-hp-hpux*)

diff --git a/configure.in b/configure.in
index db425813747e141d8bef16ea04f990aa7cd9c3d5..046996b14228676cf6a2b932636fff1b57b0f0b9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2146,17 +2146,32 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
+       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
        AC_MSG_CHECKING(if "$CC" supports -fno-strict-aliasing)
-       SAVE_CFLAGS=$CFLAGS
+       SAVE_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fno-strict-aliasing"
        AC_TRY_COMPILE(,, [FNOSTRICTALIASING=yes],[FNOSTRICTALIASING=no])
-       CFLAGS=$SAVE_CFLAGS
+       CFLAGS="$SAVE_CFLAGS"
        if test "$FNOSTRICTALIASING" = "yes"; then
                AC_MSG_RESULT(yes)
-       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith -fno-strict-aliasing"
+               STD_CWARNINGS="$STD_CWARNINGS -fno-strict-aliasing"
+       else
+               AC_MSG_RESULT(no)
+       fi
+       #
+       # turn off delete null pointer checks
+       #
+       AC_MSG_CHECKING(if "$CC" supports -fno-delete-null-pointer-checks)
+       SAVE_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
+       AC_TRY_COMPILE(,, [FNODELETENULLPOINTERCHECKS=yes],
+                         [FNODELETENULLPOINTERCHECKS=no])
+       CFLAGS="$SAVE_CFLAGS"
+       if test "$FNODELETENULLPOINTERCHECKS" = "yes"; then
+               AC_MSG_RESULT(yes)
+               STD_CWARNINGS="$STD_CWARNINGS -fno-delete-null-pointer-checks"
        else
                AC_MSG_RESULT(no)
-       STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
        fi
        case "$host" in
        *-hp-hpux*)