Merge "Check in bionicbb code."
diff --git a/README.md b/README.md
index a031fbc..5e9587d 100644
--- a/README.md
+++ b/README.md
@@ -256,3 +256,20 @@
$ genhtml -o covreport coverage.info # or lcov --list coverage.info
The coverage report is now available at `covreport/index.html`.
+
+
+LP32 ABI bugs
+-------------
+
+This probably belongs in the NDK documentation rather than here, but these
+are the known ABI bugs in LP32:
+
+ * time_t is 32-bit. http://b/5819737
+
+ * off_t is 32-bit. There is off64_t, but no _FILE_OFFSET_BITS support.
+ Many of the off64_t functions are missing in older releases, and
+ stdio uses 32-bit offsets, so there's no way to fully implement
+ _FILE_OFFSET_BITS.
+
+ * sigset_t is too small on ARM and x86 (but correct on MIPS), so support
+ for real-time signals is broken. http://b/5828899
diff --git a/linker/Android.mk b/linker/Android.mk
index 0383e7b..d6e0095 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -19,13 +19,6 @@
LOCAL_SRC_FILES_mips := arch/mips/begin.S
LOCAL_SRC_FILES_mips64 := arch/mips64/begin.S
-# GNU assembler aborted with clang's output for linker.cpp:
-# Assertion failure in get_line_subseg at
-# /s/ndk-toolchain/src/build/../binutils/binutils-2.24/gas/dwarf2dbg.c line 271.
-ifeq ($(TARGET_ARCH),mips)
- LOCAL_CLANG_CFLAGS += -integrated-as
-endif
-
LOCAL_LDFLAGS := \
-shared \
-Wl,-Bsymbolic \