Remove obsolete/confusing options and fix strings.
Change-Id: I26b5eeea7ddc8cc4984745daa52635ea95ad7c66
diff --git a/Android.mk b/Android.mk
index 49e1a68..5b2b7eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -241,7 +241,7 @@
intermediates := $(call local-intermediates-dir)
LOCAL_GENERATED_SOURCES += $(intermediates)/RSCCOptions.inc
$(intermediates)/RSCCOptions.inc: $(LOCAL_PATH)/RSCCOptions.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(TBLGEN)
- @echo "Building RenderScript compiler (llvm-rs-cc) Option tables with tblgen"
+ @echo "Building Renderscript compiler (llvm-rs-cc) Option tables with tblgen"
$(call transform-host-td-to-out,opt-parser-defs)
include frameworks/compile/slang/RSSpec.mk
diff --git a/RSCCOptions.td b/RSCCOptions.td
index 00e5700..2dc6b20 100644
--- a/RSCCOptions.td
+++ b/RSCCOptions.td
@@ -27,16 +27,6 @@
// Target Options
//===----------------------------------------------------------------------===//
-def target_cpu : Separate<"-target-cpu">,
- HelpText<"Target a specific cpu type">;
-def _target_cpu : Flag<"-u">, Alias<target_cpu>;
-def target_feature : Separate<"-target-feature">,
- HelpText<"Target specific attributes">;
-def triple : Separate<"-triple">,
- HelpText<"Specify target triple (e.g. i686-apple-darwin9)">;
-def triple_EQ : Joined<"-triple=">, Alias<triple>;
-def _triple : Separate<"-t">, Alias<triple>;
-
def target_api : Separate<"-target-api">,
HelpText<"Specify target API level (e.g. 14)">;
def target_api_EQ : Joined<"-target-api=">, Alias<target_api>;
diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp
index be851d3..76c39c4 100644
--- a/llvm-rs-cc.cpp
+++ b/llvm-rs-cc.cpp
@@ -112,11 +112,10 @@
unsigned mAllowRSPrefix : 1;
- // If given, the name of the target triple to compile for. If not given the
- // target will be selected to match the host.
+ // The name of the target triple to compile for.
std::string mTriple;
- // If given, the name of the target CPU to generate code for.
+ // The name of the target CPU to generate code for.
std::string mCPU;
// The list of target specific features to enable or disable -- this should
@@ -142,6 +141,10 @@
RSCCOptions() {
mOutputType = slang::Slang::OT_Bitcode;
+ // Triple/CPU/Features must be hard-coded to our chosen portable ABI.
+ mTriple = "armv7-none-linux-gnueabi";
+ mCPU = "";
+ slangAssert(mFeatures.empty());
mBitcodeStorage = slang::BCST_APK_RESOURCE;
mOutputDep = 0;
mShowHelp = 0;
@@ -236,11 +239,6 @@
Opts.mAllowRSPrefix = Args->hasArg(OPT_allow_rs_prefix);
- Opts.mTriple = Args->getLastArgValue(OPT_triple,
- "armv7-none-linux-gnueabi");
- Opts.mCPU = Args->getLastArgValue(OPT_target_cpu);
- Opts.mFeatures = Args->getAllArgValues(OPT_target_feature);
-
Opts.mJavaReflectionPathBase =
Args->getLastArgValue(OPT_java_reflection_path_base);
Opts.mJavaReflectionPackageName =
@@ -361,7 +359,7 @@
if (Opts.mShowHelp) {
llvm::OwningPtr<OptTable> OptTbl(createRSCCOptTable());
OptTbl->PrintHelp(llvm::outs(), Argv0.c_str(),
- "RenderScript source compiler");
+ "Renderscript source compiler");
return 0;
}
diff --git a/llvm-rs-link.cpp b/llvm-rs-link.cpp
index 667af81..29b41ac 100644
--- a/llvm-rs-link.cpp
+++ b/llvm-rs-link.cpp
@@ -74,7 +74,7 @@
if (V->getNumOperands() < (NameOpIdx + 1)) {
errs() << "Invalid metadata spec of " << N->getName()
- << " in RenderScript executable. (#op)\n";
+ << " in Renderscript executable. (#op)\n";
return false;
}
@@ -82,7 +82,7 @@
llvm::dyn_cast<llvm::MDString>(V->getOperand(NameOpIdx));
if (Name == NULL) {
errs() << "Invalid metadata spec of " << N->getName()
- << " in RenderScript executable. (#name)\n";
+ << " in Renderscript executable. (#name)\n";
return false;
}
diff --git a/slang_rs.h b/slang_rs.h
index 323bfaa..1099496 100644
--- a/slang_rs.h
+++ b/slang_rs.h
@@ -39,7 +39,7 @@
class SlangRS : public Slang {
private:
- // Context for RenderScript
+ // Context for Renderscript
RSContext *mRSContext;
bool mAllowRSPrefix;
diff --git a/slang_rs_reflect_utils.cpp b/slang_rs_reflect_utils.cpp
index 3298026..29c3998 100644
--- a/slang_rs_reflect_utils.cpp
+++ b/slang_rs_reflect_utils.cpp
@@ -107,7 +107,7 @@
const RSSlangReflectUtils::BitCodeAccessorContext &context, FILE *pfout) {
fprintf(pfout, "/*\n");
fprintf(pfout, " * This file is auto-generated. DO NOT MODIFY!\n");
- fprintf(pfout, " * The source RenderScript file: %s\n", context.rsFileName);
+ fprintf(pfout, " * The source Renderscript file: %s\n", context.rsFileName);
fprintf(pfout, " */\n\n");
fprintf(pfout, "package %s;\n\n", context.packageName);
diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index a5ae046..5266c1b 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -2227,7 +2227,7 @@
"\n";
const char *const RSReflection::Context::Import[] = {
- // RenderScript java class
+ // Renderscript java class
"android.renderscript.*",
// Import R
"android.content.res.Resources",
@@ -2285,7 +2285,7 @@
// Notice of generated file
out() << "/*" << std::endl;
out() << " * This file is auto-generated. DO NOT MODIFY!" << std::endl;
- out() << " * The source RenderScript file: " << mInputRSFile << std::endl;
+ out() << " * The source Renderscript file: " << mInputRSFile << std::endl;
out() << " */" << std::endl;
// Package