Undo TLSDESC changes

For the moment, while the abi discussion continues.

Author: lenary

llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp

@@ -659,10 +659,6 @@ uint64_t RISCVMCCodeEmitter::getImmOpValue(const MCInst &MI, unsigned OpNo,
       break;
     case ELF::R_RISCV_GOT_HI20:
     case ELF::R_RISCV_TPREL_HI20:
-    case ELF::R_RISCV_TLSDESC_HI20:
-    case ELF::R_RISCV_TLSDESC_LOAD_LO12:
-    case ELF::R_RISCV_TLSDESC_ADD_LO12:
-    case ELF::R_RISCV_TLSDESC_CALL:
       RelaxCandidate = true;
       break;
     }

llvm/test/MC/RISCV/linker-relaxation.s

@@ -136,7 +136,6 @@ auipc t1, %tlsdesc_hi(baz)
 # NORELAX-RELOC-NEXT: R_RISCV_TLSDESC_HI20 baz 0x0
 # NORELAX-RELOC-NOT: R_RISCV_RELAX
 # RELAX-RELOC-NEXT: R_RISCV_TLSDESC_HI20 baz 0x0
-# RELAX-RELOC-NEXT: R_RISCV_RELAX - 0x0
 
 ## %hi/%lo on an absolute symbol (not yet defined) leads to relocations when relaxation is enabled.
 lui t2, %hi(abs)

llvm/test/MC/RISCV/tlsdesc.s

@@ -1,32 +1,18 @@
-# RUN: llvm-mc -filetype=obj -triple riscv32 < %s --defsym RV32=1  \
-# RUN:   | llvm-objdump -dr -M no-aliases - \
-# RUN:   | FileCheck %s --check-prefixes=INST,RV32
-# RUN: llvm-mc -filetype=obj -triple riscv64 < %s \
-# RUN:   | llvm-objdump -dr -M no-aliases - \
-# RUN:   | FileCheck %s --check-prefixes=INST,RV64
-# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+relax < %s --defsym RV32=1  \
-# RUN:   | llvm-objdump -dr -M no-aliases - \
-# RUN:   | FileCheck %s --check-prefixes=INST,RV32,RELAX
-# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+relax < %s \
-# RUN:   | llvm-objdump -dr -M no-aliases - \
-# RUN:   | FileCheck %s --check-prefixes=INST,RV64,RELAX
+# RUN: llvm-mc -filetype=obj -triple riscv32 < %s --defsym RV32=1  | llvm-objdump -dr -M no-aliases - | FileCheck %s --check-prefixes=INST,RV32
+# RUN: llvm-mc -filetype=obj -triple riscv64 < %s | llvm-objdump -dr -M no-aliases - | FileCheck %s --check-prefixes=INST,RV64
 
-# RUN: not llvm-mc -triple riscv32 < %s --defsym RV32=1 --defsym ERR=1 2>&1 \
-# RUN:   | FileCheck %s --check-prefixes=ERR
-# RUN: not llvm-mc -triple riscv64 < %s --defsym ERR=1 2>&1 \
-# RUN:   | FileCheck %s --check-prefixes=ERR
+# RUN: not llvm-mc -triple riscv32 < %s --defsym RV32=1 --defsym ERR=1 2>&1 | FileCheck %s --check-prefixes=ERR
+# RUN: not llvm-mc -triple riscv64 < %s --defsym ERR=1 2>&1 | FileCheck %s --check-prefixes=ERR
 
 start:                                  # @start
 # %bb.0:                                # %entry
 .Ltlsdesc_hi0:
 	auipc a0, %tlsdesc_hi(a-4)
 	# INST: auipc a0, 0x0
 	# INST-NEXT: R_RISCV_TLSDESC_HI20 a-0x4
-	# RELAX-NEXT: R_RISCV_RELAX
 	auipc	a0, %tlsdesc_hi(unspecified)
 	# INST-NEXT: auipc a0, 0x0
 	# INST-NEXT: R_RISCV_TLSDESC_HI20 unspecified
-	# RELAX-NEXT: R_RISCV_RELAX
 .ifdef RV32
 	lw	a1, %tlsdesc_load_lo(.Ltlsdesc_hi0)(a0)
 	# RV32: lw a1, 0x0(a0)
@@ -36,15 +22,12 @@ start:                                  # @start
 	# RV64: ld a1, 0x0(a0)
 	# RV64-NEXT: R_RISCV_TLSDESC_LOAD_LO12 .Ltlsdesc_hi0
 .endif
-	# RELAX-NEXT: R_RISCV_RELAX
 	addi	a0, a0, %tlsdesc_add_lo(.Ltlsdesc_hi0)
 	# INST: addi a0, a0, 0x0
 	# INST-NEXT: R_RISCV_TLSDESC_ADD_LO12 .Ltlsdesc_hi0
-	# RELAX-NEXT: R_RISCV_RELAX
 	jalr	t0, 0(a1), %tlsdesc_call(.Ltlsdesc_hi0)
 	# INST-NEXT: jalr t0, 0x0(a1)
 	# INST-NEXT: R_RISCV_TLSDESC_CALL .Ltlsdesc_hi0
-	# RELAX-NEXT: R_RISCV_RELAX
 	add	a0, a0, tp
 	# INST-NEXT: add a0, a0, tp
 	ret