From 5d613f473126772c47180d895b5ca438329534e2 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Thu, 26 Jun 2025 23:43:02 +0100 Subject: [PATCH] libstdc++: Fix Darwin bootstrap by simplifying ver file syntax. The symbol parsing script does not handle the closing brace of a new symbol group and the identifier for the inherited group to be on different lines, which r16-1708-gaf5b72cf9f564 introduced. Fixed by making the conditional encompass both the brace and the identifier. libstdc++-v3/ChangeLog: * config/abi/pre/gnu.ver: Keep the closing brace of the CXXABI_1.3.17 symbol group together with the identifier for the inherited group. Signed-off-by: Iain Sandoe --- libstdc++-v3/config/abi/pre/gnu.ver | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index bba5705509c..73b6f338613 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -2902,11 +2902,10 @@ CXXABI_1.3.16 { CXXABI_1.3.17 { # std::exception_ptr::_M_exception_ptr_cast _ZNKSt15__exception_ptr13exception_ptr21_M_exception_ptr_castERKSt9type_info; -} #ifdef __riscv -CXXABI_1.3.16; +} CXXABI_1.3.16; #else -CXXABI_1.3.15; +} CXXABI_1.3.15; #endif # Symbols in the support library (libsupc++) supporting transactional memory. -- 2.47.2