Skip to content

Adding Loongarch64 to OpenBSD parts #149737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 22, 2025
Merged

Adding Loongarch64 to OpenBSD parts #149737

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b9eedc
OpenBSD in Targets.cpp
nerfur Jul 1, 2025
f30b4b8
OpenBSD in OSTargets.h
nerfur Jul 1, 2025
b446599
Merge pull request #1 from nerfur/openbsd-1
nerfur Jul 1, 2025
60da9e3
OpenBSD in Targets.cpp
nerfur Jul 1, 2025
9d5b9c7
LoongArch on OpenBSD.cpp
nerfur Jul 1, 2025
d1a94a5
Openbsd loongarch on openbsd.c
nerfur Jul 8, 2025
f72c847
Merge branch 'llvm:main' into openbsd
nerfur Jul 8, 2025
c74605b
Merge pull request #2 from nerfur/openbsd
nerfur Jul 8, 2025
5e5e032
Merge branch 'llvm:main' into main
nerfur Jul 20, 2025
804f992
sorting targets
nerfur Jul 22, 2025
e376442
join loongarch64 and riscv64 no-relax
nerfur Jul 22, 2025
f427266
joining --no-relax test with riscv64
nerfur Jul 22, 2025
465109d
killed slipped "space button"
nerfur Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions clang/lib/Basic/Targets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
case llvm::Triple::FreeBSD:
return std::make_unique<FreeBSDTargetInfo<LoongArch64TargetInfo>>(Triple,
Opts);
case llvm::Triple::OpenBSD:
return std::make_unique<OpenBSDTargetInfo<LoongArch64TargetInfo>>(Triple,
Opts);
default:
return std::make_unique<LoongArch64TargetInfo>(Triple, Opts);
}
Expand Down
1 change: 1 addition & 0 deletions clang/lib/Basic/Targets/OSTargets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ class LLVM_LIBRARY_VISIBILITY OpenBSDTargetInfo : public OSTargetInfo<Target> {
this->MCountName = "_mcount";
break;
case llvm::Triple::riscv64:
case llvm::Triple::loongarch64:
break;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also make sure this is sorted, loongarch64 before riscv64.

}
}
Expand Down
6 changes: 6 additions & 0 deletions clang/lib/Driver/ToolChains/OpenBSD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("--no-relax");
}

if (Triple.isLoongArch64()) {
CmdArgs.push_back("-X");
if (Args.hasArg(options::OPT_mno_relax))
CmdArgs.push_back("--no-relax");
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can merge this check with the RISC-V check above this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also there is a space you added.

assert((Output.isFilename() || Output.isNothing()) && "Invalid output.");
if (Output.isFilename()) {
CmdArgs.push_back("-o");
Expand Down
13 changes: 13 additions & 0 deletions clang/test/Driver/openbsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
// CHECK-MIPS64-CPU: "-target-cpu" "mips3"
// CHECK-MIPS64EL-CPU: "-target-cpu" "mips3"

// Check that LoongArch passes the correct linker emulation.
//
// RUN: %clang --target=loongarch64-unknown-openbsd -### %s %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LA64-LD %s
// CHECK-LA64-LD: ld{{.*}}" {{.*}} "-m" "elf64loongarch"
//
// Check options passed to the linker on LoongArch
//
// RUN: %clang --target=loongarch64-unknown-openbsd -mno-relax -### %s %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LA64-LD-OPTS %s
// CHECK-LA64-LD-OPTS: ld{{.*}}" {{.*}} "-X" "--no-relax"
//

// Check that the new linker flags are passed to OpenBSD
// RUN: %clang --target=i686-pc-openbsd -r -### %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LD-R %s
Expand Down