diff options
Diffstat (limited to 'gnulib')
| -rw-r--r-- | gnulib/config.in | 3 | ||||
| -rw-r--r-- | gnulib/import/m4/gnulib-common.m4 | 3 | ||||
| -rw-r--r-- | gnulib/patches/0002-no-solaris-_gl_attribute_dealloc | 13 | ||||
| -rwxr-xr-x | gnulib/update-gnulib.sh | 1 |
4 files changed, 18 insertions, 2 deletions
diff --git a/gnulib/config.in b/gnulib/config.in index 07efd1334fa..f70c6a52b43 100644 --- a/gnulib/config.in +++ b/gnulib/config.in @@ -1688,7 +1688,8 @@ _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ -#if _GL_GNUC_PREREQ (11, 0) +/* Disable on Solaris to avoid GDB PR build/29791. */ +#if _GL_GNUC_PREREQ (11, 0) && !(defined(__sun__) && defined(__svr4__)) # define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) #else # define _GL_ATTRIBUTE_DEALLOC(f, i) diff --git a/gnulib/import/m4/gnulib-common.m4 b/gnulib/import/m4/gnulib-common.m4 index 30911d1581a..529ec340ba8 100644 --- a/gnulib/import/m4/gnulib-common.m4 +++ b/gnulib/import/m4/gnulib-common.m4 @@ -182,7 +182,8 @@ AC_DEFUN([gl_COMMON_BODY], [ _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ -#if _GL_GNUC_PREREQ (11, 0) +/* Disable on Solaris to avoid GDB PR build/29791. */ +#if _GL_GNUC_PREREQ (11, 0) && !(defined(__sun__) && defined(__svr4__)) # define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) #else # define _GL_ATTRIBUTE_DEALLOC(f, i) diff --git a/gnulib/patches/0002-no-solaris-_gl_attribute_dealloc b/gnulib/patches/0002-no-solaris-_gl_attribute_dealloc new file mode 100644 index 00000000000..85dbc4b79b7 --- /dev/null +++ b/gnulib/patches/0002-no-solaris-_gl_attribute_dealloc @@ -0,0 +1,13 @@ +diff --git a/gnulib/import/m4/gnulib-common.m4 b/gnulib/import/m4/gnulib-common.m4 +--- a/gnulib/import/m4/gnulib-common.m4 ++++ b/gnulib/import/m4/gnulib-common.m4 +@@ -182,7 +182,8 @@ AC_DEFUN([gl_COMMON_BODY], [ + _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that + can be freed via 'free'; it can be used only after declaring 'free'. */ + /* Applies to: functions. Cannot be used on inline functions. */ +-#if _GL_GNUC_PREREQ (11, 0) ++/* Disable on Solaris to avoid GDB PR build/29791. */ ++#if _GL_GNUC_PREREQ (11, 0) && !(defined(__sun__) && defined(__svr4__)) + # define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) + #else + # define _GL_ATTRIBUTE_DEALLOC(f, i) diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh index 80aa3fafbf8..f82b08b5ebc 100755 --- a/gnulib/update-gnulib.sh +++ b/gnulib/update-gnulib.sh @@ -188,6 +188,7 @@ apply_patches () } apply_patches "patches/0001-use-windows-stat" +apply_patches "patches/0002-no-solaris-_gl_attribute_dealloc" # Regenerate all necessary files... aclocal && |