update to util-macros 1.20.2

4 files changed, 78 insertions, 38 deletions

diff --git a/util/macros/ChangeLog b/util/macros/ChangeLog
index fd2682ad1..648a2a9a9 100644
--- a/util/macros/ChangeLog
+++ b/util/macros/ChangeLog
@@ -1,3 +1,54 @@
+commit a9d71e3fd8e6758b70be31c586921bbbcd2a8449
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 13 15:19:37 2024 -0800
+
+    util-macros 1.20.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b9f5184ed2e9c019d867ced99020e22abb7c2e53
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Sep 28 11:28:26 2024 -0700
+
+    XORG_CHECK_MALLOC_ZERO: stop testing malloc, assume the worst
+    
+    Since there is no guarantee applications will run with the same malloc
+    implementation we tested against, and the cost of always ensuring the
+    size passed to malloc is non-zero is minimal now, stop testing it, and
+    default the answer to yes.
+    
+    Still allows builders to override when they have complete control over
+    which malloc implementation will be used.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Part-of: <https://gitlab.freedesktop.org/xorg/util/macros/-/merge_requests/9>
+
+commit 91ece2a5f6408d34074522c8588ef1c53478daa0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 22 12:45:55 2024 -0700
+
+    XORG_CHECK_MALLOC_ZERO: disable optimization when building with clang
+    
+    clang at -O1 or higher optimizes out the malloc checks
+    Fixes https://gitlab.freedesktop.org/xorg/util/macros/-/issues/4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Part-of: <https://gitlab.freedesktop.org/xorg/util/macros/-/merge_requests/8>
+
+commit 9f858d74b36bce8a16771d75a208bd7db8fa80b8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 1 16:20:49 2024 -0700
+
+    Remove -Wdeclaration-after-statement from default warning set
+    
+    We're going to treat this as a code style issue to be considered in review
+    instead of a code portability issue that should always be warned about,
+    now that all the compilers we support can handle variable declarations
+    after statements.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Part-of: <https://gitlab.freedesktop.org/xorg/util/macros/-/merge_requests/7>
+
 commit 7ed2b3798c030bd1729b699b446b43aba2ec606e
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Tue Apr 16 16:06:37 2024 -0400
diff --git a/util/macros/configure b/util/macros/configure
index 1e1152f33..bf407dce8 100644
--- a/util/macros/configure
+++ b/util/macros/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for util-macros 1.20.1.
+# Generated by GNU Autoconf 2.71 for util-macros 1.20.2.
 #
-# Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/-/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -267,7 +267,7 @@ then :
     printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
     printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
-$0: https://gitlab.freedesktop.org/xorg/util/macros/issues
+$0: https://gitlab.freedesktop.org/xorg/util/macros/-/issues
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -611,9 +611,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.20.1'
-PACKAGE_STRING='util-macros 1.20.1'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/util/macros/issues'
+PACKAGE_VERSION='1.20.2'
+PACKAGE_STRING='util-macros 1.20.2'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/util/macros/-/issues'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
@@ -1241,7 +1241,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-macros 1.20.1 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.20.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1308,7 +1308,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.20.1:";;
+     short | recursive ) echo "Configuration of util-macros 1.20.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1320,7 +1320,7 @@ Optional Features:
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/-/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -1384,7 +1384,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.20.1
+util-macros configure 1.20.2
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1421,7 +1421,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-macros $as_me 1.20.1, which was
+It was created by util-macros $as_me 1.20.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2337,7 +2337,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.20.1'
+ VERSION='1.20.2'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3008,7 +3008,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by util-macros $as_me 1.20.1, which was
+This file was extended by util-macros $as_me 1.20.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3055,7 +3055,7 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/-/issues>."
 
 _ACEOF
 ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
@@ -3063,7 +3063,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-util-macros config.status 1.20.1
+util-macros config.status 1.20.2
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/util/macros/configure.ac b/util/macros/configure.ac
index 6e28a71f9..678930cbc 100644
--- a/util/macros/configure.ac
+++ b/util/macros/configure.ac
@@ -23,8 +23,8 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.62])
 AC_INIT([util-macros],
-        [1.20.1],
-        [https://gitlab.freedesktop.org/xorg/util/macros/issues],
+        [1.20.2],
+        [https://gitlab.freedesktop.org/xorg/util/macros/-/issues],
         [util-macros])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-xz])
diff --git a/util/macros/xorg-macros.m4.in b/util/macros/xorg-macros.m4.in
index b1786864e..66469b2c9 100644
--- a/util/macros/xorg-macros.m4.in
+++ b/util/macros/xorg-macros.m4.in
@@ -1375,30 +1375,20 @@ AC_SUBST([XORG_MALLOC_DEBUG_ENV],[$malloc_debug_env])
 # Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
 # malloc(0) returns NULL.  Packages should add one of these cflags to
 # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
+#
+# No longer actually tests since there is no guarantee applications will
+# run with the same malloc implementation we tested against, and the cost
+# of always ensuring the size passed to malloc is non-zero is minimal now.
+# Still allows builders to override when they have complete control over
+# which malloc implementation will be used.
 AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
 AC_ARG_ENABLE(malloc0returnsnull,
 	AS_HELP_STRING([--enable-malloc0returnsnull],
-		       [malloc(0) returns NULL (default: auto)]),
+		       [assume malloc(0) can return NULL (default: yes)]),
 	[MALLOC_ZERO_RETURNS_NULL=$enableval],
-	[MALLOC_ZERO_RETURNS_NULL=auto])
-
-AC_MSG_CHECKING([whether malloc(0) returns NULL])
-if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
-AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
-	[AC_RUN_IFELSE([AC_LANG_PROGRAM([
-#include <stdlib.h>
-],[
-    char *m0, *r0, *c0, *p;
-    m0 = malloc(0);
-    p = malloc(10);
-    r0 = realloc(p,0);
-    c0 = calloc(0,10);
-    exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
-])],
-		[xorg_cv_malloc0_returns_null=yes],
-		[xorg_cv_malloc0_returns_null=no])])
-MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
-fi
+	[MALLOC_ZERO_RETURNS_NULL=yes])
+
+AC_MSG_CHECKING([whether to act as if malloc(0) can return NULL])
 AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
 
 if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
@@ -1695,7 +1685,6 @@ AC_LANG_CASE(
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
-		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
 	]
 )