Skip to content

Add m68k to Triple.swift #1514

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 2 commits into from
Jan 2, 2024
Merged

Add m68k to Triple.swift #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8af1379
Add `m68k` to `Triple.swift`
MaxDesiatov Dec 27, 2023
d14e172
Update TripleTests.swift
MaxDesiatov Dec 27, 2023
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
7 changes: 6 additions & 1 deletion Sources/SwiftDriver/Utilities/Triple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,8 @@ extension Triple {
case bpfeb
/// Hexagon: hexagon
case hexagon
// M68k: Motorola 680x0 family
case m68k
/// MIPS: mips, mipsallegrex, mipsr6
case mips
/// MIPSEL: mipsel, mipsallegrexe, mipsr6el
Expand Down Expand Up @@ -561,6 +563,8 @@ extension Triple {
return .thumbeb
case "avr":
return .avr
case "m68k":
return .m68k
case "msp430":
return .msp430
case "mips", "mipseb", "mipsallegrex", "mipsisa32r6", "mipsr6":
Expand Down Expand Up @@ -818,7 +822,7 @@ extension Triple {
case .arc, .arm, .armeb, .hexagon, .le32, .mips, .mipsel, .nvptx,
.ppc, .r600, .riscv32, .sparc, .sparcel, .tce, .tcele, .thumb,
.thumbeb, .x86, .xcore, .amdil, .hsail, .spir, .kalimba,.lanai,
.shave, .wasm32, .renderscript32, .aarch64_32:
.shave, .wasm32, .renderscript32, .aarch64_32, .m68k:
return 32

case .aarch64, .aarch64e, .aarch64_be, .amdgcn, .bpfel, .bpfeb, .le64, .mips64,
Expand Down Expand Up @@ -1394,6 +1398,7 @@ extension Triple {
case .kalimba: fallthrough
case .le32: fallthrough
case .le64: fallthrough
case .m68k: fallthrough
case .mips: fallthrough
case .mips64: fallthrough
case .mips64el: fallthrough
Expand Down
13 changes: 13 additions & 0 deletions Tests/SwiftDriverTests/TripleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ final class TripleTests: XCTestCase {
func testBasics() throws {
XCTAssertEqual(Triple("").arch, nil)
XCTAssertEqual(Triple("kalimba").arch, .kalimba)
XCTAssertEqual(Triple("m68k-unknown-linux-gnu").arch, .m68k)
XCTAssertEqual(Triple("x86_64-apple-macosx").arch, .x86_64)
XCTAssertEqual(Triple("blah-apple").arch, nil)
XCTAssertEqual(Triple("x86_64-apple-macosx").vendor, .apple)
Expand Down Expand Up @@ -260,6 +261,11 @@ final class TripleTests: XCTestCase {
XCTAssertEqual(T.vendor, nil)
XCTAssertEqual(T.os, nil)

T = Triple("m68k-unknown-unknown")
XCTAssertEqual(T.arch, Triple.Arch.m68k)
XCTAssertEqual(T.vendor, nil)
XCTAssertEqual(T.os, nil)

T = Triple("sparcel-unknown-unknown")
XCTAssertEqual(T.arch, Triple.Arch.sparcel)
XCTAssertEqual(T.vendor, nil)
Expand Down Expand Up @@ -401,6 +407,12 @@ final class TripleTests: XCTestCase {
XCTAssertEqual(T.os, Triple.OS.haiku)
XCTAssertEqual(T.environment, nil)

T = Triple("m68k-suse-linux-gnu")
XCTAssertEqual(T.arch, Triple.Arch.m68k)
XCTAssertEqual(T.vendor, Triple.Vendor.suse)
XCTAssertEqual(T.os, Triple.OS.linux)
XCTAssertEqual(T.environment, Triple.Environment.gnu)

T = Triple("mips-mti-linux-gnu")
XCTAssertEqual(T.arch, Triple.Arch.mips)
XCTAssertEqual(T.vendor, Triple.Vendor.mipsTechnologies)
Expand Down Expand Up @@ -1376,6 +1388,7 @@ final class TripleTests: XCTestCase {
assertToolchain("armv7hl-suse-linux-gnueabi", GenericUnixToolchain.self)
assertToolchain("i586-pc-haiku", GenericUnixToolchain.self)
assertToolchain("x86_64-unknown-haiku", GenericUnixToolchain.self)
assertToolchain("m68k-suse-linux-gnu", GenericUnixToolchain.self)
assertToolchain("mips-mti-linux-gnu", GenericUnixToolchain.self)
assertToolchain("mipsel-img-linux-gnu", GenericUnixToolchain.self)
assertToolchain("mips64-mti-linux-gnu", GenericUnixToolchain.self)
Expand Down