From 4bbcb6a6822f9116b981244354b7ea5e1777b94a Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 27 Nov 2014 17:13:51 +0000 Subject: [PATCH] Revert "Reapply 222538 and update tests to explicitly request small code model and PIC:" This reverts commit r222760. It changed our behaviour on PIC so we don't match gas anymore. It also included lots of unnecessary changes to tests. If those changes are desirable, there should be an independent discussion as they are out of scope for that patch. I will recommit the other bits. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222896 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCObjectFileInfo.cpp | 11 ----------- test/MC/ELF/cfi-adjust-cfa-offset.s | 4 +--- test/MC/ELF/cfi-advance-loc2.s | 4 +--- test/MC/ELF/cfi-def-cfa-offset.s | 4 +--- test/MC/ELF/cfi-def-cfa-register.s | 4 +--- test/MC/ELF/cfi-def-cfa.s | 4 +--- test/MC/ELF/cfi-escape.s | 4 +--- test/MC/ELF/cfi-offset.s | 4 +--- test/MC/ELF/cfi-register.s | 4 +--- test/MC/ELF/cfi-rel-offset.s | 4 +--- test/MC/ELF/cfi-rel-offset2.s | 4 +--- test/MC/ELF/cfi-remember.s | 4 +--- test/MC/ELF/cfi-restore.s | 4 +--- test/MC/ELF/cfi-same-value.s | 4 +--- test/MC/ELF/cfi-signal-frame.s | 4 +--- test/MC/ELF/cfi-undefined.s | 4 +--- test/MC/ELF/cfi-window-save.s | 4 +--- test/MC/ELF/cfi-zero-addr-delta.s | 4 +--- test/MC/ELF/cfi.s | 4 +--- test/MC/ELF/pr19430.s | 4 +--- test/MC/X86/fde-reloc.s | 4 +--- 21 files changed, 20 insertions(+), 71 deletions(-) diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index 96929e59385..7886ab62ca5 100644 --- a/lib/MC/MCObjectFileInfo.cpp +++ b/lib/MC/MCObjectFileInfo.cpp @@ -273,17 +273,6 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { case Triple::mips64el: FDECFIEncoding = dwarf::DW_EH_PE_sdata8; break; - case Triple::x86_64: - if (RelocM == Reloc::PIC_) { - FDECFIEncoding = dwarf::DW_EH_PE_pcrel | - ((CMModel == CodeModel::Small || CMModel == CodeModel::Medium) - ? dwarf::DW_EH_PE_sdata4 : dwarf::DW_EH_PE_sdata8); - } else { - FDECFIEncoding = - (CMModel == CodeModel::Small || CMModel == CodeModel::Medium) - ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr; - } - break; default: FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4; break; diff --git a/test/MC/ELF/cfi-adjust-cfa-offset.s b/test/MC/ELF/cfi-adjust-cfa-offset.s index f31a6b0acd6..9d639f70d8d 100644 --- a/test/MC/ELF/cfi-adjust-cfa-offset.s +++ b/test/MC/ELF/cfi-adjust-cfa-offset.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-advance-loc2.s b/test/MC/ELF/cfi-advance-loc2.s index c11ccaf51ee..98caa0185f5 100644 --- a/test/MC/ELF/cfi-advance-loc2.s +++ b/test/MC/ELF/cfi-advance-loc2.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s // test that this produces a correctly encoded cfi_advance_loc2 diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s index 93158ce22fb..59f740055d4 100644 --- a/test/MC/ELF/cfi-def-cfa-offset.s +++ b/test/MC/ELF/cfi-def-cfa-offset.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-def-cfa-register.s b/test/MC/ELF/cfi-def-cfa-register.s index 8c550534b2f..178ba32882d 100644 --- a/test/MC/ELF/cfi-def-cfa-register.s +++ b/test/MC/ELF/cfi-def-cfa-register.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-def-cfa.s b/test/MC/ELF/cfi-def-cfa.s index f0b493403ca..dfb0d4b5939 100644 --- a/test/MC/ELF/cfi-def-cfa.s +++ b/test/MC/ELF/cfi-def-cfa.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-escape.s b/test/MC/ELF/cfi-escape.s index 3b7674640c7..5394ee414aa 100644 --- a/test/MC/ELF/cfi-escape.s +++ b/test/MC/ELF/cfi-escape.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s index 02f31ba3ca1..a65b4fc783c 100644 --- a/test/MC/ELF/cfi-offset.s +++ b/test/MC/ELF/cfi-offset.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-register.s b/test/MC/ELF/cfi-register.s index 3433bef8cde..94417702c13 100644 --- a/test/MC/ELF/cfi-register.s +++ b/test/MC/ELF/cfi-register.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-rel-offset.s b/test/MC/ELF/cfi-rel-offset.s index f51b2d35939..0dc69c89cf4 100644 --- a/test/MC/ELF/cfi-rel-offset.s +++ b/test/MC/ELF/cfi-rel-offset.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-rel-offset2.s b/test/MC/ELF/cfi-rel-offset2.s index 0ce8d038d9b..360e7b0ea0f 100644 --- a/test/MC/ELF/cfi-rel-offset2.s +++ b/test/MC/ELF/cfi-rel-offset2.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s index c98695a4fe9..3a38948b6a3 100644 --- a/test/MC/ELF/cfi-remember.s +++ b/test/MC/ELF/cfi-remember.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-restore.s b/test/MC/ELF/cfi-restore.s index 99a74e73e43..e225797f54d 100644 --- a/test/MC/ELF/cfi-restore.s +++ b/test/MC/ELF/cfi-restore.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-same-value.s b/test/MC/ELF/cfi-same-value.s index b7329d17cfb..2d37f4d0b43 100644 --- a/test/MC/ELF/cfi-same-value.s +++ b/test/MC/ELF/cfi-same-value.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-signal-frame.s b/test/MC/ELF/cfi-signal-frame.s index 9558d7bb5dc..98deb0a1de5 100644 --- a/test/MC/ELF/cfi-signal-frame.s +++ b/test/MC/ELF/cfi-signal-frame.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-undefined.s b/test/MC/ELF/cfi-undefined.s index 09000c9627c..568b3159cc4 100644 --- a/test/MC/ELF/cfi-undefined.s +++ b/test/MC/ELF/cfi-undefined.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f: .cfi_startproc diff --git a/test/MC/ELF/cfi-window-save.s b/test/MC/ELF/cfi-window-save.s index dd20164070e..b083901c137 100644 --- a/test/MC/ELF/cfi-window-save.s +++ b/test/MC/ELF/cfi-window-save.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s # Should use SPARC as the target to test this. However, SPARC does not # use MC yet. diff --git a/test/MC/ELF/cfi-zero-addr-delta.s b/test/MC/ELF/cfi-zero-addr-delta.s index 61118ecec36..8662839b527 100644 --- a/test/MC/ELF/cfi-zero-addr-delta.s +++ b/test/MC/ELF/cfi-zero-addr-delta.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s // Test that we don't produce a DW_CFA_advance_loc 0 diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s index 42b0189ea60..21be615c5f3 100644 --- a/test/MC/ELF/cfi.s +++ b/test/MC/ELF/cfi.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s f1: .cfi_startproc diff --git a/test/MC/ELF/pr19430.s b/test/MC/ELF/pr19430.s index 528193d60ae..a1e524662a9 100644 --- a/test/MC/ELF/pr19430.s +++ b/test/MC/ELF/pr19430.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o - \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-readobj -r | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o - | llvm-readobj -r | FileCheck %s // Test that we can use .cfi_startproc without a global symbol. diff --git a/test/MC/X86/fde-reloc.s b/test/MC/X86/fde-reloc.s index 9b5de15f9ed..63ac9766218 100644 --- a/test/MC/X86/fde-reloc.s +++ b/test/MC/X86/fde-reloc.s @@ -1,6 +1,4 @@ -// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux \ -// RUN: -relocation-model=pic -code-model=small \ -// RUN: | llvm-objdump -r - | FileCheck --check-prefix=X86-64 %s +// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-objdump -r - | FileCheck --check-prefix=X86-64 %s // RUN: llvm-mc -filetype=obj %s -o - -triple i686-pc-linux | llvm-objdump -r - | FileCheck --check-prefix=I686 %s // PR15448