Update GCC (ps3dev#121)

Author: chibicitiberiu

Dockerfile

@@ -1,27 +1,49 @@
-# FROM ubuntu:xenial
-FROM debian:12-slim
-LABEL maintainer="[email protected]"
-
+FROM ubuntu:22.04 as base
+# Set the default shell to Bash
+SHELL ["/bin/bash", "-c"]
 ENV PS3DEV /usr/local/ps3dev
 ENV PSL1GHT ${PS3DEV}
-ENV PATH ${PATH}:${PS3DEV}/bin:${PS3DEV}/ppu/bin:${PS3DEV}/spu/bin
-
+ENV PATH ${PATH}:${PS3DEV}/bin:${PS3DEV}/ppu/bin:${PS3DEV}/spu/bin:${PS3DEV}/portlibs/ppu/bin
+ENV PKG_CONFIG_PATH ${PS3DEV}/portlibs/ppu/lib/pkgconfig
 ENV DEBIAN_FRONTEND=noninteractive
+# last python version with diskutils module support
+ENV PYTHON_VERSION=3.10
+ENV PYENV_ROOT ${HOME}/.pyenv
+ENV PIP_ROOT_USER_ACTION=ignore
+ENV PATH ${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:$PATH
+RUN apt update -y && \
+    apt --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 && \
+    # Install dependencies specific for amd64 architecture
+    if [ "$(uname -m)" = "x86_64" ]; then apt install -y nvidia-cg-toolkit ; fi && \
+    # pyenv 
+    apt --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 && \
+    # pyenv
+    apt -y clean autoclean autoremove
 
-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 python-dev-is-python3 \
-  texinfo wget zlib1g-dev && \
-  apt-get -y clean autoclean autoremove && \
-  rm -rf /var/lib/{apt,dpkg,cache,log}/
-
+FROM base as builder
 RUN mkdir /build
 WORKDIR /build
 COPY . /build
+RUN /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
+ENV PS3DEV /usr/local/ps3dev
+ENV PSL1GHT ${PS3DEV}
+ENV PATH ${PATH}:${PS3DEV}/bin:${PS3DEV}/ppu/bin:${PS3DEV}/spu/bin:${PS3DEV}/portlibs/ppu/bin
+ENV PKG_CONFIG_PATH ${PS3DEV}/portlibs/ppu/lib/pkgconfig
+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

README.md

@@ -26,16 +26,6 @@ For Debian based distros:
     libtool libtool-bin python-dev bzip2 libgmp3-dev pkg-config g++ libssl-dev clang
 ```
 
-For Debian 11 and 12:
-
-> Install `python-is-python3` and `python-dev-is-python3` instead of
-  `python` and `python-dev`.
-
-For Debian 13:
-
-> In addition to the above, also install `python3-setuptools`.
-
-
 For RedHat distros:
 
 ```bash 

patches/binutils-2.22-PS3.patch patches/binutils-2.22-PS3-SPU.patchpatches/binutils-2.22-PS3.patch renamed to patches/binutils-2.22-PS3-SPU.patch

@@ -0,0 +1,75 @@
+# Original from https://github.com/ps3dev/ps3toolchain
+# Updated for binutils 2.40 by Darjan Krijan [https://disc-kuraudo.eu]
+diff '--color=auto' -urN a/ld/emulparams/elf32_spu.sh b/ld/emulparams/elf32_spu.sh
+--- a/ld/emulparams/elf32_spu.sh	2022-07-08 11:46:48.000000000 +0200
++++ b/ld/emulparams/elf32_spu.sh	2023-01-04 22:15:19.310575828 +0100
+@@ -6,6 +6,8 @@
+ ARCH=spu
+ MACHINE=
+ ALIGNMENT=16
++GENERATE_PIE_SCRIPT=yes
++GENERATE_COMBRELOC_SCRIPT=yes
+ TEXT_START_ADDR=0
+ INITIAL_READONLY_SECTIONS='.interrupt : { KEEP(*(.interrupt)) }'
+ if test -z "${CREATE_SHLIB}"; then
+diff '--color=auto' -urN a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
+--- a/ld/emultempl/spuelf.em	2022-07-08 11:46:48.000000000 +0200
++++ b/ld/emultempl/spuelf.em	2023-01-04 22:17:32.998687355 +0100
+@@ -258,6 +258,14 @@
+   return total;
+ }
+ 
++static void
++spu_before_parse (void)
++{
++  gld${EMULATION_NAME}_before_parse ();
++
++  config.has_pie = `if test -n "$GENERATE_PIE_SCRIPT" ; then echo true ; else echo false ; fi`;
++}
++
+ /* Go find if we need to do anything special for overlays.  */
+ 
+ static void
+@@ -851,5 +859,6 @@
+ 
+ LDEMUL_AFTER_OPEN=spu_after_open
+ LDEMUL_BEFORE_ALLOCATION=spu_before_allocation
++LDEMUL_BEFORE_PARSE=spu_before_parse
+ LDEMUL_FINISH=gld${EMULATION_NAME}_finish
+ LDEMUL_CHOOSE_TARGET=gld${EMULATION_NAME}_choose_target
+diff '--color=auto' -urN a/ld/ld.h b/ld/ld.h
+--- a/ld/ld.h	2022-07-08 11:46:48.000000000 +0200
++++ b/ld/ld.h	2023-01-04 22:24:33.832738444 +0100
+@@ -229,6 +229,9 @@
+      parameter.  */
+   bool has_shared;
+ 
++  /* If TRUE, -pie is supported.  */
++  bool has_pie;
++
+   /* If TRUE, build constructors.  */
+   bool build_constructors;
+ 
+diff '--color=auto' -urN a/ld/ldmain.c b/ld/ldmain.c
+--- a/ld/ldmain.c	2022-07-08 11:46:48.000000000 +0200
++++ b/ld/ldmain.c	2023-01-04 22:16:46.319346843 +0100
+@@ -315,6 +315,7 @@
+   config.make_executable = true;
+   config.magic_demand_paged = true;
+   config.text_read_only = true;
++  config.has_pie = false;
+   config.print_map_discarded = true;
+   link_info.disable_target_specific_optimizations = -1;
+ 
+diff '--color=auto' -urN a/ld/lexsup.c b/ld/lexsup.c
+--- a/ld/lexsup.c	2022-07-08 11:46:48.000000000 +0200
++++ b/ld/lexsup.c	2023-01-04 22:17:19.218882047 +0100
+@@ -1286,6 +1286,8 @@
+ 	      if (link_info.unresolved_syms_in_shared_libs == RM_NOT_YET_SET)
+ 		link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
+ 	    }
++	  else if (config.has_pie)
++	    link_info.type = type_pie;
+ 	  else
+ 	    einfo (_("%F%P: -shared not supported\n"));
+ 	  break;