arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-15 17:12:04 +00:00
Code Issues Releases Wiki Activity

fix(core): fix emulator build on Apple Silicon

Browse Source 
[no changelog]
This commit is contained in:
Pavol Rusnak 2021-11-06 23:13:56 +01:00
parent a01516389a
commit a3b83685ef
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/shell.nix
View File

@ -54,7 +54,6 @@ stdenv.mkDerivation ({
clang clang
editorconfig-checker editorconfig-checker
gcc gcc
gcc-arm-embedded
git git
gitAndTools.git-subrepo gitAndTools.git-subrepo
gnumake gnumake
@ -74,6 +73,8 @@ stdenv.mkDerivation ({
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
procps procps
valgrind valgrind
] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [
gcc-arm-embedded # not yet available for aarch64-darwin
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreAudio
darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioToolbox
@ -99,6 +100,11 @@ stdenv.mkDerivation ({
# Used by rust bindgen # Used by rust bindgen
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# don't try to use stack protector for Apple Silicon (emulator) binaries
# it's broken at the moment
hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ];
} // (lib.optionalAttrs fullDeps) { } // (lib.optionalAttrs fullDeps) {
TREZOR_MONERO_TESTS_PATH = moneroTestsPatched; TREZOR_MONERO_TESTS_PATH = moneroTestsPatched;
}) })

5
core/embed/unix/mpconfigport.h
View File

@ -180,6 +180,11 @@
extern const struct _mp_print_t mp_stderr_print; extern const struct _mp_print_t mp_stderr_print;
#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
#define MICROPY_GCREGS_SETJMP (1)
#endif
// coverage support // coverage support
#define MICROPY_PY_SYS_ATEXIT (1) #define MICROPY_PY_SYS_ATEXIT (1)
#define MICROPY_PY_SYS_SETTRACE (1) #define MICROPY_PY_SYS_SETTRACE (1)