Skip to content

Commit afab517

Browse files
fjtrujyfjtrujy
authored
Merge pull request #33 from fjtrujy/useMainStreams
Use mainstreams
2 parents 6e3c4c0 + abceb33 commit afab517

File tree

5 files changed

+83
-84
lines changed

5 files changed

+83
-84
lines changed

‎.github/workflows/compilation.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,19 @@ jobs:
5959
run: |
6060
export PS2DEV=$PWD/ps2dev
6161
export PATH=$PATH:$PS2DEV/iop/bin
62-
mipsel-ps2-irx-as --version
63-
mipsel-ps2-irx-ld --version
64-
mipsel-ps2-irx-gcc --version
62+
mipsel-none-elf-as --version
63+
mipsel-none-elf-ld --version
64+
mipsel-none-elf-gcc --version
65+
66+
- name: Get short SHA
67+
id: slug
68+
run: printf '%s\n' "sha8=$(printf '%s\n' ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
69+
70+
- name: Compress ps2dev folder
71+
run: |
72+
tar -zcvf ps2dev.tar.gz ps2dev
73+
74+
- uses: actions/upload-artifact@v4
75+
with:
76+
name: ps2dev-${{ steps.slug.outputs.sha8 }}-${{ matrix.os[0] }}
77+
path: ps2dev.tar.gz

‎.github/workflows/docker.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ jobs:
2929
run: |
3030
echo "DOCKER_TAG=latest" >> $GITHUB_ENV
3131
32-
- name: Set up QEMU
33-
uses: docker/setup-qemu-action@v3
34-
35-
- name: Set up Docker Buildx
36-
uses: docker/setup-buildx-action@v3
37-
3832
- name: Login to DockerHub
3933
uses: docker/login-action@v3
4034
if: env.DOCKER_USERNAME != null

‎config/ps2toolchain-iop-config.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
PS2TOOLCHAIN_IOP_BINUTILS_REPO_URL="https://github.com/ps2dev/binutils-gdb.git"
4-
PS2TOOLCHAIN_IOP_BINUTILS_DEFAULT_REPO_REF="iop-v2.35.2"
5-
PS2TOOLCHAIN_IOP_GCC_REPO_URL="https://github.com/ps2dev/gcc.git"
6-
PS2TOOLCHAIN_IOP_GCC_DEFAULT_REPO_REF="iop-v14.2.0"
3+
PS2TOOLCHAIN_IOP_BINUTILS_REPO_URL="https://github.com/bminor/binutils-gdb.git"
4+
PS2TOOLCHAIN_IOP_BINUTILS_DEFAULT_REPO_REF="binutils-2_43_1"
5+
PS2TOOLCHAIN_IOP_GCC_REPO_URL="https://github.com/gcc-mirror/gcc.git"
6+
PS2TOOLCHAIN_IOP_GCC_DEFAULT_REPO_REF="releases/gcc-14.2.0"
77

88
if test -f "$PS2DEV_CONFIG_OVERRIDE"; then
99
source "$PS2DEV_CONFIG_OVERRIDE"

‎scripts/001-binutils.sh‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fi
3232

3333
cd "$REPO_FOLDER"
3434

35+
TARGET="mipsel-none-elf"
3536
TARGET_ALIAS="iop"
3637
TARG_XTRA_OPTS=""
3738
OSVER=$(uname)
@@ -53,31 +54,26 @@ fi
5354
## Determine the maximum number of processes that Make can work with.
5455
PROC_NR=$(getconf _NPROCESSORS_ONLN)
5556
56-
## For each target...
57-
for TARGET in "mipsel-ps2-irx" "mipsel-none-elf"; do
58-
## Create and enter the toolchain/build directory
59-
rm -rf "build-$TARGET"
60-
mkdir "build-$TARGET"
61-
cd "build-$TARGET"
57+
## Create and enter the toolchain/build directory
58+
rm -rf "build-$TARGET"
59+
mkdir "build-$TARGET"
60+
cd "build-$TARGET"
6261
63-
## Configure the build.
64-
../configure \
65-
--quiet \
66-
--prefix="$PS2DEV/$TARGET_ALIAS" \
67-
--target="$TARGET" \
68-
--disable-separate-code \
69-
--disable-sim \
70-
--disable-nls \
71-
--with-python=no \
72-
$TARG_XTRA_OPTS
62+
## Configure the build.
63+
../configure \
64+
--quiet \
65+
--prefix="$PS2DEV/$TARGET_ALIAS" \
66+
--target="$TARGET" \
67+
--disable-separate-code \
68+
--disable-sim \
69+
--disable-nls \
70+
--with-python=no \
71+
$TARG_XTRA_OPTS
7372
74-
## Compile and install.
75-
make --quiet -j "$PROC_NR"
76-
make --quiet -j "$PROC_NR" install-strip
77-
make --quiet -j "$PROC_NR" clean
73+
## Compile and install.
74+
make --quiet -j "$PROC_NR"
75+
make --quiet -j "$PROC_NR" install-strip
76+
make --quiet -j "$PROC_NR" clean
7877
79-
## Exit the build directory.
80-
cd ..
81-
82-
## End target.
83-
done
78+
## Exit the build directory.
79+
cd ..

