diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 16:21:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 17:46:13 +0200 |
| commit | e2989c84005cbbc11359adbf310ea16432cbfbec (patch) | |
| tree | 15ca1f26cfdd20041a347f7517f1ae9536d9e719 /bridges | |
| parent | 555a66329271846c7a7391317f0167f133e0c5d6 (diff) | |
Let's try using the gcc3_linux_arm code for Android, too
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index c21fb7672bc3..21c335b3b824 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -39,7 +39,8 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) || defined(DRAGONFLY) + || defined(NETBSD) || defined(DRAGONFLY) \ + || defined(ANDROID) /* Not sure about Android, but let's see... */ #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk index 9048f2c3aba1..252479217458 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk @@ -39,7 +39,7 @@ NO_BSYMBOLIC=TRUE # --- Files -------------------------------------------------------- -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" +.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" || "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCANDROIDRgcc3" CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |