Skip to content

Commit 387b37a

Browse files
mgornymgorny
authored
[LLVM] [Clang] Support for Gentoo *t64 triples (64-bit time_t ABIs) (#111302)
Gentoo is planning to introduce a `*t64` suffix for triples that will be used by 32-bit platforms that use 64-bit `time_t`. Add support for parsing and accepting these triples, and while at it make clang automatically enable the necessary glibc feature macros when this suffix is used. An open question is whether we can backport this to LLVM 19.x. After all, adding new triplets to Triple sounds like an ABI change — though I suppose we can minimize the risk of breaking something if we move new enum values to the very end.
1 parent f778861 commit 387b37a

File tree

16 files changed

+136
-11
lines changed

16 files changed

+136
-11
lines changed

‎clang/lib/Basic/Targets/ARM.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,9 @@ ARMTargetInfo::ARMTargetInfo(const llvm::Triple &Triple,
313313
switch (Triple.getEnvironment()) {
314314
case llvm::Triple::Android:
315315
case llvm::Triple::GNUEABI:
316+
case llvm::Triple::GNUEABIT64:
316317
case llvm::Triple::GNUEABIHF:
318+
case llvm::Triple::GNUEABIHFT64:
317319
case llvm::Triple::MuslEABI:
318320
case llvm::Triple::MuslEABIHF:
319321
case llvm::Triple::OpenHOS:

‎clang/lib/Basic/Targets/OSTargets.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,10 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> {
337337
Builder.defineMacro("_GNU_SOURCE");
338338
if (this->HasFloat128)
339339
Builder.defineMacro("__FLOAT128__");
340+
if (Triple.isTime64ABI()) {
341+
Builder.defineMacro("_FILE_OFFSET_BITS", "64");
342+
Builder.defineMacro("_TIME_BITS", "64");
343+
}
340344
}
341345

342346
public:

‎clang/lib/CodeGen/CodeGenModule.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,7 @@ createTargetCodeGenInfo(CodeGenModule &CGM) {
175175
else if (ABIStr == "aapcs16")
176176
Kind = ARMABIKind::AAPCS16_VFP;
177177
else if (CodeGenOpts.FloatABI == "hard" ||
178-
(CodeGenOpts.FloatABI != "soft" &&
179-
(Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
180-
Triple.getEnvironment() == llvm::Triple::MuslEABIHF ||
181-
Triple.getEnvironment() == llvm::Triple::EABIHF)))
178+
(CodeGenOpts.FloatABI != "soft" && Triple.isHardFloatABI()))
182179
Kind = ARMABIKind::AAPCS_VFP;
183180

184181
return createARMTargetCodeGenInfo(CGM, Kind);

‎clang/lib/CodeGen/Targets/ARM.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ class ARMABIInfo : public ABIInfo {
3535
case llvm::Triple::EABI:
3636
case llvm::Triple::EABIHF:
3737
case llvm::Triple::GNUEABI:
38+
case llvm::Triple::GNUEABIT64:
3839
case llvm::Triple::GNUEABIHF:
40+
case llvm::Triple::GNUEABIHFT64:
3941
case llvm::Triple::MuslEABI:
4042
case llvm::Triple::MuslEABIHF:
4143
return true;
@@ -48,6 +50,7 @@ class ARMABIInfo : public ABIInfo {
4850
switch (getTarget().getTriple().getEnvironment()) {
4951
case llvm::Triple::EABIHF:
5052
case llvm::Triple::GNUEABIHF:
53+
case llvm::Triple::GNUEABIHFT64:
5154
case llvm::Triple::MuslEABIHF:
5255
return true;
5356
default:

‎clang/lib/Driver/Driver.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,8 @@ static llvm::Triple computeTargetTriple(const Driver &D,
610610
if (A->getOption().matches(options::OPT_m64) ||
611611
A->getOption().matches(options::OPT_maix64)) {
612612
AT = Target.get64BitArchVariant().getArch();
613-
if (Target.getEnvironment() == llvm::Triple::GNUX32)
613+
if (Target.getEnvironment() == llvm::Triple::GNUX32 ||
614+
Target.getEnvironment() == llvm::Triple::GNUT64)
614615
Target.setEnvironment(llvm::Triple::GNU);
615616
else if (Target.getEnvironment() == llvm::Triple::MuslX32)
616617
Target.setEnvironment(llvm::Triple::Musl);
@@ -673,6 +674,7 @@ static llvm::Triple computeTargetTriple(const Driver &D,
673674
} else if (ABIName == "n32") {
674675
Target = Target.get64BitArchVariant();
675676
if (Target.getEnvironment() == llvm::Triple::GNU ||
677+
Target.getEnvironment() == llvm::Triple::GNUT64 ||
676678
Target.getEnvironment() == llvm::Triple::GNUABI64)
677679
Target.setEnvironment(llvm::Triple::GNUABIN32);
678680
else if (Target.getEnvironment() == llvm::Triple::Musl ||
@@ -681,6 +683,7 @@ static llvm::Triple computeTargetTriple(const Driver &D,
681683
} else if (ABIName == "64") {
682684
Target = Target.get64BitArchVariant();
683685
if (Target.getEnvironment() == llvm::Triple::GNU ||
686+
Target.getEnvironment() == llvm::Triple::GNUT64 ||
684687
Target.getEnvironment() == llvm::Triple::GNUABIN32)
685688
Target.setEnvironment(llvm::Triple::GNUABI64);
686689
else if (Target.getEnvironment() == llvm::Triple::Musl ||

‎clang/lib/Driver/ToolChains/Arch/ARM.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ void arm::setFloatABIInTriple(const Driver &D, const ArgList &Args,
327327
Triple.setEnvironment(isHardFloat ? llvm::Triple::GNUEABIHF
328328
: llvm::Triple::GNUEABI);
329329
break;
330+
case llvm::Triple::GNUEABIT64:
331+
case llvm::Triple::GNUEABIHFT64:
332+
Triple.setEnvironment(isHardFloat ? llvm::Triple::GNUEABIHFT64
333+
: llvm::Triple::GNUEABIT64);
334+
break;
330335
case llvm::Triple::EABI:
331336
case llvm::Triple::EABIHF:
332337
Triple.setEnvironment(isHardFloat ? llvm::Triple::EABIHF
@@ -414,10 +419,12 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) {
414419
return FloatABI::Soft;
415420
switch (Triple.getEnvironment()) {
416421
case llvm::Triple::GNUEABIHF:
422+
case llvm::Triple::GNUEABIHFT64:
417423
case llvm::Triple::MuslEABIHF:
418424
case llvm::Triple::EABIHF:
419425
return FloatABI::Hard;
420426
case llvm::Triple::GNUEABI:
427+
case llvm::Triple::GNUEABIT64:
421428
case llvm::Triple::MuslEABI:
422429
case llvm::Triple::EABI:
423430
// EABI is always AAPCS, and if it was not marked 'hard', it's softfp

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2698,6 +2698,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
26982698
case llvm::Triple::thumb:
26992699
LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
27002700
if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
2701+
TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHFT64 ||
27012702
TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF ||
27022703
TargetTriple.getEnvironment() == llvm::Triple::EABIHF) {
27032704
TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));
@@ -2709,6 +2710,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
27092710
case llvm::Triple::thumbeb:
27102711
LibDirs.append(begin(ARMebLibDirs), end(ARMebLibDirs));
27112712
if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
2713+
TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHFT64 ||
27122714
TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF ||
27132715
TargetTriple.getEnvironment() == llvm::Triple::EABIHF) {
27142716
TripleAliases.append(begin(ARMebHFTriples), end(ARMebHFTriples));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
511511
case llvm::Triple::thumbeb: {
512512
const bool HF =
513513
Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
514+
Triple.getEnvironment() == llvm::Triple::GNUEABIHFT64 ||
514515
tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard;
515516

516517
LibDir = "lib";

‎clang/test/Preprocessor/time64.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// RUN: %clang_cc1 -E -dM -triple=i686-pc-linux-gnu /dev/null | FileCheck -match-full-lines -check-prefix TIME32 %s
2+
// RUN: %clang_cc1 -E -dM -triple=i686-pc-linux-gnut64 /dev/null | FileCheck -match-full-lines -check-prefix TIME64 %s
3+
// RUN: %clang_cc1 -E -dM -triple=armv5tel-softfloat-linux-gnueabi /dev/null | FileCheck -match-full-lines -check-prefix TIME32 %s
4+
// RUN: %clang_cc1 -E -dM -triple=armv5tel-softfloat-linux-gnueabit64 /dev/null | FileCheck -match-full-lines -check-prefix TIME64 %s
5+
// RUN: %clang_cc1 -E -dM -triple=armv7a-unknown-linux-gnueabihf /dev/null | FileCheck -match-full-lines -check-prefix TIME32 %s
6+
// RUN: %clang_cc1 -E -dM -triple=armv7a-unknown-linux-gnueabihft64 /dev/null | FileCheck -match-full-lines -check-prefix TIME64 %s
7+
//
8+
// TIME32-NOT:#define _FILE_OFFSET_BITS 64
9+
// TIME32-NOT:#define _TIME_BITS 64
10+
//
11+
// TIME64:#define _FILE_OFFSET_BITS 64
12+
// TIME64:#define _TIME_BITS 64

‎llvm/include/llvm/TargetParser/Triple.h‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,13 @@ class Triple {
244244
UnknownEnvironment,
245245

246246
GNU,
247+
GNUT64,
247248
GNUABIN32,
248249
GNUABI64,
249250
GNUEABI,
251+
GNUEABIT64,
250252
GNUEABIHF,
253+
GNUEABIHFT64,
251254
GNUF32,
252255
GNUF64,
253256
GNUSF,
@@ -608,11 +611,12 @@ class Triple {
608611

609612
bool isGNUEnvironment() const {
610613
EnvironmentType Env = getEnvironment();
611-
return Env == Triple::GNU || Env == Triple::GNUABIN32 ||
612-
Env == Triple::GNUABI64 || Env == Triple::GNUEABI ||
613-
Env == Triple::GNUEABIHF || Env == Triple::GNUF32 ||
614-
Env == Triple::GNUF64 || Env == Triple::GNUSF ||
615-
Env == Triple::GNUX32;
614+
return Env == Triple::GNU || Env == Triple::GNUT64 ||
615+
Env == Triple::GNUABIN32 || Env == Triple::GNUABI64 ||
616+
Env == Triple::GNUEABI || Env == Triple::GNUEABIT64 ||
617+
Env == Triple::GNUEABIHF || Env == Triple::GNUEABIHFT64 ||
618+
Env == Triple::GNUF32 || Env == Triple::GNUF64 ||
619+
Env == Triple::GNUSF || Env == Triple::GNUX32;
616620
}
617621

618622
/// Tests whether the OS is Haiku.
@@ -873,9 +877,11 @@ class Triple {
873877
return (isARM() || isThumb()) &&
874878
(getEnvironment() == Triple::EABI ||
875879
getEnvironment() == Triple::GNUEABI ||
880+
getEnvironment() == Triple::GNUEABIT64 ||
876881
getEnvironment() == Triple::MuslEABI ||
877882
getEnvironment() == Triple::EABIHF ||
878883
getEnvironment() == Triple::GNUEABIHF ||
884+
getEnvironment() == Triple::GNUEABIHFT64 ||
879885
getEnvironment() == Triple::OpenHOS ||
880886
getEnvironment() == Triple::MuslEABIHF || isAndroid()) &&
881887
isOSBinFormatELF();
@@ -1059,6 +1065,22 @@ class Triple {
10591065
return getArch() == Triple::bpfel || getArch() == Triple::bpfeb;
10601066
}
10611067

1068+
/// Tests if the target forces 64-bit time_t on a 32-bit architecture.
1069+
bool isTime64ABI() const {
1070+
EnvironmentType Env = getEnvironment();
1071+
return Env == Triple::GNUT64 || Env == Triple::GNUEABIT64 ||
1072+
Env == Triple::GNUEABIHFT64;
1073+
}
1074+
1075+
/// Tests if the target forces hardfloat.
1076+
bool isHardFloatABI() const {
1077+
EnvironmentType Env = getEnvironment();
1078+
return Env == llvm::Triple::GNUEABIHF ||
1079+
Env == llvm::Triple::GNUEABIHFT64 ||
1080+
Env == llvm::Triple::MuslEABIHF ||
1081+
Env == llvm::Triple::EABIHF;
1082+
}
1083+
10621084
/// Tests whether the target supports comdat
10631085
bool supportsCOMDAT() const {
10641086
return !(isOSBinFormatMachO() || isOSBinFormatXCOFF() ||

0 commit comments

Comments
 (0)