Skip to content

Commit 4dc0249

Browse files
committed
remove -mbranch-protection=standard from tune args
compiling with -mbranch-protection=standard appears to cause a crash on aarch64 (at least, on my CM4); until this is further investigated, remove this from the tune args.
1 parent 2489fc4 commit 4dc0249

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

classes/swift-cmake-base.bbclass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ inherit cmake
33
# avoid conflicts with meta-clang
44
TOOLCHAIN = "gcc"
55

6+
TARGET_CC_ARCH:remove = "-mbranch-protection=standard"
7+
68
DEPENDS:append = " swift-native libgcc gcc glibc "
79

810
SWIFT_TARGET_NAME = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7-unknown-linux-gnueabihf', '${TARGET_ARCH}-unknown-linux-gnu', d)}"

classes/swift.bbclass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# avoid conflicts with meta-clang
22
TOOLCHAIN = "gcc"
33

4+
TARGET_CC_ARCH:remove = "-mbranch-protection=standard"
5+
46
SWIFT_BUILD_TESTS ?= "${DEBUG_BUILD}"
57

68
DEPENDS += "swift-native glibc gcc libgcc swift-stdlib libdispatch swift-foundation"

0 commit comments

Comments
 (0)