[llvm-branch-commits] [cfe-branch] r151601 - in /cfe/branches/Apple/palisade-IB: ClangBNI.mk order-files/gen-clang-order-data

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb 27 18:50:52 2012
New Revision: 151601

URL: http://llvm.org/viewvc/llvm-project?rev=151601&view=rev
Log:
build/order-files: Don't automatically add in a sudo for the user.
 - Also, force on integrated-as for armv7 build, just in case.

Modified:
    cfe/branches/Apple/palisade-IB/ClangBNI.mk
    cfe/branches/Apple/palisade-IB/order-files/gen-clang-order-data

Modified: cfe/branches/Apple/palisade-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/palisade-IB/ClangBNI.mk?rev=151601&r1=151600&r2=151601&view=diff
==============================================================================
--- cfe/branches/Apple/palisade-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/palisade-IB/ClangBNI.mk Mon Feb 27 18:50:52 2012
@@ -417,6 +417,7 @@
 		echo "Building (Final) (Ordered) for $$arch..." && \
 	        echo "Generating Order File Data for $$arch " && \
 	        $(SRCROOT)/order-files/gen-clang-order-data \
+		  --no-sudo \
 	          --cc "$(OBJROOT)/$$arch/$(Build_Mode)/bin/clang" \
 		  --inputs "$(SRCROOT)/order-files/inputs" \
 		  --temps "$(OBJROOT)/order-data/$$arch/temps" \

Modified: cfe/branches/Apple/palisade-IB/order-files/gen-clang-order-data
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/palisade-IB/order-files/gen-clang-order-data?rev=151601&r1=151600&r2=151601&view=diff
==============================================================================
--- cfe/branches/Apple/palisade-IB/order-files/gen-clang-order-data (original)
+++ cfe/branches/Apple/palisade-IB/order-files/gen-clang-order-data Mon Feb 27 18:50:52 2012
@@ -27,7 +27,8 @@
         ('-c', 'trivial-input.cpp', '-O0', '-g'))
     yield (
         'trivial-c-armv7', None, False,
-        ('-c', 'trivial-input.c', '-O0', '-g', '-arch', 'armv7'))
+        ('-c', 'trivial-input.c', '-O0', '-g', '-arch', 'armv7',
+         '-integrated-as'))
     yield (
         'trivial-c-Os', None, False,
         ('-c', 'trivial-input.c', '-Os'))
@@ -74,11 +75,14 @@
     dtrace_script = "%s { %s }" % (predicate, action)
 
     # Execute the script.
-    dtrace_args = [
-        'sudo', 'dtrace', '-xevaltime=exec', '-xmangled',
+    dtrace_args = []
+    if opts.use_sudo:
+        dtrace_args.append("sudo")
+    dtrace_args.extend((
+        'dtrace', '-xevaltime=exec', '-xmangled',
         '-xbufsize=%dm' % (opts.buffer_size),
         '-q', '-n', dtrace_script, 
-        '-c', ' '.join(args)]
+        '-c', ' '.join(args)))
     commands.note("generating dtrace data for test %r: %r" % (
             data_name, ' '.join('"%s"' % arg
                                 for arg in dtrace_args)))
@@ -142,6 +146,9 @@
     parser.add_option("", "--use-multishot", dest="use_multishot",
                       help="Record multiple function entry samples",
                       action="store_true", default=False)
+    parser.add_option("", "--no-sudo", dest="use_sudo",
+                      help="Don't automatically use sudo with dtrace",
+                      action="store_false", default=True)
     parser.add_option("", "--use-probefunc", dest="use_ustack",
                       help="Record probefunc instead of ustack(1)",
                       action="store_false", default=True)