Skip to content

feat: add arm64 support and improve macOS integration #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 138 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
d9f4749
Add support for configuring and _try_ to build for iOS 64bit (in prep…
LouisBrunner Jul 19, 2020
9631cef
feat: experimental support for arm64 in coregrind (NB: m_trampoline.S…
LouisBrunner Dec 28, 2021
4517599
feat: fully build (same caveats as before + all tools crash)
LouisBrunner Dec 29, 2021
19564bf
wip
LouisBrunner Jan 1, 2022
41d2583
fixes for latest upstream v
LouisBrunner Dec 22, 2022
33eb53a
add macos13
LouisBrunner Jan 2, 2023
1fa8b44
fix linking + correct code for syscalls
LouisBrunner Jun 23, 2023
fe99d0a
fix: able to map RWX mmaps
LouisBrunner Jun 28, 2023
4cd1c15
Merge branch 'main' into feature/ios
LouisBrunner Jun 28, 2023
00f3f3b
a few improvements
LouisBrunner Jun 28, 2023
3133806
fix issues with main merge
LouisBrunner Jun 28, 2023
9df4997
fix: m_machine is ok now
LouisBrunner Jun 30, 2023
a6fcfd8
quick revert to dynamic linking for now
LouisBrunner Jun 30, 2023
f3593cf
wip
LouisBrunner Jun 30, 2023
dec3a39
fix: various memory fixes, mapping works well, copies work, page size…
LouisBrunner Sep 22, 2023
65f5f0c
fix: binary is loaded and started, still crashes though
LouisBrunner Sep 22, 2023
a9c223f
fix: scheduling, running into JIT issues
LouisBrunner Sep 22, 2023
35ce05d
fix: add support for some arm64 FEAT_PAuth instructions
LouisBrunner Sep 25, 2023
355f608
fwat: finish darwin-arm64 trampoline implementation
LouisBrunner Sep 27, 2023
d167d09
just for convenience
LouisBrunner Sep 27, 2023
ae6c669
more PAUTH, more syscall
LouisBrunner Sep 28, 2023
aafdc11
Merge remote-tracking branch 'upstream/master'
LouisBrunner Feb 6, 2024
6479b04
Merge branch 'main' into feature/m1
LouisBrunner Feb 6, 2024
9f436ac
fix syntax
LouisBrunner Feb 6, 2024
d3233f3
post merge fixes
LouisBrunner Feb 6, 2024
09c3844
much better approach to make a sound binary
LouisBrunner Feb 6, 2024
9c5aeb1
fix: load macho correctly despite __TEXT incompats
LouisBrunner Feb 7, 2024
d2f500a
more reliable sliding code
LouisBrunner Feb 9, 2024
fc8142e
more pauth support
LouisBrunner Feb 12, 2024
46fece9
all but 4 FEAT_PAuth implemented
LouisBrunner Feb 14, 2024
1568ffc
fix matching
LouisBrunner Feb 14, 2024
177c727
improve signal arg naming
LouisBrunner Feb 24, 2024
d275006
more debug for transtab, improve syscall handling
LouisBrunner Feb 25, 2024
3dfbae1
chaining issue sorted through icache invalidation + syscall improvements
LouisBrunner Feb 25, 2024
2f2ac33
change to arm64e (required, breaks everything), add extra registries …
LouisBrunner Feb 25, 2024
bc6c459
add LDAPR support + improve -arch situation
LouisBrunner Feb 25, 2024
445877d
forgot a new file
LouisBrunner Feb 25, 2024
1cc98c5
no need for arm64e my bad
LouisBrunner Feb 26, 2024
b71e733
no need for arm64e my bad v2
LouisBrunner Feb 26, 2024
978ffda
fix: first functional version ever
LouisBrunner Feb 29, 2024
b1d099f
correct message
LouisBrunner Feb 29, 2024
912b8e0
do not remove #error
LouisBrunner Feb 29, 2024
f41b1d9
bypass EPERM issues when mapping
LouisBrunner Mar 1, 2024
f00db71
macho whitespace fixes
LouisBrunner Mar 1, 2024
3ff5b2b
add DIT registry support
LouisBrunner Mar 1, 2024
eb6ac7c
add mrs immediate
LouisBrunner Mar 1, 2024
aeb9fa9
make initializer rollback as clean as we possibly can
LouisBrunner Mar 1, 2024
7eaf448
resolve all warnings, handle vgpreload correctly, improve rx-only deb…
LouisBrunner Mar 2, 2024
0195d44
revamp suppressions + fix map_with_linking_np
LouisBrunner Mar 2, 2024
7161b14
improve stack traces
LouisBrunner Mar 3, 2024
2e77eba
fix client requests
LouisBrunner Mar 3, 2024
70ab031
fix supp
LouisBrunner Mar 3, 2024
38dec3e
use VM tags to tell tools about memory which is init'd and comes from…
LouisBrunner Mar 3, 2024
8c47fef
remove todo comments, improve redirs
LouisBrunner Mar 3, 2024
d3b587e
missing func
LouisBrunner Mar 3, 2024
8d38cf1
no more warnings, better integration with sys libs
LouisBrunner Mar 4, 2024
5324d03
clean up todo
LouisBrunner Mar 4, 2024
09e0f35
wip change: no libSystem init AT ALL
LouisBrunner Mar 6, 2024
f4ef1a5
integrate with build system
LouisBrunner Mar 6, 2024
70a970f
wip better seg add
LouisBrunner Mar 7, 2024
f027f1f
wip nearly back in shape
LouisBrunner Mar 7, 2024
adbcf80
remove false pos
LouisBrunner Mar 7, 2024
fe50c4a
mostly stable again
LouisBrunner Mar 7, 2024
f00d7e5
chkstk can be a noop
LouisBrunner Mar 7, 2024
d76c8a8
reuse existing arm code for icache inval
LouisBrunner Mar 7, 2024
43a3aa3
Merge remote-tracking branch 'origin/main' into feature/m1
LouisBrunner Mar 7, 2024
7589e89
disable mmap o direct test
LouisBrunner Mar 7, 2024
837e8e7
Merge remote-tracking branch 'origin/main' into feature/m1
LouisBrunner Oct 2, 2024
9f44a35
post merge fixes
LouisBrunner Oct 2, 2024
4345d9e
more post merge fixes
LouisBrunner Oct 2, 2024
d7e23ba
fake pacga impl + tests build
LouisBrunner Oct 3, 2024
31262e8
fix: signals & CI
LouisBrunner Oct 3, 2024
5a5e290
upgrade GHA
LouisBrunner Oct 3, 2024
91dc3f8
fix broken tests
LouisBrunner Oct 3, 2024
0c90e04
potential fix for macos15 arm64 compilation
LouisBrunner Oct 3, 2024
649d864
better debug for macos14
LouisBrunner Oct 3, 2024
6651317
debug
LouisBrunner Oct 3, 2024
47bbac5
diff dyld stub binder
LouisBrunner Oct 3, 2024
77b7e1f
remove debug
LouisBrunner Oct 3, 2024
02ccf4b
minor cleanup
LouisBrunner Oct 3, 2024
592af50
path fix
LouisBrunner Oct 3, 2024
3ef196e
fix restart
LouisBrunner Oct 3, 2024
8cade64
fix signal handling
LouisBrunner Oct 3, 2024
27a61b1
temp disable sigaltstack
LouisBrunner Oct 3, 2024
6869c33
remove banner
LouisBrunner Oct 3, 2024
f19a205
fix warnin
LouisBrunner Oct 3, 2024
e24e0a5
remove unused code
LouisBrunner Oct 3, 2024
24fe152
readd bug
LouisBrunner Oct 3, 2024
86aeb20
Merge remote-tracking branch 'upstream/master' into feature/m1
LouisBrunner Oct 3, 2024
4c0833f
improve linux build
LouisBrunner Oct 3, 2024
975cb71
disable test that cannot build on macos
LouisBrunner Oct 3, 2024
1a218d3
adjust expentencies
LouisBrunner Oct 3, 2024
04a314b
improve wqthread
LouisBrunner Oct 3, 2024
310993a
fix linux tests
LouisBrunner Oct 3, 2024
3f0b90f
wqthread close to working
LouisBrunner Oct 4, 2024
190fc23
supps + build
LouisBrunner Oct 4, 2024
b8df278
better compat
LouisBrunner Oct 4, 2024
f56a770
improve arm64 asm + catch all mallocs
LouisBrunner Oct 4, 2024
11a2160
tiny fixes
LouisBrunner Oct 4, 2024
4c1a1af
fix: finally support mach_msg2 correctly, add arm64 gen syscall, vast…
LouisBrunner Oct 8, 2024
1ce19e8
easier for debug
LouisBrunner Oct 8, 2024
338afeb
fix ci for macos14
LouisBrunner Oct 8, 2024
29583c7
less errors?
LouisBrunner Oct 12, 2024
309413f
improve PAC handling, better supps, etc
LouisBrunner Oct 17, 2024
f5e9f6a
fix new helper
LouisBrunner Oct 17, 2024
f71423f
fix new helper
LouisBrunner Oct 17, 2024
e156d6b
improve tests
LouisBrunner Oct 17, 2024
dc896d4
debugger finally works on arm64 (maybe amd64 too?)
LouisBrunner Oct 18, 2024
c79b5d4
lldb improvements and more
LouisBrunner Oct 19, 2024
3ef7b9b
fix JIT code
LouisBrunner Oct 19, 2024
8a5547b
revert some ASM stuff
LouisBrunner Oct 19, 2024
18e52d5
vgdb improvements
LouisBrunner Oct 20, 2024
7a3d6d1
fix fmax/min nm
LouisBrunner Oct 21, 2024
2bdfd68
even more arm64 improvements
LouisBrunner Oct 21, 2024
138d2de
control trap
LouisBrunner Oct 21, 2024
aaf91e9
necp/fcntl
LouisBrunner Oct 22, 2024
5433a61
macOS 15 fix
LouisBrunner Oct 24, 2024
845afb2
improved compat for macOS 15
LouisBrunner Oct 25, 2024
98a4211
some tests fix
LouisBrunner Oct 25, 2024
0504378
tests, instr and supps
LouisBrunner Oct 25, 2024
b698ed8
DEBUG REVERT
LouisBrunner Oct 25, 2024
219071c
flaky test
LouisBrunner Oct 25, 2024
ab639d7
minor changes
LouisBrunner Oct 28, 2024
e4f513f
reverted
LouisBrunner Oct 28, 2024
9dae353
merge issues
LouisBrunner Oct 28, 2024
8de4405
Merge remote-tracking branch 'origin/main' into feature/m1
LouisBrunner Oct 28, 2024
bee13c5
we actually needed this
LouisBrunner Oct 28, 2024
50e5ec9
Merge remote-tracking branch 'origin/main' into feature/m1
LouisBrunner Mar 12, 2025
e700b93
chore: post-merge fixes
LouisBrunner Mar 12, 2025
e858e73
feat: add SB to VEX
LouisBrunner Mar 12, 2025
40750db
fix expectations
LouisBrunner Mar 12, 2025
bac90d7
fix test expect
LouisBrunner Mar 12, 2025
d9df7d1
add FEAT_SB as default
LouisBrunner Mar 12, 2025
993743c
update README, fix issues in make check
LouisBrunner Mar 12, 2025
9a1bbf6
update gitignore
LouisBrunner Mar 12, 2025
af79161
hide arm64 support behind an opt-in
LouisBrunner Mar 12, 2025
e86083b
clearer terms
LouisBrunner Mar 12, 2025
0aec115
fix issues link
LouisBrunner Mar 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/flaky-tests.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# seen on macOS 12 and 13
none/tests/allexec32
none/tests/allexec64
none/tests/exec-sigmask
none/tests/args
# seen on all versions
none/tests/allexec32
none/tests/allexec64
memcheck/tests/sem
# seen on macOS 13
none/tests/sem
# seen on macOS 14
memcheck/tests/leak-cases-summary
8 changes: 0 additions & 8 deletions .github/macos-13-expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ memcheck/tests/accounting (stderr)
memcheck/tests/addressable (stderr)
memcheck/tests/amd64/bug492210_1 (stderr)
memcheck/tests/amd64/bug492210_2 (stderr)
memcheck/tests/amd64/fxsave-amd64 (stderr)
memcheck/tests/amd64/pcmpgt (stderr)
memcheck/tests/amd64/sh-mem-vec128-plo-no (stderr)
memcheck/tests/amd64/sh-mem-vec128-plo-yes (stderr)
memcheck/tests/amd64/sh-mem-vec256-plo-no (stderr)
memcheck/tests/amd64/sh-mem-vec256-plo-yes (stderr)
memcheck/tests/amd64/sse_memory (stderr)
memcheck/tests/amd64/xsave-avx (stderr)
memcheck/tests/atomic_incs (stderr)
memcheck/tests/badfree-2trace (stderr)
memcheck/tests/big_blocks_freed_list (stderr)
Expand Down Expand Up @@ -75,8 +72,6 @@ memcheck/tests/origin5-bz2 (stderr)
memcheck/tests/origin6-fp (stderr)
memcheck/tests/overlap (stderr)
memcheck/tests/pointer-trace (stderr)
memcheck/tests/posix_memalign (stderr)
memcheck/tests/posix_memalign_supp (stderr)
memcheck/tests/posix_memalign_xml (stderr)
memcheck/tests/post-syscall (stderr)
memcheck/tests/realloc_size_zero_again_no (stderr)
Expand All @@ -91,7 +86,6 @@ memcheck/tests/stpncpy (stderr)
memcheck/tests/strchr (stderr)
memcheck/tests/supponlyobj (stderr)
memcheck/tests/test-plo-no (stderr)
memcheck/tests/test-plo-yes (stderr)
memcheck/tests/thread_alloca (stderr)
memcheck/tests/threadname (stderr)
memcheck/tests/threadname_xml (stderr)
Expand All @@ -103,7 +97,6 @@ memcheck/tests/varinfo3 (stderr)
memcheck/tests/varinfo4 (stderr)
memcheck/tests/varinfo5 (stderr)
memcheck/tests/varinfo6 (stderr)
memcheck/tests/vbit-test/vbit-test (stderr)
memcheck/tests/wcpncpy (stderr)
memcheck/tests/wrap5 (stdout)
memcheck/tests/wrap6 (stdout)
Expand Down Expand Up @@ -334,7 +327,6 @@ none/tests/bigcode (stdout)
none/tests/bigcode (stderr)
none/tests/bug234814 (stdout)
none/tests/bug234814 (stderr)
none/tests/cmd-with-special (stderr)
none/tests/coolo_sigaction (stdout)
none/tests/darwin/apple-main-arg (stderr)
none/tests/darwin/rlimit (stderr)
Expand Down
410 changes: 410 additions & 0 deletions .github/macos-14-expected.txt

Large diffs are not rendered by default.

401 changes: 401 additions & 0 deletions .github/macos-15-expected.txt

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,30 @@ on:

env:
TEST_FOLDER: .github/test
I_ACKNOWLEDGE_THIS_MIGHT_CRASH_OR_DAMAGE_MY_COMPUTER: yes

jobs:
build_various_platforms:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, macos-13]
os:
- ubuntu-24.04
# x86_64
- macos-13
# arm64
- macos-14
- macos-15

runs-on: ${{ matrix.os }}

name: Build and Test on ${{matrix.os}}

steps:
- name: display environment (macOS)
run: |
sysctl -a
if: ${{ matrix.os != 'ubuntu-24.04' }}
- name: install dependencies (macOS)
run: |
brew update && brew install automake
Expand All @@ -44,7 +55,7 @@ jobs:
- name: build
run: make
- name: try ls -l
run: ./vg-in-place --gen-suppressions=all ls -l || ./vg-in-place -v -v -v -v -d -d -d -d ls -l
run: ./vg-in-place --gen-suppressions=all ls -l || ./vg-in-place -v -v -v -v -d -d -d -d -d ls -l
- name: build regression tests
run: XMLLINT=does_not_exist make check
- name: create artifacts folder
Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*.o
.DS_Store
configure~

# /
/.in_place
Expand Down Expand Up @@ -44,10 +46,9 @@

# /auxprogs/
/auxprogs/.deps
/auxprogs/getoff-amd64-darwin
/auxprogs/getoff-*-darwin
/auxprogs/getoff-arm-linux
/auxprogs/getoff-arm64-linux
/auxprogs/getoff-x86-darwin
/auxprogs/getoff-amd64-linux
/auxprogs/getoff-x86-linux
/auxprogs/getoff-s390x-linux
Expand Down Expand Up @@ -1821,6 +1822,7 @@
/none/tests/arm/vfpv4_fma

# /none/tests/arm64/
/none/tests/arm64/*.dSYM
/none/tests/arm64/*.stderr.diff*
/none/tests/arm64/*.stderr.out
/none/tests/arm64/*.stdout.diff*
Expand Down Expand Up @@ -2503,3 +2505,5 @@ none/tests/freebsd/bug499212
*.vgtest*.log
/test-suite-overall.log
test-suite.log

.zed
39 changes: 25 additions & 14 deletions Makefile.all.am
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ endif

# These flags are used for building the preload shared objects (PSOs).
# The aim is to give reasonable performance but also to have good
# stack traces, since users often see stack traces extending
# stack traces, since users often see stack traces extending
# into (and through) the preloads. Also, we must use any
# -mpreferred-stack-boundary flag to build the preload shared
# objects, since that risks misaligning the client's stack and
Expand Down Expand Up @@ -256,21 +256,31 @@ AM_CFLAGS_PSO_ARM64_FREEBSD= @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE)
AM_CCASFLAGS_ARM64_FREEBSD = @FLAG_M64@ -g

AM_FLAG_M3264_X86_DARWIN = -arch i386
AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
-I@XCODE_INC_DIR@ \
-mmacosx-version-min=@DARWIN_MIN_SDK@ \
AM_CFLAGS_X86_DARWIN = $(WERROR) $(AM_FLAG_M3264_X86_DARWIN) $(AM_CFLAGS_BASE) \
-I@SDK_INC_DIR@ \
@CLANG_OS_MIN_VERS_ARG@ \
-fno-pic -fno-PIC

AM_CFLAGS_PSO_X86_DARWIN = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PSO_BASE)
AM_CCASFLAGS_X86_DARWIN = -arch i386 -g
AM_CCASFLAGS_X86_DARWIN = $(AM_FLAG_M3264_X86_DARWIN) -g

AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
-I@XCODE_INC_DIR@ \
-mmacosx-version-min=@DARWIN_MIN_SDK@
AM_CFLAGS_AMD64_DARWIN = $(WERROR) $(AM_FLAG_M3264_AMD64_DARWIN) $(AM_CFLAGS_BASE) \
-I@SDK_INC_DIR@ \
@CLANG_OS_MIN_VERS_ARG@
AM_CFLAGS_PSO_AMD64_DARWIN = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PSO_BASE)
AM_CCASFLAGS_AMD64_DARWIN = -arch x86_64 -g \
-mmacosx-version-min=@DARWIN_MIN_SDK@
AM_CCASFLAGS_AMD64_DARWIN = $(AM_FLAG_M3264_AMD64_DARWIN) -g \
@CLANG_OS_MIN_VERS_ARG@

AM_FLAG_M3264_ARM64_DARWIN = -arch arm64
AM_CFLAGS_ARM64_DARWIN = $(WERROR) $(AM_FLAG_M3264_ARM64_DARWIN) $(AM_CFLAGS_BASE) \
-I@SDK_INC_DIR@ @CLANG_OS_MIN_VERS_ARG@
# Repeated instead of using $(AM_CFLAGS_ARM64_DARWIN) because we need to use
# a different arch for preloads (arm64e)
AM_CFLAGS_PSO_ARM64_DARWIN = $(WERROR) $(AM_FLAG_M3264_ARM64_DARWIN)e $(AM_CFLAGS_BASE) \
-I@SDK_INC_DIR@ @CLANG_OS_MIN_VERS_ARG@ \
$(AM_CFLAGS_PSO_BASE)
AM_CCASFLAGS_ARM64_DARWIN = $(AM_FLAG_M3264_ARM64_DARWIN) -g \
@CLANG_OS_MIN_VERS_ARG@

AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@
AM_CFLAGS_S390X_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -fomit-frame-pointer
Expand Down Expand Up @@ -324,7 +334,7 @@ AM_CCASFLAGS_PRI = $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
if VGCONF_HAVE_PLATFORM_SEC
AM_FLAG_M3264_SEC = $(AM_FLAG_M3264_@VGCONF_PLATFORM_SEC_CAPS@)
else
AM_FLAG_M3264_SEC =
AM_FLAG_M3264_SEC =
endif


Expand Down Expand Up @@ -355,8 +365,9 @@ PRELOAD_LDFLAGS_ARM64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
PRELOAD_LDFLAGS_X86_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M32@
PRELOAD_LDFLAGS_AMD64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@
PRELOAD_LDFLAGS_ARM64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@
PRELOAD_LDFLAGS_X86_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch i386
PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch x86_64
PRELOAD_LDFLAGS_X86_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) $(AM_FLAG_M3264_X86_DARWIN)
PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) $(AM_FLAG_M3264_AMD64_DARWIN)
PRELOAD_LDFLAGS_ARM64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN)
PRELOAD_LDFLAGS_S390X_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
PRELOAD_LDFLAGS_MIPS32_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
PRELOAD_LDFLAGS_NANOMIPS_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
Expand Down
5 changes: 3 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ SUPP_FILES = \
freebsd.supp freebsd-helgrind.supp freebsd-drd.supp \
darwin10.supp darwin10-drd.supp \
darwin11.supp darwin12.supp darwin13.supp darwin14.supp darwin15.supp \
darwin16.supp darwin17.supp darwin18.supp darwin19.supp darwin20.supp \
darwin21.supp darwin22.supp \
darwin16.supp darwin17.supp darwin18.supp darwin19.supp \
darwin21-amd64.supp darwin22-amd64.supp darwin23-amd64.supp \
darwin23-arm64.supp darwin24-amd64.supp darwin24-arm64.supp \
bionic.supp \
solaris11.supp solaris12.supp \
musl.supp
Expand Down
10 changes: 9 additions & 1 deletion Makefile.tool.am
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ TOOL_LDFLAGS_X86_DARWIN = \
TOOL_LDFLAGS_AMD64_DARWIN = \
$(TOOL_LDFLAGS_COMMON_DARWIN) -arch x86_64

TOOL_LDFLAGS_ARM64_DARWIN = \
$(TOOL_LDFLAGS_COMMON_DARWIN) -arch arm64

# MIPS Linux default start symbol is __start, not _start like on x86 or amd
TOOL_LDFLAGS_MIPS32_LINUX = \
-static -nodefaultlibs -nostartfiles -u __start @FLAG_NO_BUILD_ID@ \
Expand Down Expand Up @@ -175,6 +178,9 @@ LIBREPLACEMALLOC_X86_DARWIN = \
LIBREPLACEMALLOC_AMD64_DARWIN = \
$(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-darwin.a

LIBREPLACEMALLOC_ARM64_DARWIN = \
$(top_builddir)/coregrind/libreplacemalloc_toolpreload-arm64-darwin.a

LIBREPLACEMALLOC_S390X_LINUX = \
$(top_builddir)/coregrind/libreplacemalloc_toolpreload-s390x-linux.a

Expand Down Expand Up @@ -249,6 +255,9 @@ LIBREPLACEMALLOC_LDFLAGS_X86_DARWIN = \
LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN = \
$(LIBREPLACEMALLOC_AMD64_DARWIN)

LIBREPLACEMALLOC_LDFLAGS_ARM64_DARWIN = \
$(LIBREPLACEMALLOC_ARM64_DARWIN)

LIBREPLACEMALLOC_LDFLAGS_S390X_LINUX = \
-Wl,--whole-archive \
$(LIBREPLACEMALLOC_S390X_LINUX) \
Expand Down Expand Up @@ -290,4 +299,3 @@ clean-local: clean-noinst_DSYMS
install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS

uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS

Loading
Loading