clang?

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
moby · Feb 9, 2024 · 1b91e84 · 1b91e84
1 parent 98d811e
commit 1b91e84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hack/dockerfiles/archutil.Dockerfile b/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
 

diff --git a/util/archutil/amd64_binary.go b/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\xbb\xab\x8b\x1e\x54\xe2\x82\xee\x20\x22\x2c\xd2\xab\x21\x21\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\x64\x7e\x50\xbe\x79\x5f\xdf\xcb\x2b\xcd\x9c\xbe\x67\xb7\xee\xde\x36\x18\x83\xc2\xc0\x0d\xc8\x6a\xc3\x96\xb5\x4d\xfe\xeb\xcd\x9f\x2d\xb0\x71\x15\x2b\xb0\xb1\x8a\xaa\xec\xad\x20\x8f\xbd\xa4\xc7\xe9\xd1\x4a\xb1\x91\x49\x5a\x56\x73\xb5\xda\xa7\xb4\x43\xb6\x52\xd5\x57\xa1\xcf\x9c\xec\x39\xed\x51\x7a\x81\x7c\xa5\x95\x9c\x6e\x01\x58\x01\x70\x78\xaf\x8e\xe7\x07\xdf\x0e\xdf\xec\xbf\x78\x15\x7f\xba\xef\xbf\x3d\xb3\x75\x34\x3b\x7a\xff\x0e\x1a\x8d\x46\xa3\xd1\x68\x34\x1a\x8d\x46\xa3\xd1\xfc\xa7\xf0\xdd\xa9\x19\xf3\xf1\xd7\xb5\xc1\x1d\x3e\x01\x30\x4c\x4d\x33\xbe\xce\x80\xe1\xe0\x0a\x4f\xa6\x4c\x36\x7d\x30\x63\x3e\x9a\xb1\xf3\x2f\xc1\x47\x8b\x54\xa2\x6d\x3e\x61\xd4\x9e\x7d\x3d\x9e\x31\x3e\x5e\xb0\xc8\xf8\xbc\xce\x93\xe4\x26\x00\x79\x38\x48\x0f\xe0\xc9\xf4\x5a\xfa\xe0\x6a\xd9\xef\xc8\x72\x84\x2f\xdf\x8b\xbe\x49\xa9\x44\x5d\xe5\x03\xc4\x09\xf2\x1f\x14\xfc\x93\xe4\x37\x0a\xfe\x59\x19\x21\x18\xbf\x72\x06\xe2\xb4\xf2\xcf\x2d\xfb\x17\x4b\xfc\x5a\x89\x8f\xa0\xdf\x14\x35\xd7\xdb\xb9\xb4\xb3\x6f\xb5\xd1\xdb\x45\x6f\x4f\x7a\x70\x1c\x2f\x0c\x9d\x50\xb8\x5d\x01\x27\xf0\x5d\xe1\xc2\x09\x5a\x3e\x60\x85\x4f\x1e\x0b\xd7\x83\x15\x8a\x6e\xa6\x0f\xd5\xa9\xd5\x16\x81\xd5\x68\x45\x96\x17\x35\x1f\xf9\xb5\xa6\x0f\x4b\x04\x7d\xf1\x0f\xde\xf7\x36\x80\x35\xf9\x0f\x15\xf3\x93\xe5\xdc\x04\x85\xfc\x44\x61\xd1\xbb\x5a\x45\x31\xb7\x29\xe4\x35\x25\xf3\x2c\xb7\x3b\x4f\x87\xe6\x3f\xe6\xe6\xd2\xcb\x72\x8c\xea\x53\xa4\xeb\x94\xe1\xfc\x76\x8f\x29\x9f\xda\xfb\xc3\xbe\x3c\x9b\x25\xf3\x4f\x69\xfe\xf2\x5f\xe6\x7f\x04\x00\x00\xff\xff\xa9\xce\xc7\x8f\x30\x13\x00\x00"