Upgrade GCC 13.2.0 version (PPU-SPU)

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
           - runner: ubuntu-latest
             os: linux
 
-          - runner: macos-15-intel
+          - runner: macos-26-intel
             os: macos
 
           - runner: macos-26
@@ -92,6 +92,22 @@ jobs:
         working-directory: ./build
         run: ../download.sh
 
+      - name: Show host GCC version
+        shell: bash
+        run: |
+          echo "which gcc: $(command -v gcc || true)"
+          echo "which g++: $(command -v g++ || true)"
+          echo "which cc:  $(command -v cc || true)"
+          echo "----- gcc --version -----"
+          gcc --version
+          echo "----- g++ --version -----"
+          g++ --version
+          echo "----- cc --version -----"
+          cc --version
+          echo "----- gcc -dumpfullversion / -dumpmachine -----"
+          gcc -dumpfullversion -dumpversion
+          gcc -dumpmachine
+
       - name: Build Binutils (PPU)
         run: ./toolchain.sh 001
 

.github/workflows/deploy-docker.yaml

@@ -0,0 +1,64 @@
+name: ci-docker
+on:
+  pull_request:
+    branches:
+      - master
+
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ['master']
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  dockerhub-push:
+    # Always skipped. Pushing :latest needs the DockerHub environment, which
+    # fails closed in a few seconds when those secrets are unavailable.
+    if: false
+    runs-on: ubuntu-latest
+    environment: DockerHub
+    env:
+      DOCKERHUB_REPONAME: ps3dev
+    strategy:
+      matrix:
+        platform: [linux/amd64]
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v4    
+
+      - name: README to Dockerhub
+        uses: christian-korneck/update-container-description-action@v1
+        env:
+          DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASS: ${{ secrets.DOCKERHUB_TOKEN }}
+        with:
+          destination_container_repo: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPONAME }}
+          provider: dockerhub
+          short_description: 'A Docker Image for PS3 Development'
+          readme_file: 'README.md'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ matrix.platform }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3          
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ matrix.platform }}
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPONAME }}:latest

.github/workflows/deploy.yaml

@@ -1,11 +1,24 @@
-name: Build toolchain docker image
+name: ci
 
 on:
   workflow_dispatch
 
 jobs:
-  Docker:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        architecture: [x64]
+    defaults:
+      run:
+        shell: bash
+
+    outputs:
+      sha8: ${{ steps.slug.outputs.sha8 }}
+      date: ${{ steps.date.outputs.date }}
+
     steps:
     - name: Checkout
       uses: actions/checkout@v6
@@ -23,19 +36,13 @@ jobs:
       if: success()
       id: prepare
       run: |
-        echo ::set-output name=docker_platforms::linux/amd64,linux/386
-        echo ::set-output name=docker_username::miigotu
-        echo ::set-output name=github_image::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/ps3dev
-        VERSION_TAG=${GITHUB_REF#refs/*/}
-        echo ::set-output name=version::${VERSION_TAG%/merge}
-    - name: Available platforms
-      if: success()
-      run: echo ${{ steps.buildx.outputs.platforms }}
-    - name: Docker Login and set build command
-      if: success()
-      id: login
-      env:
-        GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        sudo apt update
+        sudo apt -y install autoconf automake bison flex gcc g++ libelf-dev make texinfo libncurses5-dev patch python2-dev subversion wget zlib1g-dev libtool-bin python-dev-is-python3 bzip2 libgmp3-dev pkg-config libssl-dev && \
+        if [ "$(uname -m)" = "x86_64" ]; then sudo apt install -y nvidia-cg-toolkit ; fi
+
+    - name: Install macOS requirements
+      if: startsWith(matrix.os, 'macos')
+      # act -P macos-latest=-self-hosted --container-architecture linux/amd64
       run: |
         echo "${GITHUB_PASSWORD}" | docker login --username "${{ steps.prepare.outputs.docker_username }}" --password-stdin docker.pkg.github.com
         echo ::set-output name=buildx::$(echo docker buildx build --output type=image,name=${{ steps.prepare.outputs.github_image }},push=true \
@@ -52,12 +59,51 @@ jobs:
     - name: Run Buildx (master)
       if: success() && steps.prepare.outputs.version == 'master' && github.event_name != 'pull_request'
       run: |
-          ${{ steps.login.outputs.buildx }} --tag "${{ steps.prepare.outputs.github_image }}:latest" --file Dockerfile .
-    - name: Run Buildx (non-master)
-      if: success() && steps.prepare.outputs.version != 'master' && github.event_name != 'pull_request'
-      run: |
-        ${{ steps.login.outputs.buildx }} --file Dockerfile .
-    - name: Clear
-      if: always()
+        . ~/.bashrc
+        mkdir -p $PWD/ps3dev
+        export PS3DEV=$PWD/ps3dev
+        export PSL1GHT=$PS3DEV
+        export PATH=$PATH:$PS3DEV/bin
+        export PATH=$PATH:$PS3DEV/ppu/bin
+        export PATH=$PATH:$PS3DEV/spu/bin
+        export PATH=$PATH:$PS3DEV/portlibs/ppu/bin
+        export PKG_CONFIG_PATH=$PS3DEV/portlibs/ppu/lib/pkgconfig
+        ./toolchain.sh
+
+    - name: Compress ps3dev folder
       run: |
-        rm -rf ${HOME}/.docker/config.json
+        tar -zcvf ps3dev-${{matrix.os}}-${{steps.arch.outputs.arch}}-${{steps.date.outputs.date}}.tar.gz ps3dev
+
+    - name: Archive Folder
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{matrix.os}}-${{matrix.architecture}}
+        path: ps3dev-*.tar.gz
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download all Artifact
+        uses: actions/download-artifact@v4
+
+      - name: Set SemVer
+        id: semver
+        run: echo "::set-output name=semver::0.1.0+${{ needs.build.outputs.date }}.${{ needs.build.outputs.sha8 }}"
+
+      - name: Create Tag
+        uses: negz/create-tag@v1
+        with:
+          version: ${{ steps.semver.outputs.semver }}
+          message: "automatic tag creation"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.semver.outputs.semver }}
+          files: |
+            ${{ github.workspace }}/**/*.tar.gz
+

