WIP: Add a libgcc_s linker script

This seems to fix outline atomics Sponsored by: Arm Ltd
zxombie · May 16, 2024 · 947dd83 · 947dd83
1 parent cdf9840
commit 947dd83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
@@ -5,7 +5,7 @@ GTEST_DIR=	${SRCTOP}/contrib/googletest
 GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock
 GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
 
-CXXFLAGS+=	${GTESTS_FLAGS} -mno-outline-atomics
+CXXFLAGS+=	${GTESTS_FLAGS}
 
 # Silence warnings about usage of deprecated implicit copy constructors
 CXXWARNFLAGS+=  -Wno-deprecated-copy
diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile
@@ -3,6 +3,8 @@ PACKAGE=	clibs
 SHLIB_NAME=	libgcc_s.so.1
 SHLIBDIR?=	/lib
 
+SHLIB_LDSCRIPT=libgcc_s.ldscript
+
 # Enabling UBSan triggers "undefined reference to vtable for __cxxabiv1::__function_type_info"
 MK_UBSAN:=	no
 

diff --git a/lib/libgcc_s/libgcc_s.ldscript b/lib/libgcc_s/libgcc_s.ldscript
@@ -0,0 +1 @@
+GROUP ( @@SHLIB@@ -lgcc )