clang?

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

.github/workflows/archutil.yml

@@ -19,16 +19,28 @@ env:
 
 jobs:
   exits:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-22.04
+          - ubuntu-20.04
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21
       -
         name: Prepare
         run: |
           sudo apt-get update
           sudo apt-get install -y cpuid
-      -
-        name: Checkout
-        uses: actions/checkout@v4
+          go install github.com/tonistiigi/go-archvariant/cmd/amd64variant@master
       -
         name: Show cpuinfo
         run: |
@@ -37,6 +49,10 @@ jobs:
         name: Show cpuid
         run: |
           cpuid
+      -
+        name: Show amd64 variant
+        run: |
+          amd64variant
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -54,6 +70,6 @@ jobs:
         name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: archutil-exits
+          name: archutil-exits-${{ matrix.os }}
           path: ${{ env.DESTDIR }}/*
           if-no-files-found: error

hack/dockerfiles/archutil.Dockerfile

@@ -5,8 +5,7 @@ ARG ALPINE_VERSION=3.19
 ARG DEBIAN_VERSION=trixie
 
 FROM debian:${DEBIAN_VERSION}-slim AS base
-RUN apt-get update && apt-get --no-install-recommends install -y git binutils \
-  gcc-x86-64-linux-gnu \
+RUN apt-get update && apt-get --no-install-recommends install -y git binutils clang lld \
   binutils-x86-64-linux-gnu \
   binutils-arm-linux-gnueabihf \
   binutils-aarch64-linux-gnu \
@@ -20,7 +19,7 @@ WORKDIR /src
 
 FROM base AS exit-amd64
 COPY util/archutil/fixtures/exit.amd64.S .
-RUN x86_64-linux-gnu-gcc -O0 -fno-ident -g0 -static -nostdlib -Wa,--noexecstack -o exit exit.amd64.S
+RUN clang -target x86_64-linux-gnu -O0 -g0 -static -nostdlib -o exit exit.amd64.S
 
 FROM base AS exit-386
 COPY util/archutil/fixtures/exit.386.s .
@@ -88,6 +87,7 @@ RUN --mount=type=bind,target=.,rw \
     bin/archutil/mips64le \
     bin/archutil/mips64
   tree -nh bin/archutil
+  cat bin/archutil/amd64_binary.go
   cp bin/archutil/*_binary.go /out
 EOT
 

util/archutil/amd64_binary.go

@@ -6,4 +6,4 @@ package archutil
 // This file is generated by running "make archutil".
 // Do not edit manually.
 
-const Binaryamd64 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xec\x98\x4f\x8b\xd3\x40\x18\xc6\x9f\x89\xed\xae\x0b\x42\xba\x22\x28\xac\x87\xae\x7a\x52\x8c\xee\x22\xe8\x41\x25\xca\xaa\x83\x74\x85\x05\xf7\x6a\x48\x36\x61\x2d\xda\x3f\x34\x93\x5a\xa1\x60\x4b\x4f\x7e\x03\xcf\xfd\x04\xde\xec\xb1\xb7\xe0\x37\x10\x6f\x3d\xe8\xc5\x8b\xde\xac\x20\x4a\x92\x77\x6a\x12\x0d\xf5\xe0\xc1\xc3\xfc\xa0\x3c\x79\x9f\xbe\xef\xcc\xd0\xc9\xa5\xcf\x8b\x3b\xb5\xbb\x1a\x63\x90\x68\xb8\x89\xb8\xaa\x98\x71\x6d\x92\xff\x7a\x7d\xd1\x02\x13\xd7\x50\x82\x89\x15\x94\xe3\xde\x12\xd2\x98\x19\xdd\xa1\xa5\xa5\xa2\x92\x48\x54\x96\x53\xb5\xdc\x4f\x6a\x9b\x6c\xa9\xb2\xaf\x44\x9f\x2a\xad\x57\x65\x66\x46\xcf\x51\xbb\x54\x79\xb6\xbd\x0f\xc2\x5d\xc1\xdf\x53\x49\xcd\x9f\x00\x70\x04\xc0\xbd\x07\xfb\x78\xff\xb9\x7d\xc1\xab\x0d\x1e\xbe\xdc\x7c\xd2\x7b\xf3\xed\xfb\xee\xc7\xbd\xcd\x1a\x14\x0a\x85\x42\xa1\x50\x28\x14\x0a\x85\x42\xa1\xf8\xcf\xe1\x5b\x53\x7d\xcc\x47\x5f\x57\xfb\xf7\xf9\x04\xc0\x20\x32\xf5\xf1\x0d\x06\x0c\xfa\x57\x79\x38\x65\x71\xd3\x5b\x7d\xcc\x87\x33\x76\xe6\x15\xf8\x70\x1e\x49\xb0\xc1\x27\x8c\xda\x93\xaf\x47\x33\xc6\x47\x73\x16\x68\x9f\xd6\x78\x18\xde\x02\x10\x3f\xdc\x8e\x1e\xc0\xc3\xe9\xf5\x68\xe1\x72\xd1\x39\x92\x1c\xe1\xcb\x8f\xbc\x7f\x8c\x52\x89\x7d\x99\x0f\x10\x3a\xf9\x8f\x72\xfe\x71\xf2\x0f\x73\xfe\xe9\xf8\x3f\xbd\xf6\x2b\x67\x20\x4e\x4a\xbf\x9a\xf5\xcf\x16\xf8\xe7\x0b\x7c\x1c\x1c\xec\x34\xb6\x9d\xcb\xbb\x46\x0b\xdd\x2d\x74\xb7\xe1\xf5\xea\x02\x96\xe5\xf8\xbe\xe5\x0b\xbb\x23\x60\x79\xae\x2d\x6c\x58\x5e\xd3\x05\x0c\xff\x79\x43\xd8\x0e\x0c\x5f\x74\x12\x7d\x2c\x9f\x9a\x2d\xe1\x19\x87\xcd\xc0\x70\x82\xfa\x53\xf7\x62\xdd\x85\x21\xbc\x9e\xf8\x37\xf7\xbd\x01\x60\x35\xfe\x85\xf2\xf9\x49\x36\x37\x41\x2e\x3f\x91\x18\x74\x57\x8b\x2c\x65\x91\xdb\xe4\xf2\x9a\xd4\xbd\xe6\x6b\xed\x0f\xe7\x6a\xd3\xfc\xbb\xd4\xbe\xd1\xcb\x72\x94\xea\x53\xa4\x6b\x94\xc5\xfc\xf6\x1e\x53\x3e\x75\x69\xc9\xfe\xeb\x05\xf3\xcf\x68\xfe\xca\x92\xf9\x9f\x01\x00\x00\xff\xff\x16\xbe\x28\x95\x30\x13\x00\x00"
+const Binaryamd64 = "\\x1f\\x8b\\x08\\x00\\x00\\x00\\x00\\x00\\x02\\xff\\xec\\x98\\xc1\\x8b\\xd3\\x40\\x14\\xc6\\xbf\\xc9\\xb6\\xbb\\x2e\\x08\\xd9\\x95\\x15\\xc4\\x05\\x15\\x11\\x6f\\x0d\\x64\\x71\\x59\\x0f\\x2a\\x71\\x41\\x77\\x10\\x11\\x16\\xd9\\xab\\x21\\x35\\xa1\\x16\\xb4\\x2d\\xcd\\xa4\\x54\\x29\\xd8\\xd2\\x8b\\x37\\xaf\\x5e\\xbc\\xe4\\x2f\\xf0\\x58\\x3c\\x48\\xf1\\x60\\xf0\\x3f\\xd0\\x63\\x6f\\x05\\x4f\\xde\\x2c\\x08\\x4a\\x26\\x6f\\x34\\x8d\\x06\\x2f\\x9e\\x96\\xf9\\x41\\xf9\\xe6\\x7d\\x7d\\x2f\\xaf\\x34\\x73\\xfa\\x9e\\xdf\\xba\\x7b\\xdb\\x60\\x0c\\x0a\\x03\\x37\\x20\\xab\\x0d\\x47\\xd6\\x0e\\xf9\\x6f\\x36\\x7f\\xb5\\xc0\\xc1\\x55\\xac\\xc0\\xc1\\x2a\\xaa\\xb2\\xb7\\x82\\x3c\\xce\\x92\\x9e\\xa4\\x47\\x2b\\xc5\\x46\\x26\\x69\\x59\\xcd\\xd5\\x6a\\x9f\\xd2\\x0e\\xd9\\x4a\\x55\\x5f\\x85\\x3e\\x73\\xb2\\xe7\\xb4\\x47\\xe9\\x25\\xf2\\x95\\x56\\x72\\xba\\x05\\x60\\x05\\xc0\\xc1\\xbd\\x23\\xbc\\xd8\\xff\\x7e\\xf0\\x76\\xf7\\xe5\\xeb\\xf8\\xf3\\x7d\\xff\\xdd\\xb9\\xad\\xc3\\xd9\\xe1\\x87\\xf7\\xd0\\x68\\x34\\x1a\\x8d\\x46\\xa3\\xd1\\x68\\x34\\x1a\\x8d\\xe6\\x98\\xc2\\xed\\xa9\\x19\\xf3\\xf1\\xb7\\xb5\\xc1\\x1d\\x3e\\x01\\x30\\x4c\\x4d\\x33\\xbe\\xce\\x80\\xe1\\x60\\x8f\\x27\\x53\\x26\\x9b\\x3e\\x9a\\x31\\x1f\\xcd\\xd8\\xc5\\x57\\xe0\\xa3\\x45\\x2a\\xd1\\x36\\x9f\\x30\\x6a\\xcf\\xbe\\x1e\\xcf\\x18\\x1f\\x2f\\x58\\x64\\x7c\\x59\\xe7\\x49\\x72\\x13\\x80\\x3c\\xec\\xa7\\x07\\xf0\\x64\\x7a\\x2d\\x7d\\x70\\xb5\\xec\\x77\\x64\\x39\\xc2\\xd7\\x1f\\x45\\xdf\\xa4\\x54\\xe2\\x48\\xe5\\x03\\xc4\\x29\\xf2\\x1f\\x14\\xfc\\xd3\\xe4\\x37\\x0a\\xfe\\x79\\x19\\x21\\x18\\xbf\\x73\\x06\\xe2\\xac\\xf2\\x2f\\x2c\\xfb\\x97\\x4b\\xfc\\x5a\\x89\\x8f\\xa0\\xdf\\x14\\x35\\xdb\\xb3\\x1f\\xee\\xed\\x5a\\x6d\\xf4\\x6c\\xf4\\x76\\xa4\\x07\\xd7\\xad\\x87\\xa1\\x1b\\x0a\\xaf\\x2b\\xe0\\x06\\xbe\\x27\\x3c\\xb8\\x41\\xcb\\x07\\xac\\xf0\\xe9\\x13\\xe1\\xd5\\x61\\x85\\xa2\\x9b\\xe9\\x23\\x75\\x6a\\xb5\\x45\\x60\\x35\\x5a\\x91\\x55\\x8f\\x9a\\x8f\\xfd\\x5a\\xd3\\x87\\x25\\x82\\xbe\\xf8\\x0f\\xef\\x7b\\x1b\\xc0\\x9a\\xfc\\x87\\x8a\\xf9\\xc9\\x72\\x6e\\x82\\x42\\x7e\\xa2\\xb0\\xe8\\x5d\\xad\\xa2\\x98\\xdb\\x14\\xf2\\x9a\\x92\\x79\\x96\\xdb\\x9d\\xa7\\x43\\xf3\\x9f\\x72\\x73\\xe9\\x65\\x39\\x41\\xf5\\x19\\xd2\\x75\\xca\\x70\\xfe\\xb8\\xc7\\x94\\x4f\\xed\\xfc\\x65\\x5f\\x9e\\xcd\\x92\\xf9\\x67\\x34\\x7f\\xe5\\x1f\\xf3\\x3f\\x03\\x00\\x00\\xff\\xff\\x43\\xf9\\x69\\x21\\x30\\x13\\x00\\x00"