Skip to content

Commit 5912de9

Browse files
authored
[Driver][NetBSD] Remove support for NetBSD 8.x (#122513)
1 parent 833a174 commit 5912de9

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

clang/lib/Driver/ToolChains/NetBSD.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -564,18 +564,4 @@ void NetBSD::addClangTargetOptions(const ArgList &DriverArgs,
564564
const SanitizerArgs &SanArgs = getSanitizerArgs(DriverArgs);
565565
if (SanArgs.hasAnySanitizer())
566566
CC1Args.push_back("-D_REENTRANT");
567-
568-
VersionTuple OsVersion = getTriple().getOSVersion();
569-
bool UseInitArrayDefault =
570-
OsVersion >= VersionTuple(9) || OsVersion.getMajor() == 0 ||
571-
getTriple().getArch() == llvm::Triple::aarch64 ||
572-
getTriple().getArch() == llvm::Triple::aarch64_be ||
573-
getTriple().getArch() == llvm::Triple::arm ||
574-
getTriple().getArch() == llvm::Triple::armeb ||
575-
getTriple().getArch() == llvm::Triple::riscv32 ||
576-
getTriple().getArch() == llvm::Triple::riscv64;
577-
578-
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
579-
options::OPT_fno_use_init_array, UseInitArrayDefault))
580-
CC1Args.push_back("-fno-use-init-array");
581567
}

clang/test/Driver/netbsd.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,28 +131,24 @@
131131
// PIE: "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
132132

133133
// X86_64: "-cc1" "-triple" "x86_64-unknown-netbsd"
134-
// X86_64-NOT: "-fno-use-init-array"
135134
// X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
136135
// X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
137136
// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
138137
// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
139138

140139
// AARCH64: "-cc1" "-triple" "aarch64-unknown-netbsd"
141-
// AARCH64-NOT: "-fno-use-init-array"
142140
// AARCH64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
143141
// AARCH64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
144142
// AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
145143
// AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
146144

147145
// AARCH64_BE: "-cc1" "-triple" "aarch64_be-unknown-netbsd"
148-
// AARCH64_BE-NOT: "-fno-use-init-array"
149146
// AARCH64_BE: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
150147
// AARCH64_BE: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
151148
// AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
152149
// AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
153150

154151
// ARM: "-cc1" "-triple" "armv5e-unknown-netbsd-eabi"
155-
// ARM-NOT: "-fno-use-init-array"
156152
// ARM: as{{.*}}" "-mcpu=arm926ej-s" "-o"
157153
// ARM: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
158154
// ARM: "-m" "armelf_nbsd_eabi"
@@ -162,7 +158,6 @@
162158
// ARM: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
163159

164160
// ARMEB: "-cc1" "-triple" "armebv5e-unknown-netbsd-eabi"
165-
// ARMEB-NOT: "-fno-use-init-array"
166161
// ARMEB: as{{.*}}" "-mcpu=arm926ej-s" "-o"
167162
// ARMEB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
168163
// ARMEB-NOT: "--be8"
@@ -215,23 +210,20 @@
215210
// THUMBEB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
216211

217212
// RISCV32: "-cc1" "-triple" "riscv32-unknown-netbsd"
218-
// RISCV32-NOT: "-fno-use-init-array"
219213
// RISCV32: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
220214
// RISCV32-SAME: "-m" "elf32lriscv" "-X"
221215
// RISCV32-SAME: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
222216
// RISCV32-SAME: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
223217
// RISCV32-SAME: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
224218

225219
// RISCV64: "-cc1" "-triple" "riscv64-unknown-netbsd"
226-
// RISCV64-NOT: "-fno-use-init-array"
227220
// RISCV64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
228221
// RISCV64-SAME: "-m" "elf64lriscv" "-X"
229222
// RISCV64-SAME: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
230223
// RISCV64-SAME: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
231224
// RISCV64-SAME: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
232225

233226
// SPARC: "-cc1" "-triple" "sparc-unknown-netbsd"
234-
// SPARC-NOT: "-fno-use-init-array"
235227
// SPARC: as{{.*}}" "-32" "-Av8" "-o"
236228
// SPARC: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
237229
// SPARC: "-m" "elf32_sparc"
@@ -241,7 +233,6 @@
241233
// SPARC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
242234

243235
// SPARC64: "-cc1" "-triple" "sparc64-unknown-netbsd"
244-
// SPARC64-NOT: "-fno-use-init-array"
245236
// SPARC64: as{{.*}}" "-64" "-Av9" "-o"
246237
// SPARC64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
247238
// SPARC64: "-m" "elf64_sparc"
@@ -250,7 +241,6 @@
250241
// SPARC64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
251242

252243
// POWERPC: "-cc1" "-triple" "powerpc-unknown-netbsd"
253-
// POWERPC-NOT: "-fno-use-init-array"
254244
// POWERPC: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
255245
// POWERPC: "-m" "elf32ppc_nbsd"
256246
// POWERPC: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
@@ -259,7 +249,6 @@
259249
// POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
260250

261251
// POWERPC64: "-cc1" "-triple" "powerpc64-unknown-netbsd"
262-
// POWERPC64-NOT: "-fno-use-init-array"
263252
// POWERPC64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
264253
// POWERPC64: "-m" "elf64ppc"
265254
// POWERPC64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"

0 commit comments

Comments
 (0)