summaryrefslogtreecommitdiff
path: root/utils/UpdateTestChecks
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2018-06-28 17:56:43 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2018-06-28 17:56:43 +0000
commit3695b5379bf4c42fbce8acebd5ff9a730e2368ac (patch)
treea01816ff87c5aabf17a7fd86d3a32f60e94c65c2 /utils/UpdateTestChecks
parent3e2aa5b2f64e9b7656f527c608fa335250ce4110 (diff)
Revert "Re-land r335297 "[X86] Implement more of x86-64 large and medium PIC code models""
Reverting because this is causing failures in the LLDB test suite on GreenDragon. LLVM ERROR: unsupported relocation with subtraction expression, symbol '__GLOBAL_OFFSET_TABLE_' can not be undefined in a subtraction expression git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@335894 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/UpdateTestChecks')
-rw-r--r--utils/UpdateTestChecks/asm.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/UpdateTestChecks/asm.py b/utils/UpdateTestChecks/asm.py
index 0ece3e131f5..6bdaaa46ca5 100644
--- a/utils/UpdateTestChecks/asm.py
+++ b/utils/UpdateTestChecks/asm.py
@@ -110,9 +110,8 @@ def scrub_asm_x86(asm, args):
asm = SCRUB_X86_SPILL_RELOAD_RE.sub(r'{{[-0-9]+}}(%\1{{[sb]}}p)\2', asm)
# Generically match the stack offset of a memory operand.
asm = SCRUB_X86_SP_RE.sub(r'{{[0-9]+}}(%\1)', asm)
- if getattr(args, 'x86_scrub_rip', False):
- # Generically match a RIP-relative memory operand.
- asm = SCRUB_X86_RIP_RE.sub(r'{{.*}}(%rip)', asm)
+ # Generically match a RIP-relative memory operand.
+ asm = SCRUB_X86_RIP_RE.sub(r'{{.*}}(%rip)', asm)
# Generically match a LCP symbol.
asm = SCRUB_X86_LCP_RE.sub(r'{{\.LCPI.*}}', asm)
if getattr(args, 'extra_scrub', False):