Skip to content

Commit d6c81c5

Browse files
committed
[SPARC][builtins] Add sparcv9 arch name for 32-bit SPARC
Solaris uses those, and the lack of it results in undefined symbols error in the linker. This should fix the failures in the Solaris buildbot.
1 parent ef37858 commit d6c81c5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ else ()
10131013

10141014
# For RISCV32 and 32-bit SPARC, we must force enable int128 for compiling long
10151015
# double routines.
1016-
if (COMPILER_RT_ENABLE_SOFTWARE_INT128 OR ("${arch}" MATCHES "riscv32|sparc$"
1016+
if (COMPILER_RT_ENABLE_SOFTWARE_INT128 OR ("${arch}" MATCHES "riscv32|sparc|sparcv9"
10171017
AND NOT CMAKE_COMPILER_IS_GNUCC))
10181018
list(APPEND BUILTIN_CFLAGS_${arch} -fforce-enable-int128)
10191019
endif()

compiler-rt/test/builtins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ foreach(arch ${BUILTIN_TEST_ARCH})
4848
string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}")
4949
endif()
5050

51-
if (COMPILER_RT_ENABLE_SOFTWARE_INT128 OR ("${arch}" MATCHES "riscv32|sparc$"
51+
if (COMPILER_RT_ENABLE_SOFTWARE_INT128 OR ("${arch}" MATCHES "riscv32|sparc|sparcv9"
5252
AND NOT CMAKE_COMPILER_IS_GNUCC))
5353
list(APPEND BUILTINS_TEST_TARGET_CFLAGS -fforce-enable-int128)
5454
string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}")

0 commit comments

Comments
 (0)