aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2016-03-06 23:05:45 -0800
committerPirama Arumuga Nainar <pirama@google.com>2016-03-17 11:16:19 -0700
commitf229c40f0d2da19985e68955aef1a06ce4121e63 (patch)
tree159f83720b06f009c56918a33993c5ef3d0a2ff5 /tools
parentfe4bd2604dfde18c905597d36ae541291cfb1bb8 (diff)
downloadlibbcc-f229c40f0d2da19985e68955aef1a06ce4121e63.tar.gz
Update libbcc for LLVM rebase to r256229
http://b/26987366 Change-Id: Ib5459acda9c4e612948290d0f68456dd4dc414af
Diffstat (limited to 'tools')
-rw-r--r--tools/bcc/Main.cpp2
-rw-r--r--tools/bcc_compat/Main.cpp3
-rw-r--r--tools/bcc_strip_attr/Android.mk1
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/bcc/Main.cpp b/tools/bcc/Main.cpp
index 37da1bc..941b49c 100644
--- a/tools/bcc/Main.cpp
+++ b/tools/bcc/Main.cpp
@@ -348,7 +348,7 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
- RSScript *s = new (std::nothrow) RSScript(*source, RSCD.getConfig());
+ std::unique_ptr<RSScript> s(new (std::nothrow) RSScript(*source, RSCD.getConfig()));
if (s == nullptr) {
llvm::errs() << "Out of memory when creating script for file `"
<< OptInputFilenames[0] << "'!\n";
diff --git a/tools/bcc_compat/Main.cpp b/tools/bcc_compat/Main.cpp
index b55b92b..79b0f70 100644
--- a/tools/bcc_compat/Main.cpp
+++ b/tools/bcc_compat/Main.cpp
@@ -274,8 +274,7 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
- RSScript *s = nullptr;
- s = PrepareRSScript(context, OptInputFilenames);
+ std::unique_ptr<RSScript> s(PrepareRSScript(context, OptInputFilenames));
if (!rscd.buildForCompatLib(*s, OutputFilename.c_str(), nullptr, OptRuntimePath.c_str(), false)) {
fprintf(stderr, "Failed to compile script!");
return EXIT_FAILURE;
diff --git a/tools/bcc_strip_attr/Android.mk b/tools/bcc_strip_attr/Android.mk
index b83a5e0..1158f4e 100644
--- a/tools/bcc_strip_attr/Android.mk
+++ b/tools/bcc_strip_attr/Android.mk
@@ -35,4 +35,5 @@ LOCAL_SRC_FILES := bcc_strip_attr.cpp
include $(LIBBCC_HOST_BUILD_MK)
include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
include $(BUILD_HOST_EXECUTABLE)