Merge branch '3.3' into 3.4

Author: 9EOR9

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - id: set-matrix
         name: build matrix
-        uses: rusher/mariadb-test-build-matrix@main
+        uses: mariadb-corporation/connector-ci-build-matrix@main
         with:
           additional-matrix: '[{"name": "MariaDB 11.4 (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4"}]'
 
@@ -128,7 +128,7 @@ jobs:
 
       - name: Setup Test Environment
         id: setup-env
-        uses: rusher/mariadb-test-setup@master
+        uses: mariadb-corporation/connector-ci-setup@master
         with:
           node-version: ${{ matrix.node }}
           db-type: ${{ matrix.db-type }}

libmariadb/ma_context.c

@@ -638,11 +638,19 @@ my_context_destroy(struct my_context *c)
 
 #ifdef MY_CONTEXT_USE_AARCH64_GCC_ASM
 
-#if (defined(__clang__) && (__clang_major__ >= 9)) ||                   \
-        (defined(__GNUC__) && (__GNUC__ > 9 || (__GNUC__ == 9 && __GNUC_MINOR__ >= 1)))
-#define BTI_J_STR "bti j"
+/* According to ARM, the instruction BTI [J][C] is a NOP in ARMv8
+implementations that do not support it. However, the built-in assembler
+in clang 9 through 11 would refuse to emit the instruction unless a
+late enough ARMv8.x-A is specified.
+
+On GCC, we cannot easily detect which assembler is going to be invoked
+to translate the symbolic assembler code to binary. Hence, we will always
+use the numeric encoding in order to be compatible with old assemblers. */
+
+#if defined __clang_major__ && __clang_major__ >= 12
+# define BTI_J_STR "bti j"
 #else
-#define BTI_J_STR ".inst 0xd503241f"
+# define BTI_J_STR ".inst 0xd503249f"
 #endif
 /*
   GCC-aarch64 (arm64) implementation of my_context.