Skip to content

Commit 137e024

Browse files
committed
Update amd64 opt flags
1 parent 0da5279 commit 137e024

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/build_debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: [11, 12, "trixie"]
17-
arch: [ "armhf.arm32v7.max.-march=armv7-a+simd", "arm64.arm64v8.cortex-a53.-march=armv8-a+simd", "amd64.amd64.max.-mssse3", "mips64le.mips64le.MIPS64R2-generic", "s390x.s390x.max", "ppc64le.ppc64le.power8", "riscv64.riscv64.rv64" ]
17+
arch: [ "armhf.arm32v7.max.-march=armv7-a+simd", "arm64.arm64v8.cortex-a53.-march=armv8-a+simd", "amd64.amd64.max.-mssse3 -mavx -mvzeroupper", "mips64le.mips64le.MIPS64R2-generic", "s390x.s390x.max", "ppc64le.ppc64le.power8", "riscv64.riscv64.rv64" ]
1818
exclude:
1919
- version: 11
2020
arch: "riscv64.riscv64.rv64"

.github/workflows/build_redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: [ 9 ]
17-
arch: [ "amd64.amd64.max.-mssse3" ]
17+
arch: [ "amd64.amd64.max.-mssse3 -mavx -mvzeroupper" ]
1818

1919
steps:
2020
- name: Checkout repository

.github/workflows/build_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: [ "20.04", "22.04", "24.04" ]
17-
arch: [ "armhf.arm32v7.max.-march=armv7-a+simd", "arm64.arm64v8.cortex-a53.-march=armv8-a+simd", "amd64.amd64.max.-mssse3", "riscv64.riscv64.rv64"]
17+
arch: [ "armhf.arm32v7.max.-march=armv7-a+simd", "arm64.arm64v8.cortex-a53.-march=armv8-a+simd", "amd64.amd64.max.-mssse3 -mavx -mvzeroupper", "riscv64.riscv64.rv64"]
1818
exclude:
1919
- version: "20.04"
2020
arch: "riscv64.riscv64.rv64"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ deb_docker: /opt/qemu/bin
104104
if ! ls /proc/sys/fs/binfmt_misc | grep -q qemu ; then sudo ./scripts/qemu/qemu-binfmt-conf.sh --qemu-path /opt/qemu/bin --persistent yes; fi
105105
cp -a Makefile docker/src/
106106
TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) -f docker/Dockerfile.debian docker && \
107-
docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) CFLAGS=$(CFLAGS) && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make deb"
107+
docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=/build/. /build' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) CFLAGS='$(CFLAGS)' && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make deb"
108108
docker image ls -q "wfb-ng:build-*" | uniq | tail -n+6 | while read i ; do docker rmi -f $$i; done
109109

110110
rpm_docker: /opt/qemu/bin
111111
@if ! [ -d /opt/qemu ]; then echo "Docker cross build requires patched QEMU!\nApply ./scripts/qemu/qemu.patch to qemu-7.2.0 and build it:\n ./configure --prefix=/opt/qemu --static --disable-system && make && sudo make install"; exit 1; fi
112112
if ! ls /proc/sys/fs/binfmt_misc | grep -q qemu ; then sudo ./scripts/qemu/qemu-binfmt-conf.sh --qemu-path /opt/qemu/bin --persistent yes; fi
113113
cp -a Makefile docker/src/
114114
TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) -f docker/Dockerfile.redhat docker && \
115-
docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) CFLAGS=$(CFLAGS) && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make rpm"
115+
docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=/build/. /build' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) CFLAGS='$(CFLAGS)' && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make rpm"
116116
docker image ls -q "wfb-ng:build-*" | uniq | tail -n+6 | while read i ; do docker rmi -f $$i; done

0 commit comments

Comments
 (0)