diff --git a/lld/test/ELF/Inputs/eh-frame-end.s b/lld/test/ELF/Inputs/eh-frame-end.s
deleted file mode 100644
index b7334d8ffbbf1e..00000000000000
--- a/lld/test/ELF/Inputs/eh-frame-end.s
+++ /dev/null
@@ -1,2 +0,0 @@
-	.section ".eh_frame", "a", @progbits
-	.long 0
diff --git a/lld/test/ELF/Inputs/eh-frame-pcrel-overflow.s b/lld/test/ELF/Inputs/eh-frame-pcrel-overflow.s
index 7b3cff88b466f5..5ffdfee3a60c2f 100644
--- a/lld/test/ELF/Inputs/eh-frame-pcrel-overflow.s
+++ b/lld/test/ELF/Inputs/eh-frame-pcrel-overflow.s
@@ -3,7 +3,7 @@
 foo:
   ret
 
-.section .eh_frame, "a"
+.section .eh_frame,"a",@unwind
   .long 12   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/Inputs/mips-nonalloc.s b/lld/test/ELF/Inputs/mips-nonalloc.s
deleted file mode 100644
index 72bfd274335c4e..00000000000000
--- a/lld/test/ELF/Inputs/mips-nonalloc.s
+++ /dev/null
@@ -1,2 +0,0 @@
-  .section .debug_info
-  .word __start
diff --git a/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s b/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s
index 90f6e0fd6cf303..36cb950d9842fa 100644
--- a/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s
+++ b/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s
@@ -10,7 +10,7 @@ getRodata:
     lwa 3, .LC0@toc(2)
     blr
 
-    .section        .rodata,"aMS",@progbits,8
+    .section        .rodata,"a",@progbits
     .quad _start
 
     .section        .toc,"aw",@progbits
diff --git a/lld/test/ELF/comdat-discarded-reloc.s b/lld/test/ELF/comdat-discarded-reloc.s
index 4d50ab10e5127f..11252bf1516bcc 100644
--- a/lld/test/ELF/comdat-discarded-reloc.s
+++ b/lld/test/ELF/comdat-discarded-reloc.s
@@ -32,7 +32,7 @@ bar:
   .quad .text.bar1
 
 ## Don't warn on .eh_frame, .debug*, .zdebug*, or .gcc_except_table
-.section .eh_frame,"a"
+.section .eh_frame,"a",@unwind
   .quad .text.bar1
 
 .section .debug_foo
diff --git a/lld/test/ELF/compress-debug-sections-reloc.s b/lld/test/ELF/compress-debug-sections-reloc.s
index b4ee4ea6dd9787..e8e3dadcf22218 100644
--- a/lld/test/ELF/compress-debug-sections-reloc.s
+++ b/lld/test/ELF/compress-debug-sections-reloc.s
@@ -17,7 +17,7 @@
 a_sym:
 nop
 
-.section .debug_str,"",@progbits
+.section .debug_str,"MS",@progbits,1
 .long a_sym
 .long a_debug_sym
 
diff --git a/lld/test/ELF/eh-frame-begin-end.s b/lld/test/ELF/eh-frame-begin-end.s
index 9ec2f6e8c4b4c3..46816054f2dc8a 100644
--- a/lld/test/ELF/eh-frame-begin-end.s
+++ b/lld/test/ELF/eh-frame-begin-end.s
@@ -1,6 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %p/Inputs/eh-frame-end.s -o %t2.o
+// RUN: echo '.section .eh_frame,"a",@unwind; .long 0' | \
+// RUN:   llvm-mc -filetype=obj -triple=amd64-unknown-openbsd - -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
 // RUN: llvm-readobj --sections %t | FileCheck %s
 
@@ -13,5 +14,5 @@
 // CHECK-NEXT: Offset: 0x120
 // CHECK-NEXT: Size: 4
 
-	.section ".eh_frame", "a", @progbits
+.section .eh_frame,"a",@unwind
 __EH_FRAME_BEGIN__:
diff --git a/lld/test/ELF/eh-frame-marker.s b/lld/test/ELF/eh-frame-marker.s
index 7a03cf7ff5190b..02591ed21cb7fa 100644
--- a/lld/test/ELF/eh-frame-marker.s
+++ b/lld/test/ELF/eh-frame-marker.s
@@ -15,6 +15,6 @@
 // CHECK:      Name: foo
 // CHECK-NEXT: Value: [[ADDR]]
 
-        .section .eh_frame
+        .section .eh_frame,"a",@unwind
 foo:
         .long 0
