diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 7 | ||||
| -rw-r--r-- | solenv/inc/unxandr.mk | 15 |
2 files changed, 15 insertions, 7 deletions
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 - |