diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-10-30 11:39:23 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-10-30 11:39:23 -0500 |
| commit | c1f4fbaa1b07651b2e212f1bd568bb6abe6751d9 (patch) | |
| tree | 5fe2cd1e24ee7a46319e82aaeb71f02eeaf2f14c | |
| parent | 02ab4d6ef4606ad7fea5f9c0a87aee3b2e06ee53 (diff) | |
| download | ATCD-c1f4fbaa1b07651b2e212f1bd568bb6abe6751d9.tar.gz | |
platform_android.GNU: Combine arm7 marcos
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index d0ea482d53a..fd4708fe2de 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -48,12 +48,23 @@ ifeq ($(ANDROID_ABI), neon) ANDROID_ABI := armeabi-v7a-with-neon endif +android_neon ?= 0 +ifeq ($(ANDROID_ABI),armeabi-v7a-with-neon) + ANDROID_ABI = armeabi-v7a + android_neon := 1 +endif + # NDK says -Wl,--fix-cortex-a8 is required for working around a CPU bug # in some Cortex-A8 implementations ifeq ($(ANDROID_ABI),armeabi-v7a) CROSS_COMPILE := arm-linux-androideabi- - FLAGS_C_CC += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 + FLAGS_C_CC += -march=armv7-a -mfloat-abi=softfp + ifeq ($(android_neon),0) + FLAGS_C_CC += -mfpu=neon + else + FLAGS_C_CC += -mfpu=vfpv3-d16 + endif LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8 endif @@ -63,12 +74,6 @@ ifeq ($(ANDROID_ABI),arm64-v8a) LDFLAGS += -march=armv8-a endif -ifeq ($(ANDROID_ABI),armeabi-v7a-with-neon) - CROSS_COMPILE := arm-linux-androideabi- - FLAGS_C_CC += -march=armv7-a -mfloat-abi=softfp -mfpu=neon - LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8 -endif - ifeq ($(ANDROID_ABI),x86) CROSS_COMPILE := i686-linux-android- endif |