Skip to content

Commit f853fc8

Browse files
hainquehainque
committed
Merge branch 'wip/aarch64-android' into 'master'
Introduce gprconfig db support for aarch64-android See merge request eng/gpr/gprconfig_kb!41
2 parents 0dcc80e + fe17eac commit f853fc8

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

‎db/compilers.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- GCC 3.x & 4.x (not for GNAT Pro)-->
2121
<compiler_description>
2222
<name>GCC</name>
23-
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc(-\d+)?</executable>
23+
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc(-\d+)?</executable>
2424
<version>
2525
<external>$EXEC -v</external>
2626
<nogrep regexp="for GNAT Pro"></nogrep>
@@ -36,7 +36,7 @@
3636
<!-- GCC for GNAT Pro 3.x & 4.x -->
3737
<compiler_description>
3838
<name>GCC_Pro</name>
39-
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc</executable>
39+
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc</executable>
4040
<version>
4141
<external>${PREFIX}gcc -v</external>
4242

@@ -121,7 +121,7 @@
121121
<!-- G++ compilers for GNAT Pro -->
122122
<compiler_description>
123123
<name>G++_Pro</name>
124-
<executable prefix="1">(.*-elf-.*|.*-eabi-.*|.*-wrs-.*|.*-fastos.*|.*-freebsd.*|.*-linux-gnu.*-|.*-rtems.*)?g\+\+</executable>
124+
<executable prefix="1">(.*-elf-.*|.*-eabi-.*|.*-wrs-.*|.*-fastos.*|.*-freebsd.*|.*-linux-gnu.*-|.*-linux-android.*|.*-rtems.*)?g\+\+</executable>
125125
<version>
126126
<external>${PREFIX}g++ -v</external>
127127

@@ -138,7 +138,7 @@
138138
<!-- Assembler (not for GNAT Pro) -->
139139
<compiler_description>
140140
<name>GCC-ASM</name>
141-
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc(-\d+)?</executable>
141+
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc(-\d+)?</executable>
142142
<version>
143143
<external>$EXEC -v</external>
144144
<nogrep regexp="for GNAT Pro"></nogrep>
@@ -154,7 +154,7 @@
154154
<!-- Assembler (for GNAT Pro) -->
155155
<compiler_description>
156156
<name>GCC-ASM_Pro</name>
157-
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-.*fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc</executable>
157+
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-.*fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gcc</executable>
158158
<version>
159159
<external>${PREFIX}gcc -v</external>
160160
<grep regexp="^gcc \S+ (\S+) \d+ (\(prerelease\) )?\(?for GNAT Pro" group="1"></grep>
@@ -169,7 +169,7 @@
169169
<!-- Binary image -->
170170
<compiler_description>
171171
<name>LD</name>
172-
<executable prefix="1">(.*-wrs.*-|.*-sysgo.*-|.*-elf.*-|.*-eabi.*-|.*-eabispe.*-|avr.*-|.*-elinos-linux.*-|.*-linux-gnu-|.*mingw32.*-|.*-xcoff.*-|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*-|.*-rtems.*-)?ld</executable>
172+
<executable prefix="1">(.*-wrs.*-|.*-sysgo.*-|.*-elf.*-|.*-eabi.*-|.*-eabispe.*-|avr.*-|.*-elinos-linux.*-|.*-linux-gnu-|.*mingw32.*-|.*-xcoff.*-|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*-|.*-rtems.*-)?ld</executable>
173173
<version>
174174
<external>${PREFIX}ld -v</external>
175175
<grep regexp="^(GNU ld.*|LLD) (\S+)" group="2"></grep>
@@ -189,7 +189,7 @@
189189
-->
190190
<compiler_description>
191191
<name>GNAT</name>
192-
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls</executable>
192+
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls</executable>
193193
<version>
194194
<external>${PREFIX}gnatls -v --version</external>
195195
<grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>

‎db/cross.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<target name="^arm-linux-androideabi" />
4747
<target name="^arm-linux-gnueabi" />
4848
<target name="^arm-linux-gnueabihf" />
49+
<target name="^aarch64-linux-android" />
4950
<target name="^aarch64-.*linux-gnu" />
5051
<target name="^e500v2-gnu-linux" />
5152
<target name="^.*-netbsd.*$" />

‎db/linker.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,19 @@
676676
</config>
677677
</configuration>
678678

679+
<configuration>
680+
<!-- aarch64-android - cross compiler. -->
681+
<targets>
682+
<target name="^aarch64-linux-android$" />
683+
</targets>
684+
<config>
685+
for Archive_Builder use ("aarch64-linux-android-ar", "cr");
686+
for Archive_Builder_Append_Option use ("q");
687+
for Archive_Indexer use ("aarch64-linux-android-ranlib");
688+
for Archive_Suffix use ".a";
689+
</config>
690+
</configuration>
691+
679692
<configuration>
680693
<!-- aarch64-linux - native compiler. -->
681694
<targets>

‎db/targetset.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,12 @@
647647
<target>arm-linux-androideabi</target>
648648
</targetset>
649649

650+
<!-- aarch64-android -->
651+
<targetset canonical="aarch64-android">
652+
<target>aarch64-android</target>
653+
<target>aarch64-linux-android</target>
654+
</targetset>
655+
650656
<!-- aarch64-pikeos5 -->
651657

652658
<targetset canonical="aarch64-pikeos5">

0 commit comments

Comments
 (0)