From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
To: gdb-patches@sourceware.org
Subject: [PATCH][PR build/29791] gnulib: Disable _GL_ATTRIBUTE_DEALLOC on Solaris
Date: Fri, 18 Nov 2022 14:08:52 +0100 [thread overview]
Message-ID: <yddmt8o76l7.fsf@CeBiTec.Uni-Bielefeld.DE> (raw)
[-- Attachment #1: Type: text/plain, Size: 969 bytes --]
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.
Ok for trunk?
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: sol2-attribute-malloc-error-gcc12.patch --]
[-- Type: text/x-patch, Size: 2757 bytes --]
# HG changeset patch
# Parent ebbd2c43c7405df23a60abebbe5cbf995bb99de2
[PR build/29791] gnulib: Disable _GL_ATTRIBUTE_DEALLOC on Solaris
diff --git a/gnulib/config.in b/gnulib/config.in
--- 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
--- 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
--- /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
--- 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 &&
next reply other threads:[~2022-11-18 13:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 13:08 Rainer Orth [this message]
2022-11-18 16:00 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yddmt8o76l7.fsf@CeBiTec.Uni-Bielefeld.DE \
--to=ro@cebitec.uni-bielefeld.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).