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

5 files changed, 10 insertions, 70 deletions

diff --git a/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml b/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml
index 8606fae..57af368 100644
--- a/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml
+++ b/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml
@@ -41,6 +41,7 @@
         <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
       </defineset>
       <compilerarg value="-fpic" /> 
+      <compilerarg value="-march=armv8-a" />
       <compilerarg value="-include"/>
       <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
     </compiler>
diff --git a/make/lib/gluegen-cpptasks-linux-aarch64.xml b/make/lib/gluegen-cpptasks-linux-aarch64.xml
index 5e3845a..472f81a 100644
--- a/make/lib/gluegen-cpptasks-linux-aarch64.xml
+++ b/make/lib/gluegen-cpptasks-linux-aarch64.xml
@@ -42,6 +42,7 @@
         <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
       </defineset>
       <compilerarg value="-fpic" /> 
+      <compilerarg value="-march=armv8-a" />
       <compilerarg value="-include"/>
       <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
     </compiler>
diff --git a/make/lib/gluegen-cpptasks-linux-armv6.xml b/make/lib/gluegen-cpptasks-linux-armv6.xml
deleted file mode 100644
index 5b65b42..0000000
--- a/make/lib/gluegen-cpptasks-linux-armv6.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
-
-        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
-
-    In case you want to compile for 32bit on a 64bit machine,
-    you might also need to set the 'os.arch' to 'x86'.
-    Example: gluegen/make/make.gluegen.all.linux-x86.sh
-  -->
-
-<project name="GlueGen-cpptasks-linux-armv6" basedir="." >
-
-<!-- Set OS and ARCH for crosscompilation compiler configuration -->
-<target name="gluegen.cpptasks.detect.os.custom">
-    <property name="gluegen.cpptasks.detected.os"     value="true" /> 
-    <property name="isUnix"                           value="true" /> 
-    <property name="isLinux"                          value="true" /> 
-    <property name="isLinuxARMv6"                     value="true" /> 
-    <property name="isX11"                            value="true" /> 
-    <property name="jvmDataModel.arg"                 value="-Djnlp.no.jvm.data.model.set=true" /> 
-    <property name="isCrosscompilation"               value="true" />
-    <property name="isAbiEabiGnuArmel"                value="true" />
-    <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv6' done"/>
-</target>
-
-<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" />
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
-    <echo message="Custom forced compiler Linux ARMv5te soft float" />
-
-    <compiler id="compiler.cfg.linux.armv6" name="gcc">
-      <defineset>
-        <define name="__unix__"/>
-        <define name="__X11__"  if="isX11"/>
-        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
-        <define name="DEBUG"    if="c.compiler.use-debug"/>        
-        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
-      </defineset>
-      <compilerarg value="-fpic" /> 
-      <compilerarg value="-march=armv5te" />
-      <compilerarg value="-marm" /> 
-      <compilerarg value="-mfloat-abi=softfp" />
-      <compilerarg value="-include"/>
-      <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
-    </compiler>
-
-    <linker id="linker.cfg.linux.armv6" name="gcc">
-      <linkerarg value="-fpic" /> 
-      <linkerarg value="-march=armv5te" />
-      <linkerarg value="-marm" />
-      <linkerarg value="-mfloat-abi=softfp" />
-      <linkerarg value="-nostdlib" />
-      <linkerarg value="-Bdynamic" />
-      <linkerarg value="-static-libgcc" if="isGCC"/>
-      <linkerarg value="-static-libstdc++" if="isGCC"/>
-    </linker>
-</target>
-
-</project>
-
-
diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml b/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml
index 03b983c..5e03246 100644
--- a/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml
+++ b/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml
@@ -42,8 +42,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>
@@ -51,8 +52,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"/>
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"/>