Merge branch 'master' into feat/native-backend-xbox

Author: tustanivsky

.github/workflows/ci.yml

@@ -69,6 +69,12 @@ jobs:
             CC: gcc-9
             CXX: g++-9
             TEST_X86: 1
+          - name: Linux Arm32 (gcc-arm-linux-gnueabihf + qemu-user)
+            os: ubuntu-24.04-arm
+            CC: arm-linux-gnueabihf-gcc
+            CXX: arm-linux-gnueabihf-g++
+            TEST_ARM32: 1
+            TEST_QEMU: 1
           - name: Linux (GCC 9.5.0)
             os: ubuntu-24.04
             CC: gcc-9
@@ -223,6 +229,8 @@ jobs:
       CXX: ${{ matrix.CXX }}
       TEST_X86: ${{ matrix.TEST_X86 }}
       TEST_MINGW: ${{ matrix.TEST_MINGW }}
+      TEST_ARM32: ${{ matrix.TEST_ARM32 }}
+      TEST_QEMU: ${{ matrix.TEST_QEMU }}
       USE_SCCACHE: ${{ matrix.USE_SCCACHE }}
       SCCACHE_GHA_ENABLED: ${{ matrix.USE_SCCACHE && 'true' || '' }}
       ERROR_ON_WARNINGS: ${{ matrix.ERROR_ON_WARNINGS }}
@@ -258,7 +266,7 @@ jobs:
           [ -n "$CC" ] && [ -n "$CXX" ] || { echo "Ubuntu runner configurations require toolchain selection via CC and CXX" >&2; exit 1; }
 
       - name: Installing Linux Dependencies
-        if: ${{ runner.os == 'Linux' && !env['TEST_X86'] && !env['ANDROID_API'] && !matrix.container }}
+        if: ${{ runner.os == 'Linux' && !env['TEST_X86'] && !env['TEST_ARM32'] && !env['ANDROID_API'] && !matrix.container }}
         run: |
           sudo apt update
           # Install common dependencies
@@ -295,6 +303,26 @@ jobs:
           sudo apt update
           sudo apt install cmake "${CC}-multilib" "${CXX}-multilib" zlib1g-dev:i386 libssl-dev:i386 libcurl4-openssl-dev:i386 liblzma-dev:i386
 
+      - name: Installing Linux arm32 Dependencies
+        if: ${{ runner.os == 'Linux' && env['TEST_ARM32'] && !matrix.container }}
+        run: |
+          sudo dpkg --add-architecture armhf
+          sudo apt update
+          sudo apt install -y \
+            cmake \
+            gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+            zlib1g-dev:armhf \
+            libssl-dev:armhf \
+            libcurl4-openssl-dev:armhf \
+            liblzma-dev:armhf \
+            libstdc++6:armhf
+
+      - name: Installing qemu-user
+        if: ${{ runner.os == 'Linux' && env['TEST_QEMU'] && !matrix.container }}
+        run: |
+          sudo apt update
+          sudo apt install -y qemu-user-static binfmt-support
+
       - name: Installing Alpine Linux Dependencies
         if: ${{ contains(matrix.container, 'alpine') }}
         run: |

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # pin@v4.35.1
+        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # pin@v4.35.2
         with:
           languages: ${{ matrix.language }}
 
@@ -64,4 +64,4 @@ jobs:
           cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo && cmake --build build --parallel
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # pin@v4.35.1
+        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # pin@v4.35.2

CHANGELOG.md

@@ -5,11 +5,15 @@
 **Features**:
 
 - Enable experimental `native` backend on Xbox ([#1666](https://github.com/getsentry/sentry-native/pull/1666))
+- Linux: support 32-bit ARM. ([#1659](https://github.com/getsentry/sentry-native/issues/1659))
 
 **Fixes**:
 
 - Linux: handle `ENOSYS` in `read_safely` to fix empty module list in seccomp-restricted environments. ([#1655](https://github.com/getsentry/sentry-native/pull/1655))
 - macOS: avoid stdio deadlock in breakpad exception handler. ([#1656](https://github.com/getsentry/sentry-native/pull/1656))
+- Crashpad: build for 32-bit ARM on Linux. ([#1659](https://github.com/getsentry/sentry-native/issues/1659))
+- Native: build for 32-bit ARM on Linux. ([#1659](https://github.com/getsentry/sentry-native/issues/1659))
+- Inproc: build vendored libunwind for 32-bit ARM on Linux. ([#1659](https://github.com/getsentry/sentry-native/issues/1659))
 
 ## 0.13.7
 

external/crashpad

@@ -304,10 +304,13 @@ PACKED_STRUCT_BEGIN
 typedef struct {
     uint32_t context_flags;
     uint32_t r[13]; // R0-R12
-    uint32_t sp;
-    uint32_t lr;
-    uint32_t pc;
+    uint32_t sp; // R13
+    uint32_t lr; // R14
+    uint32_t pc; // R15
     uint32_t cpsr;
+    uint64_t fpscr;
+    uint64_t fpregs[32]; // D0-D31
+    uint32_t fpextra[8];
 } PACKED_ATTR minidump_context_arm_t;
 PACKED_STRUCT_END
 #endif

src/backends/native/minidump/sentry_minidump_format.h

@@ -273,6 +273,34 @@ ptrace_get_thread_registers(pid_t tid, ucontext_t *uctx)
         SENTRY_DEBUGF("ptrace(PTRACE_GETREGS) failed for thread %d: %s", tid,
             strerror(errno));
     }
+#    elif defined(__arm__)
+    struct user_regs regs;
+    if (ptrace(PTRACE_GETREGS, tid, NULL, &regs) == 0) {
+        // uregs[0..15] = R0..R15, uregs[16] = CPSR
+        uctx->uc_mcontext.arm_r0 = regs.uregs[0];
+        uctx->uc_mcontext.arm_r1 = regs.uregs[1];
+        uctx->uc_mcontext.arm_r2 = regs.uregs[2];
+        uctx->uc_mcontext.arm_r3 = regs.uregs[3];
+        uctx->uc_mcontext.arm_r4 = regs.uregs[4];
+        uctx->uc_mcontext.arm_r5 = regs.uregs[5];
+        uctx->uc_mcontext.arm_r6 = regs.uregs[6];
+        uctx->uc_mcontext.arm_r7 = regs.uregs[7];
+        uctx->uc_mcontext.arm_r8 = regs.uregs[8];
+        uctx->uc_mcontext.arm_r9 = regs.uregs[9];
+        uctx->uc_mcontext.arm_r10 = regs.uregs[10];
+        uctx->uc_mcontext.arm_fp = regs.uregs[11];
+        uctx->uc_mcontext.arm_ip = regs.uregs[12];
+        uctx->uc_mcontext.arm_sp = regs.uregs[13];
+        uctx->uc_mcontext.arm_lr = regs.uregs[14];
+        uctx->uc_mcontext.arm_pc = regs.uregs[15];
+        uctx->uc_mcontext.arm_cpsr = regs.uregs[16];
+        success = true;
+        SENTRY_DEBUGF("Thread %d: captured registers via ptrace, SP=0x%lx", tid,
+            (unsigned long)regs.uregs[13]);
+    } else {
+        SENTRY_DEBUGF("ptrace(PTRACE_GETREGS) failed for thread %d: %s", tid,
+            strerror(errno));
+    }
 #    endif
 
     // Detach from thread
@@ -749,6 +777,35 @@ write_thread_context(
 
     return write_data(writer, &context, sizeof(context));
 
+#    elif defined(__arm__)
+    (void)tid; // Unused on ARM32 - no VFP capture implemented yet
+
+    minidump_context_arm_t context = { 0 };
+    // MD_CONTEXT_ARM | CONTROL | INTEGER — breakpad-style 0x40000000 base
+    // (not Microsoft's 0x00200000; rust-minidump keys off the breakpad value)
+    context.context_flags = 0x40000003;
+
+    // Copy general purpose registers R0-R10 from Linux ucontext
+    context.r[0] = uctx->uc_mcontext.arm_r0;
+    context.r[1] = uctx->uc_mcontext.arm_r1;
+    context.r[2] = uctx->uc_mcontext.arm_r2;
+    context.r[3] = uctx->uc_mcontext.arm_r3;
+    context.r[4] = uctx->uc_mcontext.arm_r4;
+    context.r[5] = uctx->uc_mcontext.arm_r5;
+    context.r[6] = uctx->uc_mcontext.arm_r6;
+    context.r[7] = uctx->uc_mcontext.arm_r7;
+    context.r[8] = uctx->uc_mcontext.arm_r8;
+    context.r[9] = uctx->uc_mcontext.arm_r9;
+    context.r[10] = uctx->uc_mcontext.arm_r10;
+    context.r[11] = uctx->uc_mcontext.arm_fp; // R11 (FP)
+    context.r[12] = uctx->uc_mcontext.arm_ip; // R12 (IP)
+    context.sp = uctx->uc_mcontext.arm_sp;
+    context.lr = uctx->uc_mcontext.arm_lr;
+    context.pc = uctx->uc_mcontext.arm_pc;
+    context.cpsr = uctx->uc_mcontext.arm_cpsr;
+
+    return write_data(writer, &context, sizeof(context));
+
 #    else
 #        error "Unsupported architecture for Linux"
 #    endif
@@ -1285,6 +1342,8 @@ ptrace_capture_thread(
     ptrace_sp = ptrace_ctx.uc_mcontext.sp;
 #    elif defined(__i386__)
     ptrace_sp = ptrace_ctx.uc_mcontext.gregs[REG_ESP];
+#    elif defined(__arm__)
+    ptrace_sp = ptrace_ctx.uc_mcontext.arm_sp;
 #    endif
 
     if (ptrace_sp != 0) {
@@ -1369,6 +1428,8 @@ write_thread_list_stream(minidump_writer_t *writer, minidump_directory_t *dir)
             sp = uctx->uc_mcontext.sp;
 #    elif defined(__i386__)
             sp = uctx->uc_mcontext.gregs[REG_ESP];
+#    elif defined(__arm__)
+            sp = uctx->uc_mcontext.arm_sp;
 #    endif
 
             SENTRY_DEBUGF("Thread %u: has context, SP=0x%llx",

src/backends/native/minidump/sentry_minidump_linux.c

@@ -51,6 +51,16 @@ def get_platform_cmake_args():
         args.append("-AWin32")
     elif sys.platform == "linux" and os.environ.get("TEST_X86"):
         args.append("-DSENTRY_BUILD_FORCE32=ON")
+    elif sys.platform == "linux" and os.environ.get("TEST_ARM32"):
+        args.extend(
+            [
+                "-DCMAKE_SYSTEM_NAME=Linux",
+                "-DCMAKE_SYSTEM_PROCESSOR=arm",
+                "-DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc",
+                "-DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++",
+                "-DCMAKE_ASM_COMPILER=arm-linux-gnueabihf-gcc",
+            ]
+        )
 
     if "asan" in os.environ.get("RUN_ANALYZER", ""):
         args.append("-DWITH_ASAN_OPTION=ON")

tests/build_config.py

@@ -5,6 +5,8 @@
 is_aix = sys.platform == "aix" or sys.platform == "os400"
 is_android = os.environ.get("ANDROID_API")
 is_x86 = os.environ.get("TEST_X86")
+is_arm32 = bool(os.environ.get("TEST_ARM32"))
+is_qemu = bool(os.environ.get("TEST_QEMU"))
 is_asan = "asan" in os.environ.get("RUN_ANALYZER", "")
 is_tsan = "tsan" in os.environ.get("RUN_ANALYZER", "")
 is_kcov = "kcov" in os.environ.get("RUN_ANALYZER", "")

tests/conditions.py

@@ -2,7 +2,7 @@
 import sys
 import os
 import pytest
-from .conditions import has_breakpad, has_crashpad, has_native, is_android
+from .conditions import has_breakpad, has_crashpad, has_native, is_android, is_qemu
 
 
 def test_static_lib(cmake):
@@ -16,7 +16,7 @@ def test_static_lib(cmake):
     )
 
     # on linux we can use `ldd` to check that we don’t link to `libsentry.so`
-    if sys.platform == "linux" and not is_android:
+    if sys.platform == "linux" and not is_android and not is_qemu:
         output = subprocess.check_output("ldd sentry_example", cwd=tmp_path, shell=True)
         assert b"libsentry.so" not in output
 
@@ -40,9 +40,8 @@ def test_static_lib(cmake):
         output = subprocess.check_output(
             "file sentry_example", cwd=tmp_path, shell=True
         )
-        assert (
-            b"ELF 32-bit" if os.environ.get("TEST_X86") else b"ELF 64-bit"
-        ) in output
+        is_32bit = os.environ.get("TEST_X86") or os.environ.get("TEST_ARM32")
+        assert (b"ELF 32-bit" if is_32bit else b"ELF 64-bit") in output
 
 
 @pytest.mark.skipif(not has_crashpad, reason="test needs crashpad backend")

tests/test_build_static.py

@@ -8,7 +8,7 @@
 import pytest
 
 from tests import adb
-from tests.conditions import is_android, is_tsan, is_x86, is_asan
+from tests.conditions import is_android, is_arm32, is_tsan, is_x86, is_asan
 
 project_fixture_path = pathlib.Path("tests/fixtures/dotnet_signal")
 
@@ -67,7 +67,14 @@ def run_dotnet_native_crash(tmp_path):
 
 
 @pytest.mark.skipif(
-    bool(sys.platform != "linux" or is_x86 or is_asan or is_tsan or is_android),
+    bool(
+        sys.platform != "linux"
+        or is_x86
+        or is_arm32
+        or is_asan
+        or is_tsan
+        or is_android
+    ),
     reason="dotnet signal handling is currently only supported on 64-bit Linux without sanitizers",
 )
 def test_dotnet_signals_inproc(cmake):
@@ -171,7 +178,14 @@ def run_aot_native_crash(tmp_path):
 
 
 @pytest.mark.skipif(
-    bool(sys.platform != "linux" or is_x86 or is_asan or is_tsan or is_android),
+    bool(
+        sys.platform != "linux"
+        or is_x86
+        or is_arm32
+        or is_asan
+        or is_tsan
+        or is_android
+    ),
     reason="dotnet AOT signal handling is currently only supported on 64-bit Linux without sanitizers",
 )
 def test_aot_signals_inproc(cmake):