Merge branch 'master' into deploy

Conflicts:
	README.md
	build/Makefile
	external/bootlin-toolchains/Makefile
	external/qemu/Makefile

Author: mpe

README.md

@@ -69,6 +69,7 @@ There are images for various toolchains, they are encoded in the distro name/ver
  - `[email protected]`: Ubuntu 20.04, gcc 9.4.0, binutils 2.34
  - `[email protected]`: Ubuntu 18.04, gcc 7.5.0, binutils 2.30
  - `[email protected]`: Ubuntu 16.04, gcc 5.4.0, binutils 2.26.1
+ - `fedora@40`: Fedora 40, gcc 14.0.1, binutils 2.41-34, clang 18.1.1
  - `fedora@39`: Fedora 39, gcc 13.2.1, binutils 2.40-14, clang 17.0.6
  - `fedora@38`: Fedora 38, gcc 12.2.1, binutils 2.39-3, clang 16.0.2
  - `fedora@37`: Fedora 37, gcc 12.2.1, binutils 2.38-5, clang 15.0.7

build/Makefile

@@ -1,6 +1,6 @@
 all: help
 
-export FEDORA_LATEST := 39
+export FEDORA_LATEST := 40
 
 x86 = $(filter x86_64,$(shell uname -m))
 isa_3 = $(filter arch_3_00,$(shell LD_SHOW_AUXV=1 /bin/true))
@@ -16,7 +16,7 @@ endif
 
 UBUNTU_DISTROS += [email protected] [email protected] [email protected] ubuntu
 
-FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@38 fedora@37 fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
+FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@39 fedora@38 fedora@37 fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
 KORG_DISTROS := [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
 DOCS_DISTRO := docs@${UBUNTU_LATEST}

build/scripts/image.sh

@@ -17,9 +17,9 @@ fi
 
 image="linuxppc/build:$distro-$version"
 
-from="docker.io/$distro:$version"
-
-if [[ "$distro" == "docs" ]]; then
+if [[ "$distro" == "fedora" ]]; then
+    from="registry.fedoraproject.org/$distro:$version"
+elif [[ "$distro" == "docs" ]]; then
     from="docker.io/ubuntu:$version"
 elif [[ "$distro" == "allcross" ]]; then
     from="docker.io/debian:$version"
@@ -32,6 +32,8 @@ elif [[ "$distro" == "korg" ]]; then
     else
         from="docker.io/ubuntu:20.04"
     fi
+else
+    from="docker.io/$distro:$version"
 fi
 
 if [[ "$task" == "image" ]]; then

external/bootlin-toolchains/.gitignore

@@ -0,0 +1,7 @@
+powerpc-440fp--glibc--stable-2024.02-1
+powerpc-e300c3--glibc--stable-2024.02-1
+powerpc-e500mc--glibc--stable-2024.02-1
+powerpc64-e5500--glibc--stable-2024.02-1
+powerpc64-e6500--glibc--stable-2024.02-1
+powerpc64-power8--glibc--stable-2024.02-1
+powerpc64le-power8--glibc--stable-2024.02-1

external/bootlin-toolchains/Makefile

@@ -21,7 +21,7 @@ ARCHES := powerpc-440fp \
 	powerpc64-e5500 \
 	powerpc64-e6500 \
 	powerpc64-power8 \
-	powerpc64le-power8 
+	powerpc64le-power8
 
 VERSIONS := glibc--stable-2024.02-1
 
@@ -66,9 +66,9 @@ prepare: download
 build:
 
 clean:
-	@:
+	rm -f *.tar.bz2
 
 distclean: clean
-	rm -rf $(CLEAN_DIRS) *.tar.xz
+	rm -rf $(CLEAN_DIRS)
 
 .PHONY: download prepare build clean distclean help

external/qemu/Makefile

@@ -4,9 +4,10 @@ VERSIONS := 4.2.1 \
 	7.0.0 \
 	7.1.0 \
 	7.2.3 \
-	8.2.1
+	8.2.3 \
+	9.0.0
 
-DEFAULT_VERSION = 7.2.3
+DEFAULT_VERSION = 8.2.3
 
 help:
 	@echo "qemu"

lib/qemu.py

@@ -82,6 +82,8 @@ def apply_defaults(self):
         if self.machine_is('pseries'):
             if self.accel == 'tcg':
                 self.machine_caps += ['cap-htm=off']
+            else:
+                self.__set_spectre_v2_caps()
 
             if self.cpu and self.accel == 'kvm':
                 if self.cpu != 'host':
@@ -243,6 +245,19 @@ def prepare_cloud_image(self):
             self.cmdline.insert(0, 'systemd.mask=hcn-init.service systemd.hostname=fedora')
             self.cmdline.insert(0, f'root=/dev/vd{cloud_drive}5 rootfstype=btrfs rootflags=subvol=root')
 
+    def __set_spectre_v2_caps(self):
+        try:
+            body = open('/sys/devices/system/cpu/vulnerabilities/spectre_v2', 'r').read()
+        except (FileNotFoundError, PermissionError):
+            # Should be readable, but continue anyway and cross fingers
+            return
+
+        for s in ['Indirect branch cache disabled', 'Software count cache flush']:
+            if s in body:
+                return
+
+        self.machine_caps += ['cap-ccf-assist=off']
+
     def cmd(self):
         logging.info('Using qemu version %s.%s "%s"' % get_qemu_version(self.qemu_path))