From cd9733933e10fe9e55e6bef09ebd6d1b7549ac45 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 15:58:28 +0900 Subject: Add support for 'arm64' architecture. --- tasks/toolchains/androidndk.rake | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 68dc9898c..a1b3545fc 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -53,7 +53,12 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter params.fetch(:toolchain_version) do test = case toolchain when :gcc - 'arm-linux-androideabi-*' + case arch + when /armeabi/ + 'arm-linux-androideabi-*' + when /arm64/ + 'aarch64-linux-android-*' + end when :clang 'llvm-*' end @@ -67,9 +72,10 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when :clang then 'llvm-' when :gcc case arch - when /arm/ then 'arm-linux-androideabi-' - when /x86/ then 'x86-' - when /mips/ then 'mipsel-linux-android-' + when /armeabi/ then 'arm-linux-androideabi-' + when /arm64/ then 'aarch64-linux-android-' + when /x86/ then 'x86-' + when /mips/ then 'mipsel-linux-android-' end end home_path.join('toolchains', prefix + toolchain_version.to_s, 'prebuilt', host_platform) @@ -77,9 +83,10 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter def sysroot path = case arch - when /arm/ then 'arch-arm' - when /x86/ then 'arch-x86' - when /mips/ then 'arch-mips' + when /armeabi/ then 'arch-arm' + when /arm64/ then 'arch-arm64' + when /x86/ then 'arch-x86' + when /mips/ then 'arch-mips' end home_path.join('platforms', platform, path).to_s @@ -90,9 +97,10 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter if toolchain == :gcc command = case arch - when /arm/ then 'arm-linux-androideabi-' - when /x86/ then 'i686-linux-android-' - when /mips/ then 'mipsel-linux-android-' + when /armeabi/ then 'arm-linux-androideabi-' + when /arm64/ then 'aarch64-linux-android-' + when /x86/ then 'i686-linux-android-' + when /mips/ then 'mipsel-linux-android-' end + command end @@ -114,6 +122,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-ffunction-sections -funwind-tables -fstack-protector) flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch + when /arm64/ + flags += %W() when 'armeabi-v7a' flags += %W(-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ -- cgit v1.2.3 From a2966734aa12cb35da12f282dcfa80008d59fed7 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:06:21 +0900 Subject: Fix build error for 'mips' architecture. --- tasks/toolchains/androidndk.rake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index a1b3545fc..527d222c1 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -58,6 +58,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter 'arm-linux-androideabi-*' when /arm64/ 'aarch64-linux-android-*' + when /mips/ + 'mipsel-linux-android-*' end when :clang 'llvm-*' -- cgit v1.2.3 From 3ae425e3f0f479006ff2d2c28080b8c90e6982c9 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:14:00 +0900 Subject: Fix build error for 'x86' architecture. --- tasks/toolchains/androidndk.rake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 527d222c1..ef7b6192a 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -60,6 +60,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter 'aarch64-linux-android-*' when /mips/ 'mipsel-linux-android-*' + when /x86/ + 'x86-*' end when :clang 'llvm-*' -- cgit v1.2.3 From c022357ed51e6f4b616e41e253463af4dace698e Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:22:45 +0900 Subject: Add support for 'mips64' architecture. --- tasks/toolchains/androidndk.rake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index ef7b6192a..671deeef5 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -58,6 +58,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter 'arm-linux-androideabi-*' when /arm64/ 'aarch64-linux-android-*' + when /mips64/ + 'mips64el-linux-android-*' when /mips/ 'mipsel-linux-android-*' when /x86/ @@ -79,6 +81,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /armeabi/ then 'arm-linux-androideabi-' when /arm64/ then 'aarch64-linux-android-' when /x86/ then 'x86-' + when /mips64/ then 'mips64el-linux-android-' when /mips/ then 'mipsel-linux-android-' end end @@ -90,6 +93,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /armeabi/ then 'arch-arm' when /arm64/ then 'arch-arm64' when /x86/ then 'arch-x86' + when /mips64/ then 'arch-mips64' when /mips/ then 'arch-mips' end @@ -104,6 +108,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /armeabi/ then 'arm-linux-androideabi-' when /arm64/ then 'aarch64-linux-android-' when /x86/ then 'i686-linux-android-' + when /mips64/ then 'mips64el-linux-android-' when /mips/ then 'mipsel-linux-android-' end + command end @@ -132,6 +137,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ flags += %W(-march=armv5te -mtune=xscale -msoft-float) + when /mips64/ + flags += %W(-fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) end -- cgit v1.2.3 From 86f710cf0cdf5c4f8509047297d1cb4c02538a07 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:24:30 +0900 Subject: Replace tab by white-spaces. --- tasks/toolchains/androidndk.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 671deeef5..b8807e76a 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -131,8 +131,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-ffunction-sections -funwind-tables -fstack-protector) flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch - when /arm64/ - flags += %W() + when /arm64/ + flags += %W() when 'armeabi-v7a' flags += %W(-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ -- cgit v1.2.3 From 61a188a38afbfa6859eeafb2a0b243d984e9fde5 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:26:58 +0900 Subject: Some flags (-fpic and etc.) should be set by default for 'arm64' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index b8807e76a..597d474a6 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -132,7 +132,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch when /arm64/ - flags += %W() + flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes) when 'armeabi-v7a' flags += %W(-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ -- cgit v1.2.3 From abaad5c0d655579690e7f7852d89a47a9403ec5a Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:32:50 +0900 Subject: Some flags (-fpic and etc.) should be set by default for 'armeabi-v7a' and 'armeabi' architecture. --- tasks/toolchains/androidndk.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 597d474a6..686bf8d38 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -134,9 +134,9 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /arm64/ flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes) when 'armeabi-v7a' - flags += %W(-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) + flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ - flags += %W(-march=armv5te -mtune=xscale -msoft-float) + flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float) when /mips64/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) when /mips/ -- cgit v1.2.3 From b493c6bfde25ff799dc5c826b5418a94950571e6 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:34:42 +0900 Subject: Add support for 'armeabi-v7a-hard' architecture. --- tasks/toolchains/androidndk.rake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 686bf8d38..9552ec79b 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -133,6 +133,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter case arch when /arm64/ flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes) + when 'armeabi-v7a-hard' + flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16) when 'armeabi-v7a' flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ -- cgit v1.2.3 From 3458a83e89c4677b8caa6cb0c810b39aa5ba8a76 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:37:38 +0900 Subject: Some flags (-ffunction-sections and etc.) should be set by default for 'x86' architecture. --- tasks/toolchains/androidndk.rake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 9552ec79b..e0416a160 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -143,6 +143,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) + when /x86/ + flags += %W(-ffunction-sections -funwind-tables -no-canonical-prefixes) end when :clang end -- cgit v1.2.3 From 1ac5d3575374e3f664fc9cbb9eb410fe03cd6f79 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:40:59 +0900 Subject: Remove duplicated compiler options. --- tasks/toolchains/androidndk.rake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index e0416a160..1f2729796 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -128,23 +128,23 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter case toolchain when :gcc - flags += %W(-ffunction-sections -funwind-tables -fstack-protector) + flags += %W(-ffunction-sections -funwind-tables) flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch when /arm64/ - flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes) + flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes) when 'armeabi-v7a-hard' - flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16) + flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16) when 'armeabi-v7a' - flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) + flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ - flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float) + flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float) when /mips64/ - flags += %W(-fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) + flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) when /x86/ - flags += %W(-ffunction-sections -funwind-tables -no-canonical-prefixes) + flags += %W(-no-canonical-prefixes) end when :clang end -- cgit v1.2.3 From ad89fe63ae18599898bb8798fa42e169c5614e5d Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:45:34 +0900 Subject: Add support for 'x86_64' architecture. --- tasks/toolchains/androidndk.rake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 1f2729796..4abe7feb2 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -62,6 +62,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter 'mips64el-linux-android-*' when /mips/ 'mipsel-linux-android-*' + when /x86_64/ + 'x86_64-*' when /x86/ 'x86-*' end @@ -80,6 +82,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter case arch when /armeabi/ then 'arm-linux-androideabi-' when /arm64/ then 'aarch64-linux-android-' + when /x86_64/ then 'x86_64-' when /x86/ then 'x86-' when /mips64/ then 'mips64el-linux-android-' when /mips/ then 'mipsel-linux-android-' @@ -92,6 +95,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter path = case arch when /armeabi/ then 'arch-arm' when /arm64/ then 'arch-arm64' + when /x86_64/ then 'arch-x86_64' when /x86/ then 'arch-x86' when /mips64/ then 'arch-mips64' when /mips/ then 'arch-mips' @@ -107,6 +111,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter command = case arch when /armeabi/ then 'arm-linux-androideabi-' when /arm64/ then 'aarch64-linux-android-' + when /x86_64/ then 'x86_64-linux-android-' when /x86/ then 'i686-linux-android-' when /mips64/ then 'mips64el-linux-android-' when /mips/ then 'mipsel-linux-android-' @@ -143,6 +148,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) + when /x86_64/ + flags += %W(-fstack-protector-strong -no-canonical-prefixes) when /x86/ flags += %W(-no-canonical-prefixes) end -- cgit v1.2.3 From c38a27185ecd9c2dc48d7f8c5f68fb7914c6939d Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 16:46:19 +0900 Subject: Add a missing required flag '-fstack-protector-strong'. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 4abe7feb2..a78b36fc0 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -151,7 +151,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /x86_64/ flags += %W(-fstack-protector-strong -no-canonical-prefixes) when /x86/ - flags += %W(-no-canonical-prefixes) + flags += %W(-fstack-protector-strong -no-canonical-prefixes) end when :clang end -- cgit v1.2.3 From 07c35de3a664f9b415f411c0cdbe1a05d8db660f Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:08:46 +0900 Subject: Implement 'ldflags'. This is the first step of implementing 'ldflags'. --- tasks/toolchains/androidndk.rake | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index a78b36fc0..68cbbf173 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -164,7 +164,25 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter end def ldflags - %W(-D__android__ -mandroid --sysroot="#{sysroot}") + flags = [] + case toolchain + when :gcc + flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}") + case arch + when /arm64/ + flags += %W() #add required flags + when /armeabi/ + flags += %W() #add required flags + when /mips64/ + flags += %W() #add required flags + when /mips/ + flags += %W() #add required flags + when /x86_64/ + flags += %W() #add required flags + when /x86/ + flags += %W() #add required flags + end + end end def ar -- cgit v1.2.3 From c0d30ab6cd396c683e62b23d940d0239da5c318d Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:11:38 +0900 Subject: Implement 'ldflags' for 'arm64' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 68cbbf173..b44f8b463 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -170,7 +170,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch when /arm64/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) when /armeabi/ flags += %W() #add required flags when /mips64/ -- cgit v1.2.3 From 4a07b84d2cada821de00779bdee220134b5a8d6b Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:13:35 +0900 Subject: Implement 'ldflags' for 'armeabi' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index b44f8b463..4963ebccd 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -172,7 +172,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /arm64/ flags += %W(-no-canonical-prefixes) when /armeabi/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) when /mips64/ flags += %W() #add required flags when /mips/ -- cgit v1.2.3 From f5bc0cea20c178504688b8e797814308c5a0ada1 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:17:32 +0900 Subject: Implement 'ldflags' for 'armeabi-v7a-hard' and 'armeabi-v7a'. --- tasks/toolchains/androidndk.rake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 4963ebccd..2ab252d4c 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -171,6 +171,10 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter case arch when /arm64/ flags += %W(-no-canonical-prefixes) + when 'armeabi-v7a-hard' + flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) + when 'armeabi-v7a' + flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8) when /armeabi/ flags += %W(-no-canonical-prefixes) when /mips64/ -- cgit v1.2.3 From 2482642e09f33145d47212b4b51b2b763778b84e Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:21:48 +0900 Subject: Implement 'ldflags' for 'mips64' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 2ab252d4c..19694d9e3 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -178,7 +178,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /armeabi/ flags += %W(-no-canonical-prefixes) when /mips64/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) when /mips/ flags += %W() #add required flags when /x86_64/ -- cgit v1.2.3 From a106e5dc5a37e89fa65a25989dbc6e390e5995f8 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:22:39 +0900 Subject: Implement 'ldflags' for 'mips' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 19694d9e3..3f5e4602d 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -180,7 +180,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /mips64/ flags += %W(-no-canonical-prefixes) when /mips/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) when /x86_64/ flags += %W() #add required flags when /x86/ -- cgit v1.2.3 From 210f86f95cb185b15c6ece438b237baebeb68f36 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:23:39 +0900 Subject: Implement 'ldflags' for 'x86_64' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 3f5e4602d..fc1b9dd0e 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -182,7 +182,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /mips/ flags += %W(-no-canonical-prefixes) when /x86_64/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) when /x86/ flags += %W() #add required flags end -- cgit v1.2.3 From ad8a895af53c7e98d6c9d7dd9864b5bca364264c Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:24:47 +0900 Subject: Implement 'ldflags' for 'x86' architecture. --- tasks/toolchains/androidndk.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index fc1b9dd0e..2976e01ac 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -184,7 +184,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter when /x86_64/ flags += %W(-no-canonical-prefixes) when /x86/ - flags += %W() #add required flags + flags += %W(-no-canonical-prefixes) end end end -- cgit v1.2.3 From a2a5c34c56259d39395213943d79f734ca705ccb Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:25:48 +0900 Subject: Integrate common flag. --- tasks/toolchains/androidndk.rake | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 2976e01ac..3b613022a 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -167,24 +167,12 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags = [] case toolchain when :gcc - flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}") + flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}" -no-canonical-prefixes) case arch - when /arm64/ - flags += %W(-no-canonical-prefixes) when 'armeabi-v7a-hard' - flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) + flags += %W(-march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) when 'armeabi-v7a' - flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8) - when /armeabi/ - flags += %W(-no-canonical-prefixes) - when /mips64/ - flags += %W(-no-canonical-prefixes) - when /mips/ - flags += %W(-no-canonical-prefixes) - when /x86_64/ - flags += %W(-no-canonical-prefixes) - when /x86/ - flags += %W(-no-canonical-prefixes) + flags += %W(-march=armv7-a -Wl,--fix-cortex-a8) end end end -- cgit v1.2.3 From 61e4d1e6f0df8719595434d3472d0ecee03dc80a Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:33:40 +0900 Subject: Integrate common flag '-no-canonical-prefixes'. --- tasks/toolchains/androidndk.rake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 3b613022a..961aaa39c 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -133,25 +133,25 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter case toolchain when :gcc - flags += %W(-ffunction-sections -funwind-tables) + flags += %W(-ffunction-sections -funwind-tables -no-canonical-prefixes) flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch when /arm64/ - flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes) + flags += %W(-fpic -fstack-protector-strong) when 'armeabi-v7a-hard' - flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16) + flags += %W(-fpic -fstack-protector-strong -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16) when 'armeabi-v7a' - flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) + flags += %W(-fpic -fstack-protector-strong -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ - flags += %W(-fpic -fstack-protector-strong -no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float) + flags += %W(-fpic -fstack-protector-strong -march=armv5te -mtune=xscale -msoft-float) when /mips64/ - flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -no-canonical-prefixes) + flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) when /x86_64/ - flags += %W(-fstack-protector-strong -no-canonical-prefixes) + flags += %W(-fstack-protector-strong) when /x86/ - flags += %W(-fstack-protector-strong -no-canonical-prefixes) + flags += %W(-fstack-protector-strong) end when :clang end -- cgit v1.2.3 From 7b65f394e65df4564e219f225064a83355220023 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:35:36 +0900 Subject: Remove unnecessary cases. 'mips64' can integrate into 'mips'. 'x86_64' is the same as 'mips64'. --- tasks/toolchains/androidndk.rake | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 961aaa39c..1ffabc928 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -144,12 +144,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags += %W(-fpic -fstack-protector-strong -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16) when /arm/ flags += %W(-fpic -fstack-protector-strong -march=armv5te -mtune=xscale -msoft-float) - when /mips64/ - flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) when /mips/ flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers) - when /x86_64/ - flags += %W(-fstack-protector-strong) when /x86/ flags += %W(-fstack-protector-strong) end -- cgit v1.2.3 From 1a59721c69a71c2adbbb2e1ff8243c7694557bb0 Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:40:26 +0900 Subject: Accoding to the implementation of 'cflags', '-no-canonical-prefixes' is isolated. --- tasks/toolchains/androidndk.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tasks/toolchains') diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 1ffabc928..ccf1a0c4d 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -163,7 +163,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags = [] case toolchain when :gcc - flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}" -no-canonical-prefixes) + flags += %W(-no-canonical-prefixes) + flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}") case arch when 'armeabi-v7a-hard' flags += %W(-march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) -- cgit v1.2.3