Skip to content

Commit

Permalink
[CompilerSupportLibraries_jll] Update to v0.5.2 (#44487)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
giordano authored and KristofferC committed Apr 19, 2022
1 parent b3c4075 commit abaa0ed
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 96 deletions.
4 changes: 2 additions & 2 deletions Make.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- mode: makefile-gmake -*-
# -*- mode: makefile -*-
# vi:syntax=make

## Note:
Expand Down Expand Up @@ -1507,7 +1507,7 @@ endif
endif
ifeq ($(OS),Darwin)
ifeq ($(ARCH),aarch64)
LIBGCC_NAME := libgcc_s.2.$(SHLIB_EXT)
LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
else
LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
endif
Expand Down
4 changes: 4 additions & 0 deletions base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
endif

ifeq ($(APPLE_ARCH),arm64)
$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
else
$(eval $(call symlink_system_library,CSL,libgcc_s,1))
endif
ifneq (,$(LIBGFORTRAN_VERSION))
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
endif
Expand Down
Loading

0 comments on commit abaa0ed

Please sign in to comment.