Skip to content

Commit 7cc7e27

Browse files
committed
revert: refactor: non-copyable Mbox
This reverts commit 1111419, reversing changes made to 06f9a2c.
1 parent b76517b commit 7cc7e27

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SWIFT := swift
77
SWIFT_BUILD_FLAGS := --triple $(TRIPLE) -c release -Xswiftc -Osize \
88
--experimental-lto-mode=full -Xswiftc -experimental-hermetic-seal-at-link
99
LD := clang -fuse-ld=lld
10-
LDFLAGS := --target=$(TRIPLE) -nostdlib -static -Wl,--gc-sections,--print-gc-sections,--strip-all,--allow-multiple-definition
10+
LDFLAGS := --target=$(TRIPLE) -nostdlib -static -Wl,--gc-sections,--print-gc-sections,--strip-all
1111
OBJCOPY := llvm-objcopy
1212
QEMU := qemu-system-aarch64
1313

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ let package = Package(
3535
),
3636
.target(
3737
name: "RaspberryPi",
38-
dependencies: ["Font", "Support", "AsmSupport"],
38+
dependencies: ["Font", "AsmSupport"],
3939
swiftSettings: swiftSettings + [
4040
.enableExperimentalFeature("Volatile")
4141
],
4242
),
4343
.target(name: "Font", swiftSettings: swiftSettings),
44-
.target(name: "Support", swiftSettings: swiftSettings),
4544
.target(name: "AsmSupport"),
4645
],
4746
)

Sources/RaspberryPi/mbox.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let mboxFull: UInt32 = 0x8000_0000
1313
let mboxEmpty: UInt32 = 0x4000_0000
1414

1515
@_alignment(16)
16-
struct Mbox: ~Copyable {
16+
struct Mbox {
1717
var `0`: UInt32 = 0
1818
var `1`: UInt32 = 0
1919
var `2`: UInt32 = 0

Sources/Support/memset.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)