diff --git a/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s b/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
index f2db28d9ce3f68..dc78953ea4ff20 100644
--- a/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
+++ b/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
@@ -57,7 +57,7 @@
 _start:
  nop
 
-.section .eh_frame, "a"
+.section .eh_frame,"a",@unwind
   .long 16   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s b/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
index b48f9247576a9c..b9cd45323451ee 100644
--- a/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
+++ b/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
@@ -57,7 +57,7 @@
 _start:
  nop
 
-.section .eh_frame, "a"
+.section .eh_frame,"a",@unwind
   .long 16   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s b/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
index 283f722be84c0c..887a27ad0f55aa 100644
--- a/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
+++ b/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
@@ -57,7 +57,7 @@
 _start:
  nop
 
-.section .eh_frame, "a"
+.section .eh_frame,"a",@unwind
   .long 16   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-pcrel-overflow.s b/lld/test/ELF/eh-frame-pcrel-overflow.s
index 676a3dea17a960..78e804768dad63 100644
--- a/lld/test/ELF/eh-frame-pcrel-overflow.s
+++ b/lld/test/ELF/eh-frame-pcrel-overflow.s
@@ -11,7 +11,7 @@
 _start:
   ret
 
-.section .eh_frame, "a"
+.section .eh_frame,"a",@unwind
   .long 12   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-value-format1.s b/lld/test/ELF/eh-frame-value-format1.s
index a8bcffb4fe4f38..da078eb79b4252 100644
--- a/lld/test/ELF/eh-frame-value-format1.s
+++ b/lld/test/ELF/eh-frame-value-format1.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x14
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format2.s b/lld/test/ELF/eh-frame-value-format2.s
index 6d2d82e267c7cc..1c907501ead310 100644
--- a/lld/test/ELF/eh-frame-value-format2.s
+++ b/lld/test/ELF/eh-frame-value-format2.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x14
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format3.s b/lld/test/ELF/eh-frame-value-format3.s
index 1f174ae60a0dee..46e8db90ec18e3 100644
--- a/lld/test/ELF/eh-frame-value-format3.s
+++ b/lld/test/ELF/eh-frame-value-format3.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format4.s b/lld/test/ELF/eh-frame-value-format4.s
index d10988a4fc86d1..e3e516d4eed256 100644
--- a/lld/test/ELF/eh-frame-value-format4.s
+++ b/lld/test/ELF/eh-frame-value-format4.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format5.s b/lld/test/ELF/eh-frame-value-format5.s
index fd5b35a8b05ea5..cfa23723ea296e 100644
--- a/lld/test/ELF/eh-frame-value-format5.s
+++ b/lld/test/ELF/eh-frame-value-format5.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x14
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format6.s b/lld/test/ELF/eh-frame-value-format6.s
index ee76fa7a050f7e..23093b204c5012 100644
--- a/lld/test/ELF/eh-frame-value-format6.s
+++ b/lld/test/ELF/eh-frame-value-format6.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld --eh-frame-hdr %t -o /dev/null
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x14
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/eh-frame-value-format7.s b/lld/test/ELF/eh-frame-value-format7.s
index 038ed12a05b1e5..5ebd5af44bedf7 100644
--- a/lld/test/ELF/eh-frame-value-format7.s
+++ b/lld/test/ELF/eh-frame-value-format7.s
@@ -53,7 +53,7 @@
 foo:
  nop
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .long 12   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-value-format8.s b/lld/test/ELF/eh-frame-value-format8.s
index 155e81a2c5f685..6d5da05c2bfa7b 100644
--- a/lld/test/ELF/eh-frame-value-format8.s
+++ b/lld/test/ELF/eh-frame-value-format8.s
@@ -52,7 +52,7 @@
 foo:
  nop
 
-.section .eh_frame, "ax"
+.section .eh_frame,"a",@unwind
   .long 12   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/eh-frame-value-format9.s b/lld/test/ELF/eh-frame-value-format9.s
index 11c4789bc3e110..1c5ca3bbafd7e8 100644
--- a/lld/test/ELF/eh-frame-value-format9.s
+++ b/lld/test/ELF/eh-frame-value-format9.s
@@ -4,7 +4,7 @@
 # RUN: not ld.lld --eh-frame-hdr %t.o -o /dev/null 2>&1 | FileCheck %s
 # CHECK: error: unknown FDE size encoding
 
-.section .eh_frame, "ax"
+.section .eh_frame,"a",@unwind
   .long 12   # Size
   .long 0x00 # ID
   .byte 0x01 # Version.
