Skip to content

Commit cb2fa5d

Browse files
authored
[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.
1 parent f731c38 commit cb2fa5d

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:
@@ -1474,7 +1474,7 @@ endif
14741474
endif
14751475
ifeq ($(OS),Darwin)
14761476
ifeq ($(ARCH),aarch64)
1477-
LIBGCC_NAME := libgcc_s.2.$(SHLIB_EXT)
1477+
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
14781478
else
14791479
LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
14801480
endif

base/Makefile

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

207+
ifeq ($(APPLE_ARCH),arm64)
208+
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
209+
else
207210
$(eval $(call symlink_system_library,CSL,libgcc_s,1))
211+
endif
208212
ifneq (,$(LIBGFORTRAN_VERSION))
209213
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
210214
endif

0 commit comments

Comments
 (0)