Skip to content

Commit

Permalink
Merge pull request #1299 from nicolasnoble/gcc-13.1
Browse files Browse the repository at this point in the history
Bumping gcc to 13.1.0
  • Loading branch information
nicolasnoble authored Apr 28, 2023
2 parents 1b89c00 + 71a6d81 commit 2ad28d9
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ powershell -c "& { iwr -UseBasicParsing https://bit.ly/mips-ps1 | iex }"
Then, open a new command prompt, and type the following:

```
mips install 12.2.0
mips install 13.1.0
```

To manually install this script, you can download it from [here](https://bit.ly/mips-ps1), and then install it with the following command:
Expand Down
6 changes: 3 additions & 3 deletions tools/linux-mips/spawn-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ make
make install-strip
cd ..

wget https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.gz
tar xvfz gcc-12.2.0.tar.gz
cd gcc-12.2.0
wget https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.gz
tar xvfz gcc-13.1.0.tar.gz
cd gcc-13.1.0
./contrib/download_prerequisites
mkdir build
cd build
Expand Down
4 changes: 2 additions & 2 deletions tools/macos-mips/mipsel-none-elf-gcc.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class MipselNoneElfGcc < Formula
desc "The GNU compiler collection for mipsel"
homepage "https://gcc.gnu.org"
url "https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz"
sha256 "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff"
url "https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz"
sha256 "61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86"

depends_on "gmp"
depends_on "mipsel-none-elf-binutils"
Expand Down
2 changes: 2 additions & 0 deletions tools/vscode-extension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ The panel will have the ability to install the tools on the most popular platfor

### Changelog

- 0.2.5
- Bumping gcc to 13.1.0.
- 0.2.4
- Fixing MacOS installation of GDB and PCSX-Redux.
- Fixing templates, trying to call gdb.exe instead of gdb-multiarch.exe on Windows.
Expand Down
2 changes: 1 addition & 1 deletion tools/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "psx-dev",
"displayName": "PSX.Dev",
"description": "PlayStation 1 development made easy",
"version": "0.2.4",
"version": "0.2.5",
"engines": {
"vscode": "^1.75.0"
},
Expand Down
4 changes: 2 additions & 2 deletions tools/vscode-extension/scripts/mipsel-none-elf-gcc.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class MipselNoneElfGcc < Formula
desc "The GNU compiler collection for mipsel"
homepage "https://gcc.gnu.org"
url "https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz"
sha256 "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff"
url "https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz"
sha256 "61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86"

depends_on "gmp"
depends_on "mipsel-none-elf-binutils"
Expand Down
2 changes: 1 addition & 1 deletion tools/vscode-extension/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const { Octokit } = require('@octokit/rest')
const octokit = new Octokit()
const os = require('node:os')

const mipsVersion = '12.2.0'
const mipsVersion = '13.1.0'
let extensionUri
let globalStorageUri
let requiresReboot = false
Expand Down
26 changes: 13 additions & 13 deletions tools/win32-mips/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# escape=`

# Dockerfile to generate the Windows g++-mipsel-none-elf-12.2.0.zip package.
# Dockerfile to generate the Windows g++-mipsel-none-elf-13.1.0.zip package.

FROM mcr.microsoft.com/windows/servercore:ltsc2019
WORKDIR C:\windows\temp
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x
RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -Scc --noconfirm'

ARG BINUTILS=https://ftp.gnu.org/gnu/binutils/binutils-2.40.tar.xz
ARG GCC=https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz
ARG GCC=https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz

RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest $env:BINUTILS -OutFile "C:\Windows\Temp\binutils-2.40.tar.xz"; `
Expand All @@ -55,9 +55,9 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
Remove-Item @('C:\Windows\Temp\*', 'C:\Users\*\Appdata\Local\Temp\*') -Force -Recurse;

RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
Invoke-WebRequest $env:GCC -OutFile "C:\Windows\Temp\gcc-12.2.0.tar.xz"; `
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList e, "C:\Windows\Temp\gcc-12.2.0.tar.xz", `-y, `-oC:\Windows\Temp\ -NoNewWindow -PassThru -Wait; `
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList x, "C:\Windows\Temp\gcc-12.2.0.tar", `-y, `-oC:\ -NoNewWindow -PassThru -Wait; `
Invoke-WebRequest $env:GCC -OutFile "C:\Windows\Temp\gcc-13.1.0.tar.xz"; `
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList e, "C:\Windows\Temp\gcc-13.1.0.tar.xz", `-y, `-oC:\Windows\Temp\ -NoNewWindow -PassThru -Wait; `
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList x, "C:\Windows\Temp\gcc-13.1.0.tar", `-y, `-oC:\ -NoNewWindow -PassThru -Wait; `
Remove-Item @('C:\Windows\Temp\*', 'C:\Users\*\Appdata\Local\Temp\*') -Force -Recurse;

ENV MSYSTEM MINGW64
Expand All @@ -66,20 +66,20 @@ RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /c/binutils-2.40 && /c/binutils-2.40/co

RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /c/binutils-2.40/libiberty && sed -i s/\\\\buint\\\\b/unsigned/ rust-demangle.c'

RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.40 all -j12'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.40 all -j8'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.40 install-strip'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /c/binutils-2.40/COPYING* /DIST'

RUN C:\msys64\usr\bin\bash.exe -l -c 'mkdir /c/gcc-12.2.0/build && cd /c/gcc-12.2.0/build && ../configure --target=mipsel-none-elf --without-isl --disable-nls --disable-threads --disable-shared --disable-libssp --disable-libstdcxx-pch --disable-libgomp --disable-werror --without-headers --disable-hosted-libstdcxx --with-as=/DIST/bin/mipsel-none-elf-as --with-ld=/DIST/bin/mipsel-none-elf-ld --enable-languages=c,c++ --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-12.2.0/build all-gcc -j12'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-12.2.0/build all-target-libgcc -j12'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-12.2.0/build all-target-libstdc++-v3 -j12'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-12.2.0/build install-strip-gcc install-strip-target-libgcc install-strip-target-libstdc++-v3'
RUN C:\msys64\usr\bin\bash.exe -l -c 'mkdir /c/gcc-13.1.0/build && cd /c/gcc-13.1.0/build && ../configure --target=mipsel-none-elf --without-isl --disable-nls --disable-threads --disable-shared --disable-libssp --disable-libstdcxx-pch --disable-libgomp --disable-werror --without-headers --disable-hosted-libstdcxx --with-as=/DIST/bin/mipsel-none-elf-as --with-ld=/DIST/bin/mipsel-none-elf-ld --enable-languages=c,c++ --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-13.1.0/build all-gcc -j8'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-13.1.0/build all-target-libgcc -j8'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-13.1.0/build all-target-libstdc++-v3 -j8'
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-13.1.0/build install-strip-gcc install-strip-target-libgcc install-strip-target-libstdc++-v3'

RUN C:\msys64\usr\bin\bash.exe -l -c 'for t in cat cp echo mkdir rm touch which ; do cp /usr/bin/$t.exe /DIST/bin ; done'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /mingw64/bin/mingw32-make.exe /DIST/bin/make.exe'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && find . -name *.exe | while read bin ; do ldd $bin | cut -f2 -d\> | cut -f2 -d\ | grep -v /c/Windows/S | while read f ; do cp $f $(dirname $bin) ; done ; done'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && find . -name *.exe | while read bin ; do ldd $bin | cut -f2 -d\> | cut -f2 -d\ | grep -v /c/Windows/S | while read f ; do cp $f $(dirname $bin) ; done ; done || true'

RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/g++-mipsel-none-elf-12.2.0.zip . -r'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/g++-mipsel-none-elf-13.1.0.zip . -r'

CMD C:\msys64\usr\bin\bash.exe -l

0 comments on commit 2ad28d9

Please sign in to comment.