diff --git a/lld/test/ELF/ehframe-relocation.s b/lld/test/ELF/ehframe-relocation.s
index 953d53eca5a389..2bfb2a7b3550a3 100644
--- a/lld/test/ELF/ehframe-relocation.s
+++ b/lld/test/ELF/ehframe-relocation.s
@@ -23,7 +23,7 @@
 // DISASM-NEXT:   201154: {{.*}} movq 2097440, %rax
 // DISASM-NEXT:   20115c: {{.*}} movq 2097445, %rax
 
-.section .eh_frame,"ax",@unwind
+.section .eh_frame,"a",@unwind
 
 .section .text
 .globl _start
diff --git a/lld/test/ELF/icf16.s b/lld/test/ELF/icf16.s
index 13cb8ecd2994b3..047acdcfc1f33e 100644
--- a/lld/test/ELF/icf16.s
+++ b/lld/test/ELF/icf16.s
@@ -9,7 +9,7 @@
 
 # CHECK-NOT: selected
 
-.section ".eh_frame", "a", @progbits
+.section ".eh_frame", "a", @unwind
 .globl foo
 foo:
   .quad 0
diff --git a/lld/test/ELF/invalid-cie-length.s b/lld/test/ELF/invalid-cie-length.s
index 7e73dd8aa5d3c0..d5465e854409cb 100644
--- a/lld/test/ELF/invalid-cie-length.s
+++ b/lld/test/ELF/invalid-cie-length.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
 .byte 0
 
 // CHECK:      error: corrupted .eh_frame: CIE/FDE too small
diff --git a/lld/test/ELF/invalid-cie-length2.s b/lld/test/ELF/invalid-cie-length2.s
index a43491c17790b4..c423e24d2834c3 100644
--- a/lld/test/ELF/invalid-cie-length2.s
+++ b/lld/test/ELF/invalid-cie-length2.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
 .long 42
 
 // CHECK:      error: corrupted .eh_frame: CIE/FDE ends past the end of the section
diff --git a/lld/test/ELF/invalid-cie-length3.s b/lld/test/ELF/invalid-cie-length3.s
index 3417efcba8fa1c..8f2055f9d50330 100644
--- a/lld/test/ELF/invalid-cie-length3.s
+++ b/lld/test/ELF/invalid-cie-length3.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
 .long 0xFFFFFFFC
 
 // CHECK:      error: corrupted .eh_frame: CIE/FDE ends past the end of the section
diff --git a/lld/test/ELF/invalid-cie-length4.s b/lld/test/ELF/invalid-cie-length4.s
index cf3a6f513747dd..b2ad8a46af7ac1 100644
--- a/lld/test/ELF/invalid-cie-length4.s
+++ b/lld/test/ELF/invalid-cie-length4.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
 .long 0xFFFFFFFF
 .byte 0
 
diff --git a/lld/test/ELF/invalid-cie-length5.s b/lld/test/ELF/invalid-cie-length5.s
index 223ce125853bbe..9b9b2d8db9c1eb 100644
--- a/lld/test/ELF/invalid-cie-length5.s
+++ b/lld/test/ELF/invalid-cie-length5.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
- .section .eh_frame
+ .section .eh_frame,"a",@unwind
  .long 0xFFFFFFFF
  .quad 0xFFFFFFFFFFFFFFF4
 
diff --git a/lld/test/ELF/invalid-cie-reference.s b/lld/test/ELF/invalid-cie-reference.s
index 0f64c4a429b4cc..158fc4e935f28b 100644
--- a/lld/test/ELF/invalid-cie-reference.s
+++ b/lld/test/ELF/invalid-cie-reference.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: not ld.lld %t -o /dev/null 2>&1 | FileCheck %s
 
-        .section .eh_frame
+        .section .eh_frame,"a",@unwind
         .long 0x14
         .long 0x0
         .byte 0x01
