--- a/components/llvm/llvm.p5m	Fri Jan 27 16:34:13 2017 -0800
+++ b/components/llvm/llvm.p5m	Wed Mar 08 22:04:29 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -39,46 +39,47 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/bin/$(MACH64)/bugpoint path=usr/bin/bugpoint
-file usr/bin/$(MACH64)/llc path=usr/bin/llc
-file usr/bin/$(MACH64)/lli path=usr/bin/lli
-file usr/bin/$(MACH64)/llvm-ar path=usr/bin/llvm-ar
-file usr/bin/$(MACH64)/llvm-as path=usr/bin/llvm-as
-file usr/bin/$(MACH64)/llvm-bcanalyzer path=usr/bin/llvm-bcanalyzer
-file usr/bin/$(MACH64)/llvm-c-test path=usr/bin/llvm-c-test
-file usr/bin/$(MACH64)/llvm-config path=usr/bin/llvm-config
-file usr/bin/$(MACH64)/llvm-cov path=usr/bin/llvm-cov
-file usr/bin/$(MACH64)/llvm-cxxdump path=usr/bin/llvm-cxxdump
-file usr/bin/$(MACH64)/llvm-diff path=usr/bin/llvm-diff
-file usr/bin/$(MACH64)/llvm-dis path=usr/bin/llvm-dis
-file usr/bin/$(MACH64)/llvm-dsymutil path=usr/bin/llvm-dsymutil
-file usr/bin/$(MACH64)/llvm-dwarfdump path=usr/bin/llvm-dwarfdump
-file usr/bin/$(MACH64)/llvm-dwp path=usr/bin/llvm-dwp
-file usr/bin/$(MACH64)/llvm-extract path=usr/bin/llvm-extract
+file path=usr/bin/bugpoint
+file path=usr/bin/llc
+file path=usr/bin/lli
+file path=usr/bin/llvm-ar
+file path=usr/bin/llvm-as
+file path=usr/bin/llvm-bcanalyzer
+file path=usr/bin/llvm-c-test
+file path=usr/bin/llvm-config
+file path=usr/bin/llvm-cov
+file path=usr/bin/llvm-cxxdump
+file path=usr/bin/llvm-diff
+file path=usr/bin/llvm-dis
+file path=usr/bin/llvm-dsymutil
+file path=usr/bin/llvm-dwarfdump
+file path=usr/bin/llvm-dwp
+file path=usr/bin/llvm-extract
 hardlink path=usr/bin/llvm-lib target=llvm-ar
-file usr/bin/$(MACH64)/llvm-link path=usr/bin/llvm-link
-file usr/bin/$(MACH64)/llvm-lto path=usr/bin/llvm-lto
-file usr/bin/$(MACH64)/llvm-mc path=usr/bin/llvm-mc
-file usr/bin/$(MACH64)/llvm-mcmarkup path=usr/bin/llvm-mcmarkup
-file usr/bin/$(MACH64)/llvm-nm path=usr/bin/llvm-nm
-file usr/bin/$(MACH64)/llvm-objdump path=usr/bin/llvm-objdump
-file usr/bin/$(MACH64)/llvm-pdbdump path=usr/bin/llvm-pdbdump
-file usr/bin/$(MACH64)/llvm-profdata path=usr/bin/llvm-profdata
+file path=usr/bin/llvm-link
+file path=usr/bin/llvm-lto
+file path=usr/bin/llvm-mc
+file path=usr/bin/llvm-mcmarkup
+file path=usr/bin/llvm-nm
+file path=usr/bin/llvm-objdump
+file path=usr/bin/llvm-pdbdump
+file path=usr/bin/llvm-profdata
 hardlink path=usr/bin/llvm-ranlib target=llvm-ar
-file usr/bin/$(MACH64)/llvm-readobj path=usr/bin/llvm-readobj
-file usr/bin/$(MACH64)/llvm-rtdyld path=usr/bin/llvm-rtdyld
-file usr/bin/$(MACH64)/llvm-size path=usr/bin/llvm-size
-file usr/bin/$(MACH64)/llvm-split path=usr/bin/llvm-split
-file usr/bin/$(MACH64)/llvm-stress path=usr/bin/llvm-stress
-file usr/bin/$(MACH64)/llvm-symbolizer path=usr/bin/llvm-symbolizer
-file usr/bin/$(MACH64)/llvm-tblgen path=usr/bin/llvm-tblgen
-file usr/bin/$(MACH64)/obj2yaml path=usr/bin/obj2yaml
-file usr/bin/$(MACH64)/opt path=usr/bin/opt
-file usr/bin/$(MACH64)/sancov path=usr/bin/sancov
-file usr/bin/$(MACH64)/verify-uselistorder path=usr/bin/verify-uselistorder
-file usr/bin/$(MACH64)/yaml2obj path=usr/bin/yaml2obj
+file path=usr/bin/llvm-readobj
+file path=usr/bin/llvm-rtdyld
+file path=usr/bin/llvm-size
+file path=usr/bin/llvm-split
+file path=usr/bin/llvm-stress
+file path=usr/bin/llvm-symbolizer
+file path=usr/bin/llvm-tblgen
+file path=usr/bin/obj2yaml
+file path=usr/bin/opt
+file path=usr/bin/sancov
+file path=usr/bin/verify-uselistorder
+file path=usr/bin/yaml2obj
 file path=usr/lib/$(MACH64)/BugpointPasses.so
 file path=usr/lib/$(MACH64)/LLVMHello.so
+link path=usr/lib/$(MACH64)/libLLVM-3.8.1.so target=libLLVM-3.8.so
 file path=usr/lib/$(MACH64)/libLLVM-3.8.so
 link path=usr/lib/$(MACH64)/libLLVM.so target=libLLVM-3.8.so
 file path=usr/lib/$(MACH64)/libLTO.so