Skip to content

NEW: gcc 4.9 aarch64/arm64v8-a support #140

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

Open
thomas-t1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NEW: gcc 4.9 aarch64/arm64v8-a support #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 38 additions & 0 deletions ...mToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!--
***********************************************************************************************
(c) 2014 Gavin Pugh http://www.gavpugh.com/ - Released under the open-source zlib license
***********************************************************************************************
-->

<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>

<PlatformToolsetVersion>aarch64-linux-android-4.9</PlatformToolsetVersion>

<PlatformShortName>arm64</PlatformShortName>

<GccVersion>4.9</GccVersion>

<!-- Path to gcc prebuilt libs -->
<PrebuiltDir>$(AndroidNdkDir)\toolchains\$(PlatformToolsetVersion)\prebuilt\$(PrebuiltWinDirName)</PrebuiltDir>

<GccLibPath>$(PrebuiltDir)\lib\gcc\aarch64-linux-android\4.9</GccLibPath>
<GccLibPath_Thumb>$(GccLibPath)</GccLibPath_Thumb>
<GccLibPath_Arm7>$(GccLibPath)</GccLibPath_Arm7>
<GccLibPath_Arm7_Thumb>$(GccLibPath)</GccLibPath_Arm7_Thumb>

<!-- Path to the GCC compilation tools -->
<GccToolsPath>$(AndroidNdkDir)\toolchains\$(PlatformToolsetVersion)\prebuilt\$(PrebuiltWinDirName)\bin</GccToolsPath>

<!-- Path to the toolchain includes. Needed for Intellisense. -->
<GccToolchainIncludes>$(PrebuiltDir)\lib\gcc\aarch64-linux-android\4.9\include</GccToolchainIncludes>

<!-- GCC compilation tool filenames -->
<GccCompiler>aarch64-linux-android-g++.exe</GccCompiler>
<GccLinker>aarch64-linux-android-g++.exe</GccLinker>
<GccLibrarian>aarch64-linux-android-ar.exe</GccLibrarian>

</PropertyGroup>

</Project>
9 changes: 9 additions & 0 deletions ...oolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!--
***********************************************************************************************
(c) 2014 Gavin Pugh http://www.gavpugh.com/ - Released under the open-source zlib license
***********************************************************************************************
-->

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

</Project>
2 changes: 2 additions & 0 deletions MSBuild/Android/Props/android_general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<EnumValue Name="arm-linux-androideabi-4.6" DisplayName="ARM 4.6 Toolchain (arm-linux-androideabi-4.6)" />
<EnumValue Name="arm-linux-androideabi-4.8" DisplayName="ARM 4.8 Toolchain (arm-linux-androideabi-4.8)" />
<EnumValue Name="arm-linux-androideabi-4.9" DisplayName="ARM 4.9 Toolchain (arm-linux-androideabi-4.9)" />
<EnumValue Name="aarch64-linux-android-4.9" DisplayName="ARM64 4.9 Toolchain (aarch64-linux-android-4.9)" />
<EnumValue Name="x86-4.6" DisplayName="x86 4.6 Toolchain (x86-4.6)" />
<EnumValue Name="x86-4.8" DisplayName="x86 4.8 Toolchain (x86-4.8)" />
<EnumValue Name="x86-4.9" DisplayName="x86 4.9 Toolchain (x86-4.9)" />
Expand Down Expand Up @@ -118,6 +119,7 @@
<EnumProperty Name="AndroidArch" DisplayName="Target Architecture" Category="ProjectDefaults">
<EnumValue Name="armv5te" DisplayName="ARM Architecture v5te (armv5te)" />
<EnumValue Name="armv7-a" DisplayName="ARM Architecture v7-a (armv7-a)" />
<EnumValue Name="arm64v8-a" DisplayName="ARM64 Architecture v8-a (arm64v8-a)" />
<EnumValue Name="x86" DisplayName="x86 Architecture (x86)" />
<EnumValue Name="mips" DisplayName="MIPS Architecture (mips)" />
</EnumProperty>
Expand Down
1 change: 1 addition & 0 deletions MSBuild/Android/vs-android.ToolPaths.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ArchStlDirName Condition="'$(AndroidArch)' == 'armv7-a'">armeabi-v7a</ArchStlDirName>
<ArchStlDirName Condition="'$(AndroidArch)' == 'x86'">x86</ArchStlDirName>
<ArchStlDirName Condition="'$(AndroidArch)' == 'mips'">mips</ArchStlDirName>
<ArchStlDirName Condition="'$(AndroidArch)' == 'arm64v8-a'">arm64-v8a</ArchStlDirName>

<AndroidStlIncludeDir Condition="'$(AndroidStlType)' == 'system'">$(AndroidNdkDir)\sources\cxx-stl\system\include</AndroidStlIncludeDir>
<AndroidStlIncludeDir Condition="'$(AndroidStlType)' == 'gnustl_static'">$(AndroidNdkDir)\sources\cxx-stl\gnu-libstdc++\$(GccVersion)\include;$(AndroidNdkDir)\sources\cxx-stl\gnu-libstdc++\$(GccVersion)\libs\$(ArchStlDirName)\include</AndroidStlIncludeDir>
Expand Down