diff --git a/lld/test/ELF/invalid-eh-frame.s b/lld/test/ELF/invalid-eh-frame.s
index 53344287234654..ccf433c6a67556 100644
--- a/lld/test/ELF/invalid-eh-frame.s
+++ b/lld/test/ELF/invalid-eh-frame.s
@@ -6,7 +6,7 @@
 # CHECK:      error: corrupted .eh_frame: unexpected end of CIE
 # CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0x8)
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x04
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame2.s b/lld/test/ELF/invalid-eh-frame2.s
index c8995cbe1c81b5..87ce8ede725039 100644
--- a/lld/test/ELF/invalid-eh-frame2.s
+++ b/lld/test/ELF/invalid-eh-frame2.s
@@ -6,7 +6,7 @@
 # CHECK:      error: corrupted .eh_frame: corrupted CIE (failed to read string)
 # CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0x9)
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
 .align 1
   .byte 0x08
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame3.s b/lld/test/ELF/invalid-eh-frame3.s
index 44592cbe3c8975..7cc27fc4222947 100644
--- a/lld/test/ELF/invalid-eh-frame3.s
+++ b/lld/test/ELF/invalid-eh-frame3.s
@@ -6,7 +6,7 @@
 # CHECK:      error: corrupted .eh_frame: corrupted CIE (failed to read LEB128)
 # CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0xC)
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x08
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame4.s b/lld/test/ELF/invalid-eh-frame4.s
index 4022c04476dcad..a567bd40d73efa 100644
--- a/lld/test/ELF/invalid-eh-frame4.s
+++ b/lld/test/ELF/invalid-eh-frame4.s
@@ -5,7 +5,7 @@
 
 # CHECK: corrupted .eh_frame: unknown .eh_frame augmentation string:
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame5.s b/lld/test/ELF/invalid-eh-frame5.s
index eb153fa92c4960..798e6c0af9340f 100644
--- a/lld/test/ELF/invalid-eh-frame5.s
+++ b/lld/test/ELF/invalid-eh-frame5.s
@@ -5,7 +5,7 @@
 
 # CHECK: corrupted .eh_frame: unknown .eh_frame augmentation string:
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame6.s b/lld/test/ELF/invalid-eh-frame6.s
index 9b6b7f8bf87a78..68b79c725d0c60 100644
--- a/lld/test/ELF/invalid-eh-frame6.s
+++ b/lld/test/ELF/invalid-eh-frame6.s
@@ -6,7 +6,7 @@
 # CHECK: error: corrupted .eh_frame: unknown FDE encoding
 # CHECK-NEXT: >>> defined in {{.*}}:(.eh_frame+0xE)
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame7.s b/lld/test/ELF/invalid-eh-frame7.s
index 81a0014049e099..6955d51e7aef6b 100644
--- a/lld/test/ELF/invalid-eh-frame7.s
+++ b/lld/test/ELF/invalid-eh-frame7.s
@@ -5,7 +5,7 @@
 
 # CHECK: error: corrupted .eh_frame: DW_EH_PE_aligned encoding is not supported
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame8.s b/lld/test/ELF/invalid-eh-frame8.s
index 484fef29f8b32d..856fddb19c0256 100644
--- a/lld/test/ELF/invalid-eh-frame8.s
+++ b/lld/test/ELF/invalid-eh-frame8.s
@@ -5,7 +5,7 @@
 
 # CHECK: error: corrupted .eh_frame: corrupted CIE
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x0E
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-eh-frame9.s b/lld/test/ELF/invalid-eh-frame9.s
index 73a102b4f90dc3..436b34bb3a8028 100644
--- a/lld/test/ELF/invalid-eh-frame9.s
+++ b/lld/test/ELF/invalid-eh-frame9.s
@@ -5,7 +5,7 @@
 
 # CHECK: error: corrupted .eh_frame: CIE is too small
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x03
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/invalid-fde-rel.s b/lld/test/ELF/invalid-fde-rel.s
index f6513225b533e8..6301ccde98b700 100644
--- a/lld/test/ELF/invalid-fde-rel.s
+++ b/lld/test/ELF/invalid-fde-rel.s
@@ -7,7 +7,7 @@
 // This resembles what gold -r produces when it discards the section
 // the fde points to.
 
-        .section .eh_frame
+        .section .eh_frame,"a",@unwind
         .long 0x14
         .long 0x0
         .byte 0x01
diff --git a/lld/test/ELF/invalid/eh-frame-hdr-no-out.s b/lld/test/ELF/invalid/eh-frame-hdr-no-out.s
index 221ca205e59150..e878189715fe25 100644
--- a/lld/test/ELF/invalid/eh-frame-hdr-no-out.s
+++ b/lld/test/ELF/invalid/eh-frame-hdr-no-out.s
@@ -4,7 +4,7 @@
 
 // CHECK: error: corrupted .eh_frame: FDE version 1 or 3 expected, but got 2
 
-.section .eh_frame
+.section .eh_frame,"a",@unwind
   .byte 0x08
   .byte 0x00
   .byte 0x00
