diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-08 10:04:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-08 10:06:32 +0200 |
| commit | 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb (patch) | |
| tree | fd7feaafceb20d8b501346b957088a374877c947 | |
| parent | These are no longer needed. (diff) | |
| download | core-3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb.tar.gz core-3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb.zip | |
Just put the Android ARM compiler options in the mk files
| -rw-r--r-- | README.cross | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 7 | ||||
| -rw-r--r-- | solenv/inc/unxandr.mk | 15 |
3 files changed, 17 insertions, 9 deletions
diff --git a/README.cross b/README.cross index 7e8c184de3ab..6327ea884a9f 100644 --- a/README.cross +++ b/README.cross @@ -318,8 +318,8 @@ Windows will probably drive you insane.) Here is my autogen.lastrun for Android: SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti +CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm +CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 03f85ec49712..ba5110937740 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -31,11 +31,14 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_CPUDEFS += -DARM32 gb_COMPILERDEFAULTOPTFLAGS := -Os -gb_CXXFLAGS += -fno-omit-frame-pointer -gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/unxgcc.mk +# See <ndk>/docs/STANDALONE-TOOLCHAIN.html +gb_LinkTarget_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer +gb_LinkTarget_CXXFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer +gb_LinkTarget_LDFLAGS += -Wl,--fix-cortex-a8 + # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index 56ed49d155a4..fdf9b6d77e9d 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -29,10 +29,18 @@ CDEFAULTOPT=-Os .INCLUDE : unxgcc.mk + +# Amend some macros set by unxgcc.mk + CDEFS+=-DARM32 -CFLAGS+=-fno-omit-frame-pointer +CFLAGS+=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer + +LINKFLAGS+=-Wl,--fix-cortex-a8 -# Override some macros set by unxgcc.mk +STDLIBGUIMT+=-llog -landroid +STDLIBCUIMT+=-llog -landroid + +# Completely override some others # We don't build any "tool" style programs for non-desktop OSes like # Android. Just unit tests and GUI programs. (Well, that is in @@ -45,6 +53,3 @@ CFLAGS+=-fno-omit-frame-pointer LINKFLAGSAPPGUI=-shared LINKFLAGSAPPCUI=-shared -STDLIBGUIMT+=-llog -landroid -STDLIBCUIMT+=-llog -landroid - |