.gitignore

@@ -1,4 +1,6 @@
-/build
 /archives/*
 !/archives/archives.txt
 /ps3dev
+.DS_Store
+.idea/**
+.vscode

Dockerfile

@@ -1,27 +1,50 @@
-# FROM ubuntu:xenial
-FROM debian:12-slim
+# Stay on Debian 12 so the host-linked cross gcc needs only glibc 2.36
+# (Bookworm). Building on Trixie produces GLIBC_2.38+ binaries that fail
+# on Debian 12 and similar hosts.
+FROM debian:12-slim AS base
 LABEL maintainer="miigotu@gmail.com"
 
-ENV PS3DEV /usr/local/ps3dev
-ENV PSL1GHT ${PS3DEV}
-ENV PATH ${PATH}:${PS3DEV}/bin:${PS3DEV}/ppu/bin:${PS3DEV}/spu/bin
+ENV PS3DEV=/usr/local/ps3dev \
+    PSL1GHT=/usr/local/ps3dev \
+    DEBIAN_FRONTEND=noninteractive \
+    PYTHON_VERSION=3.10 \
+    PYENV_ROOT=/root/.pyenv \
+    PIP_ROOT_USER_ACTION=ignore \
+    PKG_CONFIG_PATH=/usr/local/ps3dev/portlibs/ppu/lib/pkgconfig
+ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}:${PS3DEV}/bin:${PS3DEV}/ppu/bin:${PS3DEV}/spu/bin:${PS3DEV}/portlibs/ppu/bin"
 
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN \
-  apt-get -y update && \
-  apt-get -y install \
-  autoconf bison build-essential ca-certificates flex git libelf-dev\
-  libgmp-dev libncurses5-dev libssl-dev libtool-bin pkg-config \
-  texinfo wget zlib1g-dev && \
-  apt-get -y clean autoclean autoremove && \
-  rm -rf /var/lib/{apt,dpkg,cache,log}/
+RUN apt-get update -y && \
+    apt-get --no-install-recommends install -y autoconf automake bison build-essential bzip2 \
+    ca-certificates cmake flex gettext-base git libelf-dev libgmp3-dev libncurses5-dev libssl-dev \
+    libtool libtool-bin make patch pkg-config texinfo wget xz-utils zlib1g-dev && \
+    # Fixes certificate errors with letsencrypt in ARMv7
+    echo 'ca_certificate=/etc/ssl/certs/ca-certificates.crt' >> /etc/wgetrc && \
+    # nvidia-cg-toolkit is non-free and amd64-only
+    if [ "$(uname -m)" = "x86_64" ]; then \
+      sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list && \
+      apt-get update -y && apt-get install -y nvidia-cg-toolkit ; \
+    fi && \
+    # pyenv
+    apt-get --no-install-recommends install -y zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev \
+    llvm libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev curl git && \
+    echo 'cacert=/etc/ssl/certs/ca-certificates.crt' >> ~/.curlrc && \
+    git config --global http.sslverify 'false' && \
+    curl https://pyenv.run | bash && \
+    pyenv update && pyenv install $PYTHON_VERSION && pyenv global $PYTHON_VERSION && pyenv rehash && \
+    pip install pycrypto && \
+    apt-get -y clean autoclean autoremove && \
+    rm -rf /var/lib/apt/lists/*
 
+FROM base AS builder
 RUN mkdir /build
 WORKDIR /build
 COPY . /build
+RUN mkdir -p "${PS3DEV}" && /build/toolchain.sh
 
-# Fixes certificate errors with letsencrypt in ARMv7
-# RUN echo "\nca_certificate=/etc/ssl/certs/ca-certificates.crt" | tee -a /etc/wgetrc
-# RUN /build/toolchain.sh
+FROM base AS runtime
+COPY --from=builder ${PS3DEV} ${PS3DEV}
 
+# How to build and run a multi platform image
+# Tested platforms: linux/amd64 or linux/arm64
+# DOCKER_DEFAULT_PLATFORM=linux/arm64 docker build . -t ps3dev
+# DOCKER_DEFAULT_PLATFORM=linux/arm64 docker run -it -v `pwd`:/build -w /build ps3dev

archives/archives.txt

@@ -1,6 +1,8 @@
 6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9 19973532 https://sourceware.org/pub/binutils/releases/binutils-2.22.tar.bz2 -> binutils-2.22.tar.bz2
+aa54850ebda5064c72cd4ec2d9b056c294252991486350d9a97ab2a6dfdfaf12 38254526 https://sourceware.org/pub/binutils/releases/binutils-2.42.tar.bz2 -> binutils-2.42.tar.bz2
 27769f64ef1d4cd5e2be8682c0c93f9887983e6cfd1a927ce5a0a2915a95cf8f 72462752 https://sourceware.org/pub/gcc/releases/gcc-9.5.0/gcc-9.5.0.tar.xz -> gcc-9.5.0.tar.xz
 e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da 87858592 https://sourceware.org/pub/gcc/releases/gcc-13.2.0/gcc-13.2.0.tar.xz -> gcc-13.2.0.tar.xz
 c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692 14571004 https://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz -> newlib-1.20.0.tar.gz
--                                                                       - https://github.com/ps3dev/psl1ght/tarball/master -> psl1ght.tar.gz
--                                                                       - https://github.com/ps3dev/ps3libraries/tarball/master -> ps3libraries.tar.gz
+1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4 20489528 https://sourceware.org/pub/gdb/releases/gdb-8.3.1.tar.xz -> gdb-8.3.1.tar.xz
+- - https://github.com/ps3dev/psl1ght/tarball/master -> psl1ght.tar.gz
+- - https://github.com/ps3dev/ps3libraries/tarball/master -> ps3libraries.tar.gz

depends/check-python.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+# check-python.sh by Naomi Peori (naomi@peori.ca)
+
+## Prefer python3 (pyenv, Debian) over the unversioned python name.
+python_bin=""
+for c in python3 python; do
+  command -v "$c" >/dev/null 2>&1 || continue
+  python_bin="$c"
+  break
+done
+[ -n "$python_bin" ] || { echo "ERROR: Install python before continuing."; exit 1; }
+
+## python-config is often not on PATH; pyenv ships python3-config next to the interpreter.
+pyconfig=""
+for c in python3-config python-config; do
+  command -v "$c" >/dev/null 2>&1 || continue
+  pyconfig="$c"
+  break
+done
+if [ -z "$pyconfig" ]; then
+  pyhome=$("$python_bin" -c "import sys; print(sys.base_prefix)")
+  for c in "$pyhome"/bin/python3-config "$pyhome"/bin/python*-config; do
+    [ -x "$c" ] || continue
+    pyconfig="$c"
+    break
+  done
+fi
+[ -n "$pyconfig" ] || { echo "ERROR: Install python-dev before continuing."; exit 1; }
+
+pyprefix=$("$pyconfig" --prefix) || { echo "ERROR: Install python-dev before continuing."; exit 1; }
+
+python_h=""
+for h in \
+  "$pyprefix"/include/python*/Python.h \
+  ${PYENV_ROOT:+$PYENV_ROOT/versions/*/include/python*/Python.h} \
+  /opt/local/include/python*/Python.h \
+  ${PYINSTALLDIR:+$PYINSTALLDIR/include/Python.h}
+do
+  [ -f "$h" ] || continue
+  python_h="$h"
+  break
+done
+[ -n "$python_h" ] || { echo "ERROR: Install python-dev before continuing."; exit 1; }