diff --git a/lld/test/ELF/linkerscript/Inputs/compress-debug-sections.s b/lld/test/ELF/linkerscript/Inputs/compress-debug-sections.s
index 703be5949e0d8e..a294fe5f253b2c 100644
--- a/lld/test/ELF/linkerscript/Inputs/compress-debug-sections.s
+++ b/lld/test/ELF/linkerscript/Inputs/compress-debug-sections.s
@@ -1,3 +1,3 @@
-.section .debug_str
+.section .debug_str,"MS",@progbits,1
   .asciz "CCC"
   .asciz "DDD"
diff --git a/lld/test/ELF/linkerscript/compress-debug-sections-custom.s b/lld/test/ELF/linkerscript/compress-debug-sections-custom.s
index 31fdd56381b0ff..f61d6398b1f0df 100644
--- a/lld/test/ELF/linkerscript/compress-debug-sections-custom.s
+++ b/lld/test/ELF/linkerscript/compress-debug-sections-custom.s
@@ -26,7 +26,7 @@
 a_sym:
 nop
 
-.section .debug_str,"",@progbits
+.section .debug_str,"MS",@progbits,1
 .long a_sym
 .long a_debug_sym
 
diff --git a/lld/test/ELF/linkerscript/compress-debug-sections.s b/lld/test/ELF/linkerscript/compress-debug-sections.s
index 305ff830f2cf07..fe1c66dbdbdcde 100644
--- a/lld/test/ELF/linkerscript/compress-debug-sections.s
+++ b/lld/test/ELF/linkerscript/compress-debug-sections.s
@@ -31,6 +31,6 @@
 # ZLIBFLAGS-NEXT:    Flags [
 # ZLIBFLAGS-NEXT:      SHF_COMPRESSED
 
-.section .debug_str
+.section .debug_str,"MS",@progbits,1
   .asciz "AAA"
   .asciz "BBB"
diff --git a/lld/test/ELF/mips-micro-relocs.s b/lld/test/ELF/mips-micro-relocs.s
index 0902f10f8f8f6c..3eb1c1ac78523d 100644
--- a/lld/test/ELF/mips-micro-relocs.s
+++ b/lld/test/ELF/mips-micro-relocs.s
@@ -71,5 +71,5 @@ __start:
   .data
   .gpword __start                 # R_MIPS_GPREL32
 
-  .section .debug_info
+  .section .debug_info,"",@0x7000001e
   .word __start                   # R_MIPS_32
diff --git a/lld/test/ELF/mips-nonalloc.s b/lld/test/ELF/mips-nonalloc.s
index 5ec308d9e66287..b1fa4991d4d250 100644
--- a/lld/test/ELF/mips-nonalloc.s
+++ b/lld/test/ELF/mips-nonalloc.s
@@ -2,8 +2,8 @@
 # Check reading addends for relocations in non-allocatable sections.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t1.o
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
-# RUN:         %S/Inputs/mips-nonalloc.s -o %t2.o
+# RUN: echo '.section .debug_info,"",@0x7000001e; .word __start' | \
+# RUN:   llvm-mc -filetype=obj -triple=mips-unknown-linux - -o %t2.o
 # RUN: ld.lld %t1.o %t2.o -o %t.exe
 # RUN: llvm-objdump -t -s %t.exe | FileCheck %s
 
@@ -18,6 +18,6 @@
 __start:
   nop
 
-.section .debug_info
+.section .debug_info,"",@0x7000001e
   .word 0xffffffff
   .word __start
diff --git a/lld/test/ELF/no-augmentation.s b/lld/test/ELF/no-augmentation.s
index f4912ba6836679..342f82907e1f46 100644
--- a/lld/test/ELF/no-augmentation.s
+++ b/lld/test/ELF/no-augmentation.s
@@ -8,7 +8,7 @@
 .global __start
 __start:
 
-.section        .eh_frame,"aw",@progbits
+.section        .eh_frame,"a",@progbits
         .4byte  9
         .4byte  0x0
         .byte   0x1
diff --git a/lld/test/ELF/ppc64-ld-got-dtprel.s b/lld/test/ELF/ppc64-ld-got-dtprel.s
index 319c14e42cb94b..b4f9f6478c65e6 100644
--- a/lld/test/ELF/ppc64-ld-got-dtprel.s
+++ b/lld/test/ELF/ppc64-ld-got-dtprel.s
@@ -36,7 +36,7 @@
   addis 3, 2, j@got@dtprel@h
   addi 3, 2, j@got@dtprel
 
-.section .tbss,"awT",@progbits
+.section .tbss,"awT",@nobits
 .p2align 2
 i:
   .long 0