Skip to content

Enable ARM64 support on LLVM builds #1824

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.

Sign up for GitHub

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 3 commits into from
Feb 3, 2024
Merged

Enable ARM64 support on LLVM builds #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c880be4
Enable ARM64 support on LLVM builds
konistehrad Feb 2, 2024
308d6af
Fix missing AArch64 entry in CLI CppAbi
konistehrad Feb 2, 2024
343d009
Instruct generator to build ARM64 bindings
konistehrad Feb 2, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/llvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ jobs:
matrix:
config:
- { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
- { os: ubuntu-22.04, platform: arm64, cxx: g++-11, cc: gcc-11 }
- { os: macos-11, platform: x64, cxx: clang++, cc: clang }
- { os: macos-12, platform: x64, cxx: clang++, cc: clang }
- { os: macos-12, platform: arm64, cxx: clang++, cc: clang }

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

Expand Down
5 changes: 5 additions & 0 deletions build/Helpers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ newoption {
allowed = {
{ "x86", "x86 32-bits" },
{ "x64", "x64 64-bits" },
{ "arm64","ARM64 64-bits" },
}
}

Expand Down Expand Up @@ -251,11 +252,15 @@ function AddPlatformSpecificFiles(folder, filename)
filter { "toolset:msc*", "architecture:x86" }
files { path.join(folder, "i686-pc-win32-msvc", filename) }
elseif os.istarget("macosx") then
filter { "architecture:arm64" }
files { path.join(folder, "arm64-apple-darwin12.4.0", filename) }
filter { "architecture:x86_64" }
files { path.join(folder, "x86_64-apple-darwin12.4.0", filename) }
filter {"architecture:x86" }
files { path.join(folder, "i686-apple-darwin12.4.0", filename) }
elseif os.istarget("linux") then
filter { "architecture:arm64" }
files { path.join(folder, "arm64-linux-gnu" .. (UseCxx11ABI() and "-cxx11abi" or ""), filename) }
filter { "architecture:x86_64" }
files { path.join(folder, "x86_64-linux-gnu" .. (UseCxx11ABI() and "-cxx11abi" or ""), filename) }
else
Expand Down
6 changes: 6 additions & 0 deletions build/LLVM.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ function SetupLLVMLibs()
"LLVMX86CodeGen",
"LLVMX86Desc",
"LLVMX86Info",
"LLVMAArch64AsmParser",
"LLVMAArch64CodeGen",
"LLVMAArch64Desc",
"LLVMAArch64Disassembler",
"LLVMAArch64Info",
"LLVMAArch64Utils",
"LLVMipo",
"LLVMInstrumentation",
"LLVMVectorize",
Expand Down
2 changes: 1 addition & 1 deletion build/llvm/LLVM.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ function cmake(gen, conf, builddir, options)
.. ' -DLLVM_ENABLE_ZSTD=false'
.. ' -DLLVM_INCLUDE_DOCS=false'
.. ' -DLLVM_INCLUDE_EXAMPLES=false'
.. ' -DLLVM_TARGETS_TO_BUILD="X86"'
.. ' -DLLVM_TARGETS_TO_BUILD="X86;AArch64"'
.. ' -DLLVM_TOOL_BUGPOINT_BUILD=false'
.. ' -DLLVM_TOOL_BUGPOINT_PASSES_BUILD=false'
.. ' -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=false'
Expand Down
7 changes: 4 additions & 3 deletions src/CppParser/Bindings/CLI/Decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,10 @@ namespace CppSharp
Itanium = 0,
Microsoft = 1,
ARM = 2,
iOS = 3,
AppleARM64 = 4,
WebAssembly = 5
AArch64 = 3,
iOS = 4,
AppleARM64 = 5,
WebAssembly = 6
};

public enum class RecordArgABI
Expand Down
17 changes: 15 additions & 2 deletions src/CppParser/ParserGen/ParserGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,17 @@ public static void Main(string[] args)
var osxHeadersPath = Path.Combine(GetSourceDirectory("build"), @"headers\osx");
if (Directory.Exists(osxHeadersPath) || Platform.IsMacOS)
{
Console.WriteLine("Generating the C# parser bindings for OSX...");
Console.WriteLine("Generating the C# parser bindings for OSX x86...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin12.4.0"));
Console.WriteLine();

Console.WriteLine("Generating the C# parser bindings for OSX...");
Console.WriteLine("Generating the C# parser bindings for OSX x64...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin12.4.0"));
Console.WriteLine();

Console.WriteLine("Generating the C# parser bindings for OSX ARM64...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin12.4.0"));
Console.WriteLine();
}

var linuxHeadersPath = Path.Combine(GetSourceDirectory("build"), @"headers\x86_64-linux-gnu");
Expand All @@ -186,10 +190,19 @@ public static void Main(string[] args)
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-linux-gnu"));
Console.WriteLine();

Console.WriteLine("Generating the C# parser bindings for Linux ARM64...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-linux-gnu"));
Console.WriteLine();

Console.WriteLine("Generating the C# parser bindings for Linux (GCC C++11 ABI)...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-linux-gnu",
isGnuCpp11Abi: true));
Console.WriteLine();

Console.WriteLine("Generating the C# parser bindings for Linux ARM64 (GCC C++11 ABI)...");
ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-linux-gnu",
isGnuCpp11Abi: true));
Console.WriteLine();
}
}
}
Expand Down