Skip to content

Commit 812dad5

Browse files
brad0brad0
authored
[Driver] Remove support for FreeBSD 11.x (llvm#73392)
Now that FreeBSD 14.0 has been released make the 12.x branch the oldest supported releases. -fuse-init-array defaults to on. DWARF 4 is now the default.
1 parent 9a485b0 commit 812dad5

File tree

5 files changed

+6
-42
lines changed

5 files changed

+6
-42
lines changed

‎clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,6 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple,
400400
getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib"));
401401
}
402402

403-
unsigned FreeBSD::GetDefaultDwarfVersion() const {
404-
unsigned Major = getTriple().getOSMajorVersion();
405-
if (Major >= 12 || Major == 0)
406-
return 4;
407-
return 2;
408-
}
409-
410403
void FreeBSD::AddClangSystemIncludeArgs(
411404
const llvm::opt::ArgList &DriverArgs,
412405
llvm::opt::ArgStringList &CC1Args) const {
@@ -510,13 +503,3 @@ SanitizerMask FreeBSD::getSupportedSanitizers() const {
510503
}
511504
return Res;
512505
}
513-
514-
void FreeBSD::addClangTargetOptions(const ArgList &DriverArgs,
515-
ArgStringList &CC1Args,
516-
Action::OffloadKind) const {
517-
unsigned Major = getTriple().getOSMajorVersion();
518-
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
519-
options::OPT_fno_use_init_array,
520-
(Major >= 12 || Major == 0)))
521-
CC1Args.push_back("-fno-use-init-array");
522-
}

‎clang/lib/Driver/ToolChains/FreeBSD.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,10 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_ELF {
8282
getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override;
8383
bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
8484
SanitizerMask getSupportedSanitizers() const override;
85-
unsigned GetDefaultDwarfVersion() const override;
85+
unsigned GetDefaultDwarfVersion() const override { return 4; }
8686
// Until dtrace (via CTF) and LLDB can deal with distributed debug info,
8787
// FreeBSD defaults to standalone/full debug info.
8888
bool GetDefaultStandaloneDebug() const override { return true; }
89-
void
90-
addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
91-
llvm::opt::ArgStringList &CC1Args,
92-
Action::OffloadKind DeviceOffloadKind) const override;
9389

9490
protected:
9591
Tool *buildAssembler() const override;

‎clang/test/Driver/clang-g-opts.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s
88
// RUN: %clang -### -S %s -g -target i686-pc-openbsd 2>&1 \
99
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s
10-
// RUN: %clang -### -S %s -g -target x86_64-pc-freebsd10.0 2>&1 \
11-
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s
10+
// RUN: %clang -### -S %s -g -target x86_64-pc-freebsd 2>&1 \
11+
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF4 %s
1212
// RUN: %clang -### -S %s -g --target=x86_64-unknown-haiku 2>&1 \
1313
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF4 %s
1414

@@ -27,8 +27,8 @@
2727
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-STANDALONE %s
2828
// RUN: %clang -### -S %s -g0 -g -target i686-pc-openbsd 2>&1 \
2929
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s
30-
// RUN: %clang -### -S %s -g0 -g -target x86_64-pc-freebsd10.0 2>&1 \
31-
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF2 %s
30+
// RUN: %clang -### -S %s -g0 -g -target x86_64-pc-freebsd 2>&1 \
31+
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF4 %s
3232
// RUN: %clang -### -S %s -g0 -g --target=x86_64-unknown-haiku 2>&1 \
3333
// RUN: | FileCheck --check-prefix=CHECK-WITH-G-DWARF4 %s
3434
// RUN: %clang -### -S %s -g0 -g --target=i386-pc-solaris 2>&1 \

‎clang/test/Driver/constructors.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@
7575
// RUN: --target=arm64-none-none-eabi \
7676
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
7777

78-
// RUN: %clang -### %s -fsyntax-only 2>&1 \
79-
// RUN: --target=i386-unknown-freebsd11 \
80-
// RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
81-
//
8278
// RUN: %clang -### %s -fsyntax-only 2>&1 \
8379
// RUN: --target=i386-unknown-freebsd \
8480
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s