‎scripts/002-gcc-stage1.sh‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fi
3232

3333
cd "$REPO_FOLDER"
3434

35+
TARGET="mipsel-none-elf"
3536
TARGET_ALIAS="iop"
3637
TARG_XTRA_OPTS=""
3738
TARGET_CFLAGS="-O2 -gdwarf-2 -gz"
@@ -54,52 +55,47 @@ fi
5455
## Determine the maximum number of processes that Make can work with.
5556
PROC_NR=$(getconf _NPROCESSORS_ONLN)
5657
57-
## For each target...
58-
for TARGET in "mipsel-ps2-irx" "mipsel-none-elf"; do
59-
## Create and enter the toolchain/build directory
60-
rm -rf "build-$TARGET-stage1"
61-
mkdir "build-$TARGET-stage1"
62-
cd "build-$TARGET-stage1"
58+
## Create and enter the toolchain/build directory
59+
rm -rf "build-$TARGET-stage1"
60+
mkdir "build-$TARGET-stage1"
61+
cd "build-$TARGET-stage1"
6362
64-
## Configure the build.
65-
CFLAGS_FOR_TARGET="$TARGET_CFLAGS" \
66-
CXXFLAGS_FOR_TARGET="$TARGET_CFLAGS" \
67-
../configure \
68-
--quiet \
69-
--prefix="$PS2DEV/$TARGET_ALIAS" \
70-
--target="$TARGET" \
71-
--enable-languages="c,c++" \
72-
--with-float=soft \
73-
--with-headers=no \
74-
--without-newlib \
75-
--without-cloog \
76-
--without-ppl \
77-
--disable-decimal-float \
78-
--disable-libada \
79-
--disable-libatomic \
80-
--disable-libffi \
81-
--disable-libgomp \
82-
--disable-libmudflap \
83-
--disable-libquadmath \
84-
--disable-libssp \
85-
--disable-libstdcxx-pch \
86-
--disable-multilib \
87-
--disable-shared \
88-
--disable-threads \
89-
--disable-target-libiberty \
90-
--disable-target-zlib \
91-
--disable-nls \
92-
--disable-tls \
93-
--disable-libstdcxx \
94-
$TARG_XTRA_OPTS
63+
## Configure the build.
64+
CFLAGS_FOR_TARGET="$TARGET_CFLAGS" \
65+
CXXFLAGS_FOR_TARGET="$TARGET_CFLAGS" \
66+
../configure \
67+
--quiet \
68+
--prefix="$PS2DEV/$TARGET_ALIAS" \
69+
--target="$TARGET" \
70+
--enable-languages="c,c++" \
71+
--with-float=soft \
72+
--with-headers=no \
73+
--without-newlib \
74+
--without-cloog \
75+
--without-ppl \
76+
--disable-decimal-float \
77+
--disable-libada \
78+
--disable-libatomic \
79+
--disable-libffi \
80+
--disable-libgomp \
81+
--disable-libmudflap \
82+
--disable-libquadmath \
83+
--disable-libssp \
84+
--disable-libstdcxx-pch \
85+
--disable-multilib \
86+
--disable-shared \
87+
--disable-threads \
88+
--disable-target-libiberty \
89+
--disable-target-zlib \
90+
--disable-nls \
91+
--disable-tls \
92+
--disable-libstdcxx \
93+
$TARG_XTRA_OPTS
9594
96-
## Compile and install.
97-
make --quiet -j "$PROC_NR" all
98-
make --quiet -j "$PROC_NR" install-strip
99-
make --quiet -j "$PROC_NR" clean
95+
## Compile and install.
96+
make --quiet -j "$PROC_NR" all
97+
make --quiet -j "$PROC_NR" install-strip
98+
make --quiet -j "$PROC_NR" clean
10099
101-
## Exit the build directory.
102-
cd ..
103-
104-
## End target.
105-
done
100+
## Exit the build directory.
101+
cd ..

0 commit comments

Comments
 (0)