Skip to content

Commit 8d61241

Browse files
Kenostaticfloat
andauthored
Add Auditor arch mapping form Darwin AArch64 (#902)
* Add Auditor arch mapping form Darwin AArch64 * Require `ObjectFile v0.3.6+` Co-authored-by: Elliot Saba <[email protected]>
1 parent 3788148 commit 8d61241

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

Diff for: Manifest.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
2222

2323
[[BinaryBuilderBase]]
2424
deps = ["CodecZlib", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "UUIDs"]
25-
git-tree-sha1 = "d40c8cf5a55ac2afde6428f5bca1e532b4200e00"
25+
git-tree-sha1 = "97cd717e1e3453db6211214b3041f120dc8d0816"
2626
repo-rev = "master"
2727
repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
2828
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
@@ -60,9 +60,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
6060

6161
[[FileIO]]
6262
deps = ["Pkg"]
63-
git-tree-sha1 = "1e7e88a949b52e6f7f589041bd60928322414997"
63+
git-tree-sha1 = "992b4aeb62f99b69fcf0cb2085094494cc05dfb3"
6464
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
65-
version = "1.4.1"
65+
version = "1.4.3"
6666

6767
[[FileWatching]]
6868
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -177,9 +177,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
177177

178178
[[Mustache]]
179179
deps = ["Printf", "Tables"]
180-
git-tree-sha1 = "3d07128636eddde25a17aced63dbcedbce71a79d"
180+
git-tree-sha1 = "17e60d71d720c33ac2fbac21298ee495bae27587"
181181
uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
182-
version = "1.0.4"
182+
version = "1.0.5"
183183

184184
[[Mux]]
185185
deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "Test", "WebSockets"]
@@ -189,9 +189,9 @@ version = "0.7.0"
189189

190190
[[ObjectFile]]
191191
deps = ["Reexport", "StructIO", "Test"]
192-
git-tree-sha1 = "c1b7b18d497eda21411c2e2075395edb10a42ee3"
192+
git-tree-sha1 = "e009c49f99dac98cb79f93b26c259ebca66eff26"
193193
uuid = "d8793406-e978-5875-9003-1fc021f44a92"
194-
version = "0.3.5"
194+
version = "0.3.6"
195195

196196
[[OrderedCollections]]
197197
git-tree-sha1 = "293b70ac1780f9584c89268a6e2a560d938a7065"
@@ -257,9 +257,9 @@ version = "1.2.1"
257257

258258
[[RegistryTools]]
259259
deps = ["AutoHashEquals", "LibGit2", "Pkg", "UUIDs"]
260-
git-tree-sha1 = "ea27832a31084895842c77e4f78f5beea9677abd"
260+
git-tree-sha1 = "5270a369341e32d0612291d1665133449b074da8"
261261
uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
262-
version = "1.5.0"
262+
version = "1.5.1"
263263

264264
[[SHA]]
265265
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

Diff for: Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ HTTP = "0.8"
3838
JLD2 = "0.1.6"
3939
JSON = "0.21"
4040
LoggingExtras = "0.4"
41-
ObjectFile = "0.3"
41+
ObjectFile = "0.3.6"
4242
OutputCollectors = "0.1"
4343
PkgLicenses = "0.2"
4444
ProgressMeter = "1"

Diff for: src/auditor/dynamic_linkage.jl

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@ function platform_for_object(oh::ObjectHandle)
3333
error("Unknown ELF OSABI $(oh.ei.osabi)")
3434
end
3535
elseif oh isa MachOHandle
36-
return MacOS()
36+
mach_to_arch = Dict(
37+
MachO.CPU_TYPE_X86_64 => :x86_64,
38+
MachO.CPU_TYPE_ARM64 => :aarch64,
39+
)
40+
mach = oh.header.cputype
41+
if !haskey(mach_to_arch, mach)
42+
error("Unknown MachO architecture $(mach)")
43+
end
44+
return MacOS(mach_to_arch[mach])
3745
elseif oh isa COFFHandle
3846
if is64bit(oh)
3947
return Windows(:x86_64)

0 commit comments

Comments
 (0)