diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2022-11-20 14:55:52 +0100 |
|---|---|---|
| committer | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2022-11-20 14:55:52 +0100 |
| commit | 10a63f80ae9a440fe38271be91193b0192215fb6 (patch) | |
| tree | 6c10d7383ad9d05b688ec7dcf0df16bbfefc9107 /gnulib/patches | |
| parent | f1a8d786c37bbe40d0bc2fec618d0e875d043811 (diff) | |
| download | binutils-gdb-10a63f80ae9a440fe38271be91193b0192215fb6.tar.gz | |
[PR build/29791] gnulib: Disable _GL_ATTRIBUTE_DEALLOC on Solaris
gdbsupport compilation badly fails with GCC 12 on Solaris, with errors
like
../gnulib/config.h:1693:72: error: ‘malloc’ attribute argument 1 is ambiguous
1693 | # define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
| ^
../gnulib/config.h:1693:72: note: use a cast to the expected type to disambiguate
We've not yet been able to determine where the ambiguity actually lies,
so this patch works around the issue by disabling _GL_ATTRIBUTE_DEALLOC
on Solaris, at least as a workaround for GDB 13.
As Tom suggested in the PR, this is done using our infrastructure for
local gnulib patches.
Tested on sparcv9-sun-solaris2.11, amd64-pc-solaris2.11, and
x86_64-pc-linux-gnu.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Diffstat (limited to 'gnulib/patches')
| -rw-r--r-- | gnulib/patches/0002-no-solaris-_gl_attribute_dealloc | 13 |
1 files changed, 13 insertions, 0 deletions
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) |