|
 |
eb15f5 |
From c486eff3f809b5ce544d5a032198e7680f2b7f2b Mon Sep 17 00:00:00 2001
|
|
|
eb15f5 |
From: Stan Cox <scox@redhat.com>
|
|
|
eb15f5 |
Date: Tue, 9 Sep 2014 15:07:44 -0400
|
|
|
eb15f5 |
Subject: [PATCH] Add -fpic -fPIC to the list of accepted but ignored dtrace
|
|
|
eb15f5 |
options.
|
|
|
eb15f5 |
|
|
|
eb15f5 |
* dtrace.in (main): Add ignore_options.
|
|
|
eb15f5 |
---
|
|
|
eb15f5 |
dtrace.in | 4 +++-
|
|
|
eb15f5 |
testsuite/systemtap.base/dtrace.exp | 8 ++++----
|
|
|
eb15f5 |
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
eb15f5 |
|
|
|
eb15f5 |
diff --git a/dtrace.in b/dtrace.in
|
|
|
eb15f5 |
index d5f189d4fc9e..2f9fb6307e28 100644
|
|
|
eb15f5 |
--- a/dtrace.in
|
|
|
eb15f5 |
+++ b/dtrace.in
|
|
|
eb15f5 |
@@ -305,6 +305,8 @@ def main():
|
|
|
eb15f5 |
s_filename = ""
|
|
|
eb15f5 |
includes = []
|
|
|
eb15f5 |
defines = []
|
|
|
eb15f5 |
+ ignore_options = ["-64", "-32", "-fpic", "-fPIC"]
|
|
|
eb15f5 |
+
|
|
|
eb15f5 |
while i < len(sys.argv):
|
|
|
eb15f5 |
if sys.argv[i] == "-o":
|
|
|
eb15f5 |
i += 1
|
|
|
eb15f5 |
@@ -330,7 +332,7 @@ def main():
|
|
|
eb15f5 |
HAVE_PYP = False
|
|
|
eb15f5 |
elif sys.argv[i] == "--types":
|
|
|
eb15f5 |
print sys.argv[0] + ": note: obsolete option --types used"
|
|
|
eb15f5 |
- elif sys.argv[i] == "-64" or sys.argv[i] == "-32":
|
|
|
eb15f5 |
+ elif sys.argv[i] in ignore_options:
|
|
|
eb15f5 |
pass # dtrace users sometimes pass these flags
|
|
|
eb15f5 |
elif sys.argv[i] == "--help":
|
|
|
eb15f5 |
dtrace_help()
|
|
|
eb15f5 |
diff --git a/testsuite/systemtap.base/dtrace.exp b/testsuite/systemtap.base/dtrace.exp
|
|
|
eb15f5 |
index 252dad90ede5..e029748100d6 100644
|
|
|
eb15f5 |
--- a/testsuite/systemtap.base/dtrace.exp
|
|
|
eb15f5 |
+++ b/testsuite/systemtap.base/dtrace.exp
|
|
|
eb15f5 |
@@ -53,12 +53,12 @@ set incpath "/tmp/dtrace_inc"
|
|
|
eb15f5 |
# -----------------------------------------------------------------
|
|
|
eb15f5 |
# test command line option and file handling
|
|
|
eb15f5 |
|
|
|
eb15f5 |
-verbose -log "$dtrace -G -s $dpath -o XXX.o"
|
|
|
eb15f5 |
-catch {exec $dtrace -G -s $dpath -o XXX.o}
|
|
|
eb15f5 |
+verbose -log "$dtrace -G -64 -fPIC -s $dpath -o XXX.o"
|
|
|
eb15f5 |
+catch {exec $dtrace -G -64 -fPIC -s $dpath -o XXX.o}
|
|
|
eb15f5 |
if {[file exists XXX.o]} then {
|
|
|
eb15f5 |
- pass "dtrace -G -o XXX.o"
|
|
|
eb15f5 |
+ pass "dtrace -G -64 -fPIC -o XXX.o"
|
|
|
eb15f5 |
} else {
|
|
|
eb15f5 |
- fail "dtrace -G -o XXX.o"
|
|
|
eb15f5 |
+ fail "dtrace -G -64 -fPIC -o XXX.o"
|
|
|
eb15f5 |
}
|
|
|
eb15f5 |
exec rm -f XXX.o
|
|
|
eb15f5 |
|
|
|
eb15f5 |
--
|
|
|
eb15f5 |
1.9.3
|
|
|
eb15f5 |
|