diff mbox series

[pushed] libstdc++, Darwin: Fix weak attribute to use __weak__ instead of weak.

Message ID 20221204105345.33234-1-iain@sandoe.co.uk
State Committed
Commit e76a44bf68b79278cb2c20e4ce87657a247adcfe
Headers
Series [pushed] libstdc++, Darwin: Fix weak attribute to use __weak__ instead of weak. |

Commit Message

Iain Sandoe Dec. 4, 2022, 10:53 a.m. UTC 
  As pointed out on irc by Jonathan, the Darwin os_defines contains a "weak"
attribute where we should use '__weak__'.  Fixed thus, tested on i686, x86_64
Darwin and x86_64 Linux, pushed to master, thanks,
Iain

-- >8 --

The text for _GLIBCXX_WEAK_DEFINITION has used 'weak' for the attribute name,
since its intoduction.  Amend to use the implementation namespace '__weak__'
version.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

libstdc++-v3/ChangeLog:

	* config/os/bsd/darwin/os_defines.h (_GLIBCXX_WEAK_DEFINITION): Use the
	implementation namespace for the weak attribute.
---
 libstdc++-v3/config/os/bsd/darwin/os_defines.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Jonathan Wakely Dec. 4, 2022, 12:34 p.m. UTC | #1 
On Sun, 4 Dec 2022, 10:54 Iain Sandoe via Libstdc++, <libstdc++@gcc.gnu.org>
wrote:

> As pointed out on irc by Jonathan, the Darwin os_defines contains a "weak"
> attribute where we should use '__weak__'.  Fixed thus, tested on i686,
> x86_64
> Darwin and x86_64 Linux, pushed to master, thanks,
> Iain


> -- >8 --
>

I wanted to be sure this wouldn't conflict with the __weak keyword for
obj-C so thanks for taking care of it.
diff mbox series

Patch

diff --git a/libstdc++-v3/config/os/bsd/darwin/os_defines.h b/libstdc++-v3/config/os/bsd/darwin/os_defines.h
index a8b6d4fa324..38fdfb5f6f0 100644
--- a/libstdc++-v3/config/os/bsd/darwin/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/darwin/os_defines.h
@@ -33,11 +33,11 @@ 
    links to, so there's no need for weak-ness for that.  */
 #define _GLIBCXX_GTHREAD_USE_WEAK 0
 
-// On Darwin, in order to enable overriding of operator new and delete,
-// GCC makes the definition of these functions weak, relies on the
-// loader to implement weak semantics properly, and uses
-// -flat_namespace to work around the way that it doesn't.
-#define _GLIBCXX_WEAK_DEFINITION __attribute__ ((weak))
+// On Darwin, in order to enable overriding of operator new and delete, the
+// ABI library exports a weak definition. The static linker will override this
+// iff a user-provided implementation is given (providing that the user
+// implementation is not itself a weak definition).
+#define _GLIBCXX_WEAK_DEFINITION __attribute__ ((__weak__))
 
 // Static initializer macro is buggy in darwin, see libstdc++/51906
 #define _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC