From 5f72dc7d56e30a42d522ee52aabd7bed79473f3b Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 8 Aug 2023 16:17:01 +0200 Subject: [PATCH] More fixes. --- src/codegen_new/codegen_backend_arm64.c | 2 +- src/qt/qt_rendererstack.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/codegen_new/codegen_backend_arm64.c b/src/codegen_new/codegen_backend_arm64.c index 992dd5f5e..48d949406 100644 --- a/src/codegen_new/codegen_backend_arm64.c +++ b/src/codegen_new/codegen_backend_arm64.c @@ -325,7 +325,7 @@ codegen_backend_init(void) codegen_allocator_clean_blocks(block->head_mem_block); - asm("mrs %w0, fpcr\n" + asm("mrs %0, fpcr\n" : "=r"(cpu_state.old_fp_control)); } diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index 84a82d095..88e5a7aa6 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -73,7 +73,8 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index) m_monitor_index = monitor_index; #if defined __unix__ && !defined __HAIKU__ - mousedata.mouse_type = getenv("EMU86BOX_MOUSE"), auto_mouse_type[16]; + char auto_mouse_type[16]; + mousedata.mouse_type = getenv("EMU86BOX_MOUSE"); if (!mousedata.mouse_type || (mousedata.mouse_type[0] == '\0') || !stricmp(mousedata.mouse_type, "auto")) { if (QApplication::platformName().contains("wayland")) strcpy(auto_mouse_type, "wayland");