try more

Author: dkm

.github/actions/build-gcc/action.yml

@@ -14,6 +14,14 @@ inputs:
     description: 'Filename with expected warnings'
     required: true
 
+  glibc_assertion:
+    description: 'Enable GLIBC_ASSERTION for extra runtime checks'
+    default: false
+
+  enable_multilib:
+    description: 'Enable multilib'
+    default: true
+
 # outputs:
 #   random-number:
 #     description: "Random number"
@@ -53,11 +61,20 @@ runs:
       run: |
            mkdir -p gccrs-build;
            cd gccrs-build;
-           ${{ inputs.extra-configure-env }}
+           if ${{ inputs.glibc_assertion }}; then
+              export CXXFLAGS="$CXXFLAGS -D_GLIBCXX_ASSERTIONS"
+           fi
+
+           if ${{ inputs.enable_multilib }}; then
+              MULTILIB_FLG=--enable-multilib
+           else
+              MULTILIB_FLG=--disable-multilib
+           fi
+
            ../configure \
                --enable-languages=rust \
                --disable-bootstrap \
-               --disable-multilib
+               $MULTILIB_FLG
 
     - name: Build GCC
       shell: bash

.github/workflows/ccpp.yml

@@ -30,7 +30,48 @@ jobs:
           extra-configure-env: ''
           run_test_flags: '--target_board=unix\{-m64}'
           warning_file: 'log_expected_warnings'
+          enable_multilib: false
 
+  build-and-check-ubuntu-64bit-glibcxx:
+
+    env:
+      # Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
+      LC_ALL: C.UTF-8
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - id: build-and-test
+        uses: ./.github/actions/build-gcc
+        with:
+          extra-configure-env: ''
+          run_test_flags: '--target_board=unix\{-m64}'
+          warning_file: 'glibcxx_ubuntu64b_log_expected_warnings'
+          glibc_assertion: true
+          enable_multilib: false
+
+
+## This is redundant with 64bit as we are doing multilib. Should build once and test both.
+  build-and-check-ubuntu-32bit:
+    env:
+      # Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
+      LC_ALL: C.UTF-8
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - id: build-and-test
+        uses: ./.github/actions/build-gcc
+        with:
+          extra-configure-env: ''
+          run_test_flags: '--target_board=unix\{-m32}'
+          warning_file: 'log_expected_warnings'
+          glibc_assertion: true
+          enable_multilib: true
 #   build-and-check-ubuntu-64bit-glibcxx:
 
 #     env: