diff options
| author | Sven Gothel <[email protected]> | 2011-10-18 06:59:53 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-18 06:59:53 +0200 |
| commit | f818817f3c0b14fe8317eaf5e1e1fff0a19884d0 (patch) | |
| tree | 39c2af3e797664ff5cc68d1cf945526cf50fb801 | |
| parent | 24eefae081d08920989f123976e6754dc6d0793b (diff) | |
Android: Use NDK default gcc settings
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 21 | ||||
| -rw-r--r-- | test/native/cross-android-armv7-tst1/android.ndk.env-4.4.3-androideabi.armv7-a.sh | 1 |
2 files changed, 20 insertions, 2 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index f2ed4cf..e96036a 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -24,14 +24,31 @@ <compilerarg value="--sysroot=${env.TARGET_OS_PATH}" /> <!-- set root dir for lib and include --> <compilerarg value="-B" /> <!--add additional directory for search --> <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> - <compilerarg value="-march=armv7-a" /> - <compilerarg value="-fpic" /> + <!--compilerarg value="-march=armv7-a" /--> + <compilerarg value="-fpic" /> + <compilerarg value="-ffunction-sections" /> + <compilerarg value="-funwind-tables" /> + <compilerarg value="-fstack-protector" /> + <compilerarg value="-march=armv5te" /> + <compilerarg value="-mtune=xscale" /> + <compilerarg value="-msoft-float" /> + <compilerarg value="-mthumb" /> + <compilerarg value="-Os" /> + <compilerarg value="-fomit-frame-pointer" /> + <compilerarg value="-fno-strict-aliasing" /> + <compilerarg value="-finline-limit=64" /> + <compilerarg value="-Wa,--noexecstack" /> + <compilerarg value="-O2" /> <compilerarg value="-isystem" /> <compilerarg value="${env.TARGET_OS_PATH}/include"/> <compilerarg value="-isystem" /> <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--includes stdarg.h --> <defineset> <define name="__unix__"/> + <define name="__ARM_ARCH_5__" /> + <define name="__ARM_ARCH_5T__" /> + <define name="__ARM_ARCH_5E__" /> + <define name="__ARM_ARCH_5TE__" /> <define name="ANDROID" /> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> diff --git a/test/native/cross-android-armv7-tst1/android.ndk.env-4.4.3-androideabi.armv7-a.sh b/test/native/cross-android-armv7-tst1/android.ndk.env-4.4.3-androideabi.armv7-a.sh index 1db8b70..596b376 100644 --- a/test/native/cross-android-armv7-tst1/android.ndk.env-4.4.3-androideabi.armv7-a.sh +++ b/test/native/cross-android-armv7-tst1/android.ndk.env-4.4.3-androideabi.armv7-a.sh @@ -63,6 +63,7 @@ export NDK_INCLUDE="-I${TARGET_OS_PATH}/include" export NDK_CFLAGS="\ -march=${TARGET_CPU_NAME} \ +-mfloat-abi=${TARGET_FPU_ABI} -mfpu=${TARGET_FPU_NAME} \ -fpic \ -DANDROID \ " |