diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-05 19:06:51 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-05 19:23:45 +0800 |
| commit | 5297f237f2d5e40967dcfe19bfd11639b0e7223f (patch) | |
| tree | 7bfb5332f45f98129f729e37cd1d6d96347d264b /tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk | |
| parent | ce90c072c2d13e840ff2aaedf4b235b64b0c1d6c (diff) | |
| download | ndk-5297f237f2d5e40967dcfe19bfd11639b0e7223f.tar.gz | |
misc fixes in r10d
1. Remove hack for server where android-13,15,17 were missing
2. Remove --disable-libquadmath
3. Fixed build-gnu-libstdc++.sh thumb build where
"-ffunction-sections -fdata-sections" were dropped
4. Fixed llvm clang3.5/windows build where mingw-64 complains about -fPIC
5. Fixed bashism in make-standalone-toolchain.sh
6. Fixed "package-release.sh --separate-64"
7. Relaxed patch-sources.sh against non-existance patch directory
8. Refresh build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch
9. Fixed warning about unused vars in cpu-features.c
10. Fixed sources/android/support/Android.mk about -fvisibility-inlines-hidden
is only foo C++
11. Fixed tests/build/check-armeabi-v7a-prebuilts/build.sh on MacOSX 10.6.8
12. Fixed tests/build/issue64679-prctl/build.sh to include GLES2/gl2ext.h
which can be compiled alone now
13. Excluded tests/device/b8708181-Vector4/jni/Vector4.cpp from clang3.4
14. Removed some comments in tests/device/test-libc++-*-full/jni/Android.mk
15. misc run-test.sh fixes
16. Disable integrated-as for clang in tests/build/issue79115-confusing-ld.gold-warning
Change-Id: I0afb2c00642dd61d81fd4842532d1b3c4029655b
Diffstat (limited to 'tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk')
| -rw-r--r-- | tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk index eaf4706cb..5e144ea7f 100644 --- a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk +++ b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk @@ -5,4 +5,10 @@ LOCAL_MODULE := issue79115-confusing-ld.gold-warning LOCAL_SRC_FILES := issue79115-confusing-ld.gold-warning.c LOCAL_DISABLE_NO_EXECUTE := true LOCAL_LDFLAGS += -Wl,--fatal-warnings + +ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),) +# Disable integrated assembler because -Wa,--execstack isn't supported +LOCAL_CFLAGS += -fno-integrated-as +endif + include $(BUILD_EXECUTABLE) |