‎clang/test/Driver/debug-options.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@
7676
// RUN: | FileCheck -check-prefix=G_STANDALONE %s
7777

7878
// FreeBSD.
79-
// RUN: %clang -### -c -g %s -target x86_64-pc-freebsd11.0 2>&1 \
80-
// RUN: | FileCheck -check-prefix=G_GDB \
81-
// RUN: -check-prefix=G_DWARF2 %s
82-
// RUN: %clang -### -c -g %s -target x86_64-pc-freebsd12.0 2>&1 \
79+
// RUN: %clang -### -c -g %s -target x86_64-pc-freebsd 2>&1 \
8380
// RUN: | FileCheck -check-prefix=G_GDB \
8481
// RUN: -check-prefix=G_DWARF4 %s
8582

@@ -188,16 +185,12 @@
188185
// RUN: | FileCheck -check-prefix=GLTO_ONLY %s
189186
// RUN: %clang -### -c -gline-tables-only %s -target i686-pc-openbsd 2>&1 \
190187
// RUN: | FileCheck -check-prefix=GLTO_ONLY_DWARF2 %s
191-
// RUN: %clang -### -c -gline-tables-only %s -target x86_64-pc-freebsd10.0 2>&1 \
192-
// RUN: | FileCheck -check-prefix=GLTO_ONLY_DWARF2 %s
193188
// RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-linux-gnu 2>&1 \
194189
// RUN: | FileCheck -check-prefix=G_ONLY %s
195190
// RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-apple-darwin16 2>&1 \
196191
// RUN: | FileCheck -check-prefix=G_STANDALONE -check-prefix=G_DWARF4 %s
197192
// RUN: %clang -### -c -gline-tables-only -g %s -target i686-pc-openbsd 2>&1 \
198193
// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s
199-
// RUN: %clang -### -c -gline-tables-only -g %s -target x86_64-pc-freebsd10.0 2>&1 \
200-
// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s
201194
// RUN: %clang -### -c -gline-tables-only -g %s --target=i386-pc-solaris 2>&1 \
202195
// RUN: | FileCheck -check-prefix=G_ONLY %s
203196
// RUN: %clang -### -c -gline-tables-only -g0 %s 2>&1 \
@@ -207,16 +200,12 @@
207200
// RUN: | FileCheck -check-prefix=GLIO_ONLY %s
208201
// RUN: %clang -### -c -gline-directives-only %s -target i686-pc-openbsd 2>&1 \
209202
// RUN: | FileCheck -check-prefix=GLIO_ONLY_DWARF2 %s
210-
// RUN: %clang -### -c -gline-directives-only %s -target x86_64-pc-freebsd10.0 2>&1 \
211-
// RUN: | FileCheck -check-prefix=GLIO_ONLY_DWARF2 %s
212203
// RUN: %clang -### -c -gline-directives-only -g %s -target x86_64-linux-gnu 2>&1 \
213204
// RUN: | FileCheck -check-prefix=G_ONLY %s
214205
// RUN: %clang -### -c -gline-directives-only -g %s -target x86_64-apple-darwin16 2>&1 \
215206
// RUN: | FileCheck -check-prefix=G_STANDALONE -check-prefix=G_DWARF4 %s
216207
// RUN: %clang -### -c -gline-directives-only -g %s -target i686-pc-openbsd 2>&1 \
217208
// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s
218-
// RUN: %clang -### -c -gline-directives-only -g %s -target x86_64-pc-freebsd10.0 2>&1 \
219-
// RUN: | FileCheck -check-prefix=G_ONLY_DWARF2 %s
220209
// RUN: %clang -### -c -gline-directives-only -g %s --target=i386-pc-solaris 2>&1 \
221210
// RUN: | FileCheck -check-prefix=G_ONLY %s
222211
// RUN: %clang -### -c -gline-directives-only -g0 %s 2>&1 \

0 commit comments

Comments
 (0)