Change NaCl-specific tests from llc to pnacl-llc

BUG=None
R=dschuff@chromium.org

Review URL: https://codereview.chromium.org/16273014

27 files changed, 41 insertions, 40 deletions

diff --git a/test/NaCl/ARM/blx-sandboxing.ll b/test/NaCl/ARM/blx-sandboxing.ll
index 441bcac6ae..f7f154a82f 100644
--- a/test/NaCl/ARM/blx-sandboxing.ll
+++ b/test/NaCl/ARM/blx-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define i32 @foobar(i32 %aa, i32 %bb, i32 (i32)* %f) nounwind {
diff --git a/test/NaCl/ARM/bx-sandboxing.ll b/test/NaCl/ARM/bx-sandboxing.ll
index dcb259ad6c..199f5a418d 100644
--- a/test/NaCl/ARM/bx-sandboxing.ll
+++ b/test/NaCl/ARM/bx-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define i32 @foo() nounwind {
diff --git a/test/NaCl/ARM/call-return-sandboxing1.ll b/test/NaCl/ARM/call-return-sandboxing1.ll
index a70d0cd49d..06207075f5 100644
--- a/test/NaCl/ARM/call-return-sandboxing1.ll
+++ b/test/NaCl/ARM/call-return-sandboxing1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define i32 @foo(i32 %aa, i32 %bb) nounwind {
diff --git a/test/NaCl/ARM/divrem-guards.ll b/test/NaCl/ARM/divrem-guards.ll
index 822ae848d4..574517f0cd 100644
--- a/test/NaCl/ARM/divrem-guards.ll
+++ b/test/NaCl/ARM/divrem-guards.ll
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -insert-divide-check -S | FileCheck -check-prefix=OPT %s
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-branch -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 -mattr=+nacl-trap - \
 ; RUN:  | FileCheck -check-prefix=ARM %s
 
diff --git a/test/NaCl/ARM/intrinsics-bitmanip.ll b/test/NaCl/ARM/intrinsics-bitmanip.ll
index fc201269b3..2bbe0c6830 100644
--- a/test/NaCl/ARM/intrinsics-bitmanip.ll
+++ b/test/NaCl/ARM/intrinsics-bitmanip.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -filetype=asm %s -o - | FileCheck %s
-; RUN: llc -mtriple=armv7-unknown-nacl -O0 -filetype=asm %s -o - | FileCheck %s
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -filetype=asm %s -o - | FileCheck %s
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -O0 -filetype=asm %s -o - | FileCheck %s
 
 ; Test that various bit manipulation intrinsics are supported by the
 ; NaCl ARM backend.
diff --git a/test/NaCl/ARM/nacl-read-tp-intrinsic.ll b/test/NaCl/ARM/nacl-read-tp-intrinsic.ll
index 1050b902ed..f88f665f36 100644
--- a/test/NaCl/ARM/nacl-read-tp-intrinsic.ll
+++ b/test/NaCl/ARM/nacl-read-tp-intrinsic.ll
@@ -1,8 +1,8 @@
 
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=asm %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=asm %s -o - \
 ; RUN:   | FileCheck -check-prefix=ARM %s
 
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=asm -mtls-use-call %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=asm -mtls-use-call %s -o - \
 ; RUN:   | FileCheck -check-prefix=ARM_IRT %s
 
 
diff --git a/test/NaCl/ARM/nacl-setlongjmp-intrinsics.ll b/test/NaCl/ARM/nacl-setlongjmp-intrinsics.ll
index e0854db4ff..9d24037560 100644
--- a/test/NaCl/ARM/nacl-setlongjmp-intrinsics.ll
+++ b/test/NaCl/ARM/nacl-setlongjmp-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=arm-unknown-nacl -filetype=asm %s -o - \
+; RUN: pnacl-llc -mtriple=arm-unknown-nacl -filetype=asm %s -o - \
 ; RUN:  | FileCheck %s --check-prefix=ARM
 ; Test that @llvm.nacl.{set|long}jmp intrinsics calls get translated to library
 ; calls as expected.
diff --git a/test/NaCl/ARM/neon-vld1-sandboxing.ll b/test/NaCl/ARM/neon-vld1-sandboxing.ll
index 9ae7990371..f5b94d02d6 100644
--- a/test/NaCl/ARM/neon-vld1-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vld1-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-load -sfi-store -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-load -sfi-store -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define <8 x i8> @vld1i8(i8* %A) nounwind {
diff --git a/test/NaCl/ARM/neon-vld2-sandboxing.ll b/test/NaCl/ARM/neon-vld2-sandboxing.ll
index 788fdb55da..0d96f0d9c7 100644
--- a/test/NaCl/ARM/neon-vld2-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vld2-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-load -sfi-store -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-load -sfi-store -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 %struct.__neon_int8x8x2_t = type { <8 x i8>,  <8 x i8> }
diff --git a/test/NaCl/ARM/neon-vld3-sandboxing.ll b/test/NaCl/ARM/neon-vld3-sandboxing.ll
index 5658b33d89..2da916b28e 100644
--- a/test/NaCl/ARM/neon-vld3-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vld3-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 %struct.__neon_int8x8x3_t = type { <8 x i8>,  <8 x i8>,  <8 x i8> }
diff --git a/test/NaCl/ARM/neon-vld4-sandboxing.ll b/test/NaCl/ARM/neon-vld4-sandboxing.ll
index 74b0aafc7e..d888a99165 100644
--- a/test/NaCl/ARM/neon-vld4-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vld4-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 %struct.__neon_int8x8x4_t = type { <8 x i8>,  <8 x i8>,  <8 x i8>, <8 x i8> }
diff --git a/test/NaCl/ARM/neon-vlddup-sandboxing.ll b/test/NaCl/ARM/neon-vlddup-sandboxing.ll
index 0ce51ad8cc..187efedbb0 100644
--- a/test/NaCl/ARM/neon-vlddup-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vlddup-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 %struct.__neon_int8x8x2_t = type { <8 x i8>, <8 x i8> }
diff --git a/test/NaCl/ARM/neon-vldlane-sandboxing.ll b/test/NaCl/ARM/neon-vldlane-sandboxing.ll
index 9c890c7a61..b7f1097237 100644
--- a/test/NaCl/ARM/neon-vldlane-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vldlane-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 %struct.__neon_int8x8x2_t = type { <8 x i8>,  <8 x i8> }
diff --git a/test/NaCl/ARM/neon-vst1-sandboxing.ll b/test/NaCl/ARM/neon-vst1-sandboxing.ll
index 361b8668a9..e496aa492a 100644
--- a/test/NaCl/ARM/neon-vst1-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vst1-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst1i8(i8* %A, <8 x i8>* %B) nounwind {
diff --git a/test/NaCl/ARM/neon-vst2-sandboxing.ll b/test/NaCl/ARM/neon-vst2-sandboxing.ll
index 155994abf8..cfb1a11b5c 100644
--- a/test/NaCl/ARM/neon-vst2-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vst2-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst2i8(i8* %A, <8 x i8>* %B) nounwind {
diff --git a/test/NaCl/ARM/neon-vst3-sandboxing.ll b/test/NaCl/ARM/neon-vst3-sandboxing.ll
index 1f6b641039..178387c806 100644
--- a/test/NaCl/ARM/neon-vst3-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vst3-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst3i8(i8* %A, <8 x i8>* %B) nounwind {
diff --git a/test/NaCl/ARM/neon-vst4-sandboxing.ll b/test/NaCl/ARM/neon-vst4-sandboxing.ll
index e672d6e09d..685de398dc 100644
--- a/test/NaCl/ARM/neon-vst4-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vst4-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst4i8(i8* %A, <8 x i8>* %B) nounwind {
diff --git a/test/NaCl/ARM/neon-vstlane-sandboxing.ll b/test/NaCl/ARM/neon-vstlane-sandboxing.ll
index d8a004b6af..d136659fea 100644
--- a/test/NaCl/ARM/neon-vstlane-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vstlane-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -mattr=+neon -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @vst1lanei8(i8* %A, <8 x i8>* %B) nounwind {
diff --git a/test/NaCl/ARM/simple-load-store_sandboxing1.ll b/test/NaCl/ARM/simple-load-store_sandboxing1.ll
index 417bb1f389..ccf1a50d54 100644
--- a/test/NaCl/ARM/simple-load-store_sandboxing1.ll
+++ b/test/NaCl/ARM/simple-load-store_sandboxing1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-store -sfi-load -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-store -sfi-load -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @foo(i32* %input, i32* %output) nounwind {
diff --git a/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll b/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
index a8b3cf1c16..15aff8d16d 100644
--- a/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
+++ b/test/NaCl/ARM/sp-arithmetic-sandboxing1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-store -sfi-load -sfi-stack -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-store -sfi-load -sfi-stack -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @foo(i32* %input, i32* %output) nounwind {
diff --git a/test/NaCl/ARM/stack-change-sandboxing.ll b/test/NaCl/ARM/stack-change-sandboxing.ll
index 30a72a4ca1..ca6dc2f653 100644
--- a/test/NaCl/ARM/stack-change-sandboxing.ll
+++ b/test/NaCl/ARM/stack-change-sandboxing.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-stack -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-stack -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define i32 @foo(i32 %aa, i32 %bb) nounwind {
diff --git a/test/NaCl/ARM/vstr-sandboxing1.ll b/test/NaCl/ARM/vstr-sandboxing1.ll
index 6646cbc717..ef9f98397f 100644
--- a/test/NaCl/ARM/vstr-sandboxing1.ll
+++ b/test/NaCl/ARM/vstr-sandboxing1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=obj %s -o - \
+; RUN: pnacl-llc -mtriple=armv7-unknown-nacl -sfi-store -filetype=obj %s -o - \
 ; RUN:  | llvm-objdump -disassemble -triple armv7 - | FileCheck %s
 
 define void @test_vstr_sandbox(<8 x i8>* %ptr) nounwind {
diff --git a/test/NaCl/X86/intrinsics-bitmanip.ll b/test/NaCl/X86/intrinsics-bitmanip.ll
index bab38811b0..ff20ec9b38 100644
--- a/test/NaCl/X86/intrinsics-bitmanip.ll
+++ b/test/NaCl/X86/intrinsics-bitmanip.ll
@@ -1,10 +1,10 @@
-; RUN: llc -mtriple=i686-unknown-nacl -O0 -filetype=asm %s -o - | FileCheck %s \
-; RUN:   --check-prefix=NACL32
-; RUN: llc -mtriple=i686-unknown-nacl -filetype=asm %s -o - | FileCheck %s \
-; RUN:   --check-prefix=NACL32
-; RUN: llc -mtriple=x86_64-unknown-nacl -O0 -filetype=asm %s -o - | \
+; RUN: pnacl-llc -mtriple=i686-unknown-nacl -O0 -filetype=asm %s -o - | \
+; RUN:   FileCheck %s --check-prefix=NACL32
+; RUN: pnacl-llc -mtriple=i686-unknown-nacl -filetype=asm %s -o - | \
+; RUN:   FileCheck %s --check-prefix=NACL32
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -O0 -filetype=asm %s -o - | \
 ; RUN:   FileCheck %s --check-prefix=NACL64
-; RUN: llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -o - | \
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -o - | \
 ; RUN:   FileCheck %s --check-prefix=NACL64
 
 ; Test that various bit manipulation intrinsics are supported by the
diff --git a/test/NaCl/X86/nacl-read-tp-intrinsic.ll b/test/NaCl/X86/nacl-read-tp-intrinsic.ll
index 2779f1b1e1..91a957b4c4 100644
--- a/test/NaCl/X86/nacl-read-tp-intrinsic.ll
+++ b/test/NaCl/X86/nacl-read-tp-intrinsic.ll
@@ -1,15 +1,14 @@
-
-; RUN: llc -mtriple=i386-unknown-nacl -filetype=asm %s -o - \
+; RUN: pnacl-llc -mtriple=i386-unknown-nacl -filetype=asm %s -o - \
 ; RUN:   | FileCheck -check-prefix=X32 %s
 
-; RUN: llc -mtriple=i386-unknown-nacl -filetype=asm -mtls-use-call %s -o - \
+; RUN: pnacl-llc -mtriple=i386-unknown-nacl -filetype=asm -mtls-use-call %s -o - \
 ; RUN:   | FileCheck -check-prefix=USE_CALL %s
 
-; RUN: llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -o - \
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -o - \
 ; RUN:   | FileCheck -check-prefix=USE_CALL %s
 
 ; "-mtls-use-call" should not make any difference on x86-64.
-; RUN: llc -mtriple=x86_64-unknown-nacl -filetype=asm -mtls-use-call %s -o - \
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -filetype=asm -mtls-use-call %s -o - \
 ; RUN:   | FileCheck -check-prefix=USE_CALL %s
 
 
diff --git a/test/NaCl/X86/nacl-setlongjmp-intrinsics.ll b/test/NaCl/X86/nacl-setlongjmp-intrinsics.ll
index ac595d613a..b98297b021 100644
--- a/test/NaCl/X86/nacl-setlongjmp-intrinsics.ll
+++ b/test/NaCl/X86/nacl-setlongjmp-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=i386-unknown-nacl -filetype=asm %s -o - \
+; RUN: pnacl-llc -mtriple=i386-unknown-nacl -filetype=asm %s -o - \
 ; RUN:  | FileCheck %s --check-prefix=X86
 ; Test that @llvm.nacl.{set|long}jmp intrinsics calls get translated to library
 ; calls as expected.
diff --git a/test/NaCl/X86/nacl64-addrmodes.ll b/test/NaCl/X86/nacl64-addrmodes.ll
index fa528a5740..9384f1910b 100644
--- a/test/NaCl/X86/nacl64-addrmodes.ll
+++ b/test/NaCl/X86/nacl64-addrmodes.ll
@@ -1,7 +1,7 @@
-; RUN: llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -O0 -o - \
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -O0 -o - \
 ; RUN:   | FileCheck %s
 
-; RUN: llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -O2 -o - \
+; RUN: pnacl-llc -mtriple=x86_64-unknown-nacl -filetype=asm %s -O2 -o - \
 ; RUN:   | FileCheck %s
 
 ; Check that we don't try to fold a negative displacement into a memory
@@ -128,4 +128,4 @@ entry:
   ret i1 0
 }
 
-declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind
\ No newline at end of file
+declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind
diff --git a/test/lit.cfg b/test/lit.cfg
index 128bbe927a..1100b2f0cc 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -196,7 +196,9 @@ else:
     pathext = ['']
 for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
                 r"\bgold\b",
-                r"\bllc\b",             r"\blli\b",
+                # LOCALMOD - match pnacl-llc
+                r"\bpnacl-llc\b",
+                r"(?<!-)\bllc\b",       r"\blli\b",
                 r"\bllvm-ar\b",         r"\bllvm-as\b",
                 r"\bllvm-bcanalyzer\b", r"\bllvm-config\b",
                 r"\bllvm-cov\b",        r"\bllvm-diff\b",