Skip to content

Commit 170c051

Browse files
committed
* Use -mno-outline-atomics in linux-arm64.properties to work around linker bug (issue bytedeco/javacpp-presets#1671)
1 parent efd3959 commit 170c051

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
* Use `-mno-outline-atomics` in `linux-arm64.properties` to work around linker bug ([issue bytedeco/javacpp-presets#1671](https://github.com/bytedeco/javacpp-presets/issues/1671))
23
* Add `NativeAllocationTracer` to track allocations and deallocations of `Pointer` ([pull #816](https://github.com/bytedeco/javacpp/pull/816))
34
* Fix Android platform properties for NDK r28 ([pull #812](https://github.com/bytedeco/javacpp/pull/812))
45
* Add support for `windows-arm64` with `windows-arm64.properties` ([pull #813](https://github.com/bytedeco/javacpp/pull/813))

src/main/resources/org/bytedeco/javacpp/properties/linux-arm64.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ platform.compiler.fastfpu=-ffast-math
1515
platform.compiler.nodeprecated=-Wno-deprecated-declarations
1616
platform.compiler.noexceptions=-fno-exceptions -fno-rtti
1717
platform.compiler.nowarnings=-w
18-
platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -Wall -fPIC -pthread -shared -o\u0020
18+
platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -Wall -fPIC -pthread -shared -mno-outline-atomics -o\u0020
1919
platform.linkpath.prefix=-L
2020
platform.linkpath.prefix2=-Wl,-rpath,
2121
platform.linkpath=

src/test/resources/org/bytedeco/javacpp/AdapterTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <optional>
55
#include <functional>
66

7-
std::string testStdString(std::string str) {
7+
std::string testStdString(const std::string &str) {
88
return str;
99
}
1010

0 commit comments

Comments
 (0)