summaryrefslogtreecommitdiff
path: root/solenv/inc/unxandr.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-11-08 10:04:58 +0200
committerTor Lillqvist <tlillqvist@suse.com>2011-11-08 10:06:32 +0200
commit3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb (patch)
treefd7feaafceb20d8b501346b957088a374877c947 /solenv/inc/unxandr.mk
parent128f280839d15864ff4b6032702d6231d346116e (diff)
Just put the Android ARM compiler options in the mk files
Diffstat (limited to 'solenv/inc/unxandr.mk')
-rw-r--r--solenv/inc/unxandr.mk15
1 files changed, 10 insertions, 5 deletions
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
-