[gcc r15-111] Objective-C, NeXT, v2: Correct a regression in code-gen.

[Iain D Sandoe via Gcc-cvs]

https://gcc.gnu.org/g:9b5c0be59d0f94df0517820f00b4520b5abddd8c

commit r15-111-g9b5c0be59d0f94df0517820f00b4520b5abddd8c
Author: Iain Sandoe <i...@sandoe.co.uk>
Date:   Tue Apr 30 15:11:56 2024 +0100

    Objective-C, NeXT, v2: Correct a regression in code-gen.
    
    There have been several changes in the ABI of Objective-C which
    depend on the OS version targetted.  In this case Protocols and
    LabelProtocols should be made weak/hidden/extern from macOS 10.7
    however there was a mistake in the code causing this to occur
    from macOS 10.6.  Fixed thus.
    
    gcc/objc/ChangeLog:
    
            * objc-next-runtime-abi-02.cc (WEAK_PROTOCOLS_AFTER): New.
            (next_runtime_abi_02_protocol_decl): Use WEAK_PROTOCOLS_AFTER
            to determine this ABI change.
            (build_v2_protocol_list_address_table): Likewise.
    
    Signed-off-by: Iain Sandoe <i...@sandoe.co.uk>

Diff:
---
 gcc/objc/objc-next-runtime-abi-02.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcc/objc/objc-next-runtime-abi-02.cc 
b/gcc/objc/objc-next-runtime-abi-02.cc
index cdf559b9bea..248ef641281 100644
--- a/gcc/objc/objc-next-runtime-abi-02.cc
+++ b/gcc/objc/objc-next-runtime-abi-02.cc
@@ -72,6 +72,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TAG_MSGSENDSUPER_STRET "objc_msgSendSuper2_stret"
 
 #define USE_FIXUP_BEFORE       100600
+#define WEAK_PROTOCOLS_AFTER   100700
 #define TAG_FIXUP              "_fixup"
 
 
@@ -1025,7 +1026,7 @@ next_runtime_abi_02_protocol_decl (tree p)
   /* static struct _objc_protocol _OBJC_Protocol_<mumble>; */
   snprintf (buf, BUFSIZE, "_OBJC_Protocol_%s",
            IDENTIFIER_POINTER (PROTOCOL_NAME (p)));
-  if (flag_next_runtime >= USE_FIXUP_BEFORE)
+  if (flag_next_runtime >= WEAK_PROTOCOLS_AFTER)
     {
       decl = create_hidden_decl (objc_v2_protocol_template, buf);
       DECL_WEAK (decl) = true;
@@ -2315,7 +2316,7 @@ build_v2_protocol_list_address_table (void)
       gcc_assert (ref->id && TREE_CODE (ref->id) == PROTOCOL_INTERFACE_TYPE);
       snprintf (buf, BUFSIZE, "_OBJC_LabelProtocol_%s",
                IDENTIFIER_POINTER (PROTOCOL_NAME (ref->id)));
-      if (flag_next_runtime >= USE_FIXUP_BEFORE)
+      if (flag_next_runtime >= WEAK_PROTOCOLS_AFTER)
        {
          decl = create_hidden_decl (objc_protocol_type, buf, /*is def=*/true);
          DECL_WEAK (decl) = true;