Skip to content

Commit 4eb4ebf

Browse files
committed
Hook up OpenBSD 64-bit PowerPC support
1 parent 654e8aa commit 4eb4ebf

File tree

7 files changed

+13
-2
lines changed

7 files changed

+13
-2
lines changed

clang/lib/Basic/Targets.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ TargetInfo *AllocateTarget(const llvm::Triple &Triple,
346346
return new FreeBSDTargetInfo<PPC64TargetInfo>(Triple, Opts);
347347
case llvm::Triple::NetBSD:
348348
return new NetBSDTargetInfo<PPC64TargetInfo>(Triple, Opts);
349+
case llvm::Triple::OpenBSD:
350+
return new OpenBSDTargetInfo<PPC64TargetInfo>(Triple, Opts);
349351
case llvm::Triple::AIX:
350352
return new AIXPPC64TargetInfo(Triple, Opts);
351353
default:
@@ -358,6 +360,8 @@ TargetInfo *AllocateTarget(const llvm::Triple &Triple,
358360
return new LinuxTargetInfo<PPC64TargetInfo>(Triple, Opts);
359361
case llvm::Triple::NetBSD:
360362
return new NetBSDTargetInfo<PPC64TargetInfo>(Triple, Opts);
363+
case llvm::Triple::OpenBSD:
364+
return new OpenBSDTargetInfo<PPC64TargetInfo>(Triple, Opts);
361365
default:
362366
return new PPC64TargetInfo(Triple, Opts);
363367
}

clang/lib/Basic/Targets/OSTargets.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ class LLVM_LIBRARY_VISIBILITY OpenBSDTargetInfo : public OSTargetInfo<Target> {
476476
case llvm::Triple::mips64:
477477
case llvm::Triple::mips64el:
478478
case llvm::Triple::ppc:
479+
case llvm::Triple::ppc64:
480+
case llvm::Triple::ppc64le:
479481
case llvm::Triple::sparcv9:
480482
this->MCountName = "_mcount";
481483
break;

clang/lib/Basic/Targets/PPC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public PPCTargetInfo {
418418
ABI = "elfv1";
419419
}
420420

421-
if (Triple.isOSFreeBSD() || Triple.isMusl()) {
421+
if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) {
422422
LongDoubleWidth = LongDoubleAlign = 64;
423423
LongDoubleFormat = &llvm::APFloat::IEEEdouble();
424424
}

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,8 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
18831883
if (T.isOSBinFormatELF()) {
18841884
switch (getToolChain().getArch()) {
18851885
case llvm::Triple::ppc64: {
1886-
if (T.isMusl() || (T.isOSFreeBSD() && T.getOSMajorVersion() >= 13))
1886+
if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
1887+
T.isOSOpenBSD() || T.isMusl()
18871888
ABIName = "elfv2";
18881889
else
18891890
ABIName = "elfv1";

clang/test/Driver/ppc-abi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// RUN: %clang -target powerpc64-unknown-freebsd12 %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv1 %s
2121
// RUN: %clang -target powerpc64-unknown-freebsd13 %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv2-BE %s
2222
// RUN: %clang -target powerpc64-unknown-freebsd14 %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv2-BE %s
23+
// RUN: %clang -target powerpc64-unknown-openbsd %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv2-BE-PIE %
2324
// RUN: %clang -target powerpc64-linux-musl %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv2-BE-PIE %s
2425

2526
// CHECK-ELFv1: "-mrelocation-model" "static"

clang/test/Preprocessor/init-ppc64.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,7 @@
10621062
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-freebsd11 -target-abi elfv1 -xc /dev/null | FileCheck --check-prefix=PPC64-ELFv1 %s
10631063
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-freebsd12 -target-abi elfv1 -xc /dev/null | FileCheck --check-prefix=PPC64-ELFv1 %s
10641064
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-freebsd13 -target-abi elfv2 -xc /dev/null | FileCheck --check-prefix=PPC64-ELFv2 %s
1065+
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-openbsd -target-abi elfv2 -xc /dev/null | FileCheck --check-prefix=PPC64-ELFv2 %s
10651066
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-linux-musl -target-abi elfv2 -xc /dev/null | FileCheck --check-prefix=PPC64-ELFv2 %s
10661067

10671068
// PPC64-ELFv1:#define _CALL_ELF 1

clang/test/Preprocessor/init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7321,6 +7321,8 @@
73217321
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-unknown-openbsd6.1-gnueabi < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
73227322
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
73237323
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
7324+
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
7325+
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64le-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
73247326
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
73257327
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips64el-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s
73267328
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s

0 commit comments

Comments
 (0)