Merge SP1A.200727.001
Change-Id: Icea43d7e59a375c2e25ad48dd7c5b55529fbb9e7
diff --git a/Android.bp b/Android.bp
index 28f1b8a..56e22a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,12 +87,6 @@
"-DDISABLE_CLCORE_NEON",
],
},
- mips: {
- cflags: ["-DFORCE_MIPS_CODEGEN"],
- },
- mips64: {
- cflags: ["-DFORCE_MIPS64_CODEGEN"],
- },
},
target: {
android_x86: {
diff --git a/README.html b/README.html
index c4b9653..1cc5908 100644
--- a/README.html
+++ b/README.html
@@ -317,9 +317,9 @@
<li>Android devices demand fast start-up time, small size, and high
performance <em>at the same time</em>. libbcc attempts to address these
design constraints.</li>
-<li>it supports on-device linking. Each device vendor can supply his or
-her own runtime bitcode library (lib*.bc) that differentiates his or
-her system. Specialization becomes ecosystem-friendly.</li>
+<li>it supports on-device linking. Each device vendor can supply their
+own runtime bitcode library (lib*.bc) that differentiates their
+system. Specialization becomes ecosystem-friendly.</li>
</ul>
<p>libbcc provides:</p>
<ul class="simple">
diff --git a/README.rst b/README.rst
index a6db1f1..f81eaa7 100644
--- a/README.rst
+++ b/README.rst
@@ -16,9 +16,9 @@
performance *at the same time*. libbcc attempts to address these
design constraints.
-* it supports on-device linking. Each device vendor can supply his or
- her own runtime bitcode library (lib*.bc) that differentiates his or
- her system. Specialization becomes ecosystem-friendly.
+* it supports on-device linking. Each device vendor can supply their
+ own runtime bitcode library (lib*.bc) that differentiates their
+ system. Specialization becomes ecosystem-friendly.
libbcc provides:
diff --git a/lib/Source.cpp b/lib/Source.cpp
index d99eb10..63c4a5a 100644
--- a/lib/Source.cpp
+++ b/lib/Source.cpp
@@ -45,11 +45,12 @@
// return nullptr and will NOT take the ownership of pInput.
static inline std::unique_ptr<llvm::Module> helper_load_bitcode(llvm::LLVMContext &pContext,
std::unique_ptr<llvm::MemoryBuffer> &&pInput) {
+ auto bufferId = pInput->getBufferIdentifier();
llvm::ErrorOr<std::unique_ptr<llvm::Module> > moduleOrError
= llvm::getLazyBitcodeModule(std::move(pInput), pContext);
if (std::error_code ec = moduleOrError.getError()) {
ALOGE("Unable to parse the given bitcode file `%s'! (%s)",
- pInput->getBufferIdentifier(), ec.message().c_str());
+ bufferId, ec.message().c_str());
}
return std::move(moduleOrError.get());
diff --git a/libbcc-targets.mk b/libbcc-targets.mk
index 7bb2384..eaf636d 100644
--- a/libbcc-targets.mk
+++ b/libbcc-targets.mk
@@ -29,8 +29,6 @@
endif
LOCAL_CFLAGS_arm64 += -DFORCE_ARM64_CODEGEN -DARCH_ARM_HAVE_NEON -DARCH_ARM_HAVE_VFP -DARCH_ARM_HAVE_VFP_D32 -DDISABLE_CLCORE_NEON
-LOCAL_CFLAGS_mips += -DFORCE_MIPS_CODEGEN
-LOCAL_CFLAGS_mips64 += -DFORCE_MIPS64_CODEGEN
LOCAL_CFLAGS_x86 += -DFORCE_X86_CODEGEN
LOCAL_CFLAGS_x86_64 += -DFORCE_X86_64_CODEGEN
@@ -41,7 +39,7 @@
endif
-ifeq (,$(filter $(TARGET_ARCH),arm64 arm mips mips64 x86 x86_64))
+ifeq (,$(filter $(TARGET_ARCH),arm64 arm x86 x86_64))
$(error Unsupported architecture $(TARGET_ARCH))
endif