From 117565b7d8771b6c9c2144b2d1ef5a131446e058 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 7 Apr 2019 22:34:37 +0200
Subject: 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
---
 make/lib/gluegen-cpptasks-linux-armv6hf.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'make/lib/gluegen-cpptasks-linux-armv6hf.xml')

diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml
index df5a91c..a7f15a4 100644
--- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml
+++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml
@@ -43,8 +43,9 @@
       </defineset>
       <compilerarg value="-fpic" /> 
       <compilerarg value="-march=armv6" />
-      <compilerarg value="-marm" /> 
+      <compilerarg value="-mfpu=vfp" />
       <compilerarg value="-mfloat-abi=hard" />
+      <compilerarg value="-marm" /> 
       <compilerarg value="-include"/>
       <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
     </compiler>
@@ -52,8 +53,9 @@
     <linker id="linker.cfg.linux.armv6" name="gcc">
       <linkerarg value="-fpic" /> 
       <linkerarg value="-march=armv6" />
-      <linkerarg value="-marm" />
+      <linkerarg value="-mfpu=vfp" />
       <linkerarg value="-mfloat-abi=hard" />
+      <linkerarg value="-marm" />
       <linkerarg value="-nostdlib" />
       <linkerarg value="-Bdynamic" />
       <linkerarg value="-static-libgcc" if="isGCC"/>
-- 
cgit v1.2.3