Merge branch 'seL4:master' into bcm-pl011-uart-fix

seL4 · Feb 26, 2024 · b177ad8 · b177ad8
2 parents 90395bd + b67281a
commit b177ad8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git a/.github/workflows/prqueue.yml b/.github/workflows/prqueue.yml
diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml
@@ -33,11 +33,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        march: [armv7a, armv8a, nehalem]
+        # There is no "rv32imac" hardware yet.
+        march: [armv7a, armv8a, nehalem, rv64imac]
         compiler: [gcc, clang]
-        include:
-          - march: rv64imac
-            compiler: gcc
     steps:
     - name: Build
       uses: seL4/ci-actions/sel4test-hw@master
@@ -46,7 +44,7 @@ jobs:
         compiler: ${{ matrix.compiler }}
         sha: ${{ github.event.pull_request.head.sha }}
     - name: Upload images
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: images-${{ matrix.march }}-${{ matrix.compiler }}
         path: '*-images.tar.gz'
@@ -78,13 +76,13 @@ jobs:
       matrix: ${{ fromJson(needs.the_matrix.outputs.matrix) }}
     steps:
       - name: Get machine queue
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: seL4/machine_queue
           path: machine_queue
           token: ${{ secrets.PRIV_REPO_TOKEN }}
       - name: Download image
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: images-${{ matrix.march }}-${{ matrix.compiler }}
       - name: Run

diff --git a/.github/workflows/sel4test-sim.yml b/.github/workflows/sel4test-sim.yml
@@ -21,11 +21,6 @@ jobs:
       matrix:
         march: [armv7a, armv8a, nehalem, rv32imac, rv64imac]
         compiler: [gcc, clang]
-        exclude:
-          - march: rv32imac
-            compiler: clang
-          - march: rv64imac
-            compiler: clang
     steps:
     - uses: seL4/ci-actions/sel4test-sim@master
       with:

diff --git a/libutils/include/utils/auto.h b/libutils/include/utils/auto.h
@@ -15,12 +15,14 @@
  * adjacent macro. Sample usage:
  *
  *     void foo(void) {
- *       autofree int *x = malloc(sizeof(int));
+ *       AUTOFREE int *x = malloc(sizeof(int));
  *       // no need to call free(x)
  *     }
  */
-static inline void autofree_(void *p) {
-    void **q = (void**)p;
+static inline void autofree_(void *p)
+{
+    void **q = (void **)p;
     free(*q);
 }
+
 #define AUTOFREE __attribute__((cleanup(autofree_)))