Merge "Post-release doc fixes; Fixed a test"
diff --git a/docs/ANDROID-MK.html b/docs/ANDROID-MK.html
index accc01f..66f10a8 100644
--- a/docs/ANDROID-MK.html
+++ b/docs/ANDROID-MK.html
@@ -229,12 +229,19 @@
TARGET_ARCH_ABI
Name of the target CPU+ABI when this Android.mk is parsed.
- Two values are supported at the moment:
+ Four values are supported at the moment:
armeabi
For ARMv5TE
armeabi-v7a
+ For ARMv7
+
+ x86
+ For i686
+
+ mips
+ For mips-r1
NOTE: Up to Android NDK 1.6_r1, this variable was simply defined
as 'arm'. However, the value has been redefined to better
diff --git a/docs/CHANGES.html b/docs/CHANGES.html
index 2273f35..dd55a30 100644
--- a/docs/CHANGES.html
+++ b/docs/CHANGES.html
@@ -40,12 +40,6 @@
This feature is experimental now but welcome to try and report issues.
Please find project page: https://code.google.com/p/mclinker/
-- Enabled OpenMP for GCC 4.4.3/4.6/4.7: Add the following flags
- LOCAL_CFLAGS += -fopenmp
- LOCAL_LDFLAGS += -fopenmp
-
- Please find examples in tests/device/test-openmp
-
- ndk-build now uses topological sort for module dependencies, ie.
it automatically sorts out the order of libraries specified in
LOCAL_STATIC_LIBRARIES, LOCAL_WHOLE_STATIC_LIBRARIES and
@@ -67,6 +61,7 @@
See http://b.android.com/52732
- Fixed GCC/ARM 4.6/4.7 fails to link code using 64-bit atomic built-in
+ functions
See http://b.android.com/41297
- Fixed GCC 4.7 linker error reads like
@@ -218,7 +213,7 @@
- Gabi++ and STLport static libraries are now built with hidden
visibility except for EH helpers
-- STLport in ARM is now built with thumb
+- STLport in ARM is now built in thumb mode
- Added support for std::set_new_handler in Gabi++
See http://b.android.com/52805
@@ -232,7 +227,7 @@
- Removed __ARM_ARCH_5*__ from ARM toolchains/*/setup.mk
See http://b.android.com/21132
-- Built additional GNU libstdc++ libaries in thumb for ARM
+- Built additional GNU libstdc++ libaries in thumb mode for ARM
- Enabled MIPS floating-point madd/msub/nmadd/nmsub/recip/rsqrt
instructions with 32-bit FPU
diff --git a/tests/build/flto/jni/Android.mk b/tests/build/flto/jni/Android.mk
index 104076b..a9920c8 100644
--- a/tests/build/flto/jni/Android.mk
+++ b/tests/build/flto/jni/Android.mk
@@ -6,7 +6,7 @@
FLTO_FLAG := -flto
ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),)
-ifeq ($(TARGET_ARCH),mips)
+ifeq ($(TARGET_ARCH_ABI),mips)
# clang does LTO via gold plugin, but gold doesn't support MIPS yet
FLTO_FLAG :=
endif
