diff options
| author | Sven Gothel <[email protected]> | 2019-04-07 22:34:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-07 22:34:37 +0200 |
| commit | 117565b7d8771b6c9c2144b2d1ef5a131446e058 (patch) | |
| tree | 5ba3405ee8a354fabae5a81c1445a1aea8d9b8e0 /make/gluegen-cpptasks-base.xml | |
| parent | 12047cae51b5a594b38c9e162f135352452c46fd (diff) | |
Bug 1190: Fix arm6hf + aarch64 gcc options, adapt glibc-compat-symbols.h
- arm6hf needs the fpu to be specified, we still use the lowest armv6 hard float denominator
- aarch64 shall have the -march compiler argument as well
- glibc-compat-symbols.h Finally drop the glibc versioning on memcpy for both
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 0a6fb25..0f44566 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -238,7 +238,7 @@ by a custom file set in property 'gluegen-cpptasks.file' or environment var 'GLUEGEN_CPPTASKS_FILE' - See 'lib/gluegen-cpptasks-linux-armv6.xml' which sets OS and ARCH + See 'lib/gluegen-cpptasks-linux-armv6hf.xml' which sets OS and ARCH for crosscompilation. --> <target name="gluegen.cpptasks.detect.os.custom"> @@ -1041,8 +1041,8 @@ </compiler> <!-- Using default compiler settings - utilize: - - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + - lib/gluegen-cpptasks-linux-aarch64.xml (armv8 64bit) for official JogAmp builds! --> <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}"> <defineset> @@ -1057,6 +1057,10 @@ <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" /> </compiler> + <!-- Using default compiler settings - utilize: + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + - lib/gluegen-cpptasks-linux-aarch64.xml (armv8 64bit) + for official JogAmp builds! --> <compiler id="compiler.cfg.linux.aarch64" name="${gcc.compat.compiler}"> <defineset> <define name="__LP64__" /> <!-- default pre-defined macro for 64bit unix --> @@ -1279,8 +1283,8 @@ </linker> <!-- Using default compiler settings - utilize: - - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + - lib/gluegen-cpptasks-linux-aarch64.xml (armv8 64bit) for official JogAmp builds! --> <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}"> <linkerarg value="-fpic" /> @@ -1290,6 +1294,10 @@ <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> + <!-- Using default compiler settings - utilize: + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + - lib/gluegen-cpptasks-linux-aarch64.xml (armv8 64bit) + for official JogAmp builds! --> <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}"> <linkerarg value="-fpic" /> <linkerarg value="-nostdlib" /> |