From 117565b7d8771b6c9c2144b2d1ef5a131446e058 Mon Sep 17 00:00:00 2001 From: Sven Gothel 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/stub_includes/platform/glibc-compat-symbols.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'make/stub_includes') diff --git a/make/stub_includes/platform/glibc-compat-symbols.h b/make/stub_includes/platform/glibc-compat-symbols.h index e390bcb..d8d0d17 100644 --- a/make/stub_includes/platform/glibc-compat-symbols.h +++ b/make/stub_includes/platform/glibc-compat-symbols.h @@ -22,7 +22,10 @@ however memcpy is not versioned for aarch64 */ #define GLIBC_COMPAT_SYMBOL(FFF) #elif defined(__arm__) + /** On recent toolchain memcpy is no more versioned for arm #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); + */ + #define GLIBC_COMPAT_SYMBOL(FFF) #elif defined(__amd64__) #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); #else @@ -34,7 +37,10 @@ however memcpy is not versioned for aarch64 */ #define GLIBC_COMPAT_SYMBOL(FFF) #elif defined(__arm__) - #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4"); + /** On recent toolchain memcpy is no more versioned for arm + #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); + */ + #define GLIBC_COMPAT_SYMBOL(FFF) #elif defined(__amd64__) #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); #else -- cgit v1.2.3