Skip to content

Commit abaa0ed

Browse files
giordanoKristofferC
authored andcommitted
[CompilerSupportLibraries_jll] Update to v0.5.2 (#44487)
The main difference since previous version should be the libraries for aarch64-apple-darwin, which are based on a more recent version of the GCC fork for this platform. There are a couple of notable ABI changes here: * `libgcc_s` is now called `libgcc_s.1.1.dylib` instead of `libgcc_s.2.dylib` * there is now `libquadmath.0.dylib` for this platform, which was missing before. (cherry picked from commit cb2fa5d)
1 parent b3c4075 commit abaa0ed

File tree

5 files changed

+100
-96
lines changed

5 files changed

+100
-96
lines changed

Make.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*- mode: makefile-gmake -*-
1+
# -*- mode: makefile -*-
22
# vi:syntax=make
33

44
## Note:
@@ -1507,7 +1507,7 @@ endif
15071507
endif
15081508
ifeq ($(OS),Darwin)
15091509
ifeq ($(ARCH),aarch64)
1510-
LIBGCC_NAME := libgcc_s.2.$(SHLIB_EXT)
1510+
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
15111511
else
15121512
LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
15131513
endif

base/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,11 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
206206
$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
207207
endif
208208

209+
ifeq ($(APPLE_ARCH),arm64)
210+
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
211+
else
209212
$(eval $(call symlink_system_library,CSL,libgcc_s,1))
213+
endif
210214
ifneq (,$(LIBGFORTRAN_VERSION))
211215
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
212216
endif

0 commit comments

Comments
 (0)