update 2.5.7 in line with decompals

decompals · Oct 16, 2023 · 217bc30 · 217bc30
1 parent e3e3bfa
commit 217bc30
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/gcc-2.5.7-psx.Dockerfile b/gcc-2.5.7-psx.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:focal as build
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get install -y build-essential gcc gcc-multilib wget
@@ -29,8 +29,13 @@ RUN ./configure \
     --host=i386-pc-linux \
     --build=i386-pc-linux
 
-RUN make cpp cc1 xgcc cc1plus g++ CFLAGS="-std=gnu89 -m32 -static -Dbsd4_4 -Dmips -DHAVE_STRERROR -march=i686" || true
+RUN make -j cpp cc1 xgcc cc1plus g++ CFLAGS="-std=gnu89 -m32 -static -Dbsd4_4 -Dmips -march=i686 -DHAVE_STRERROR"
 
-COPY entrypoint.sh /work/
-RUN chmod +x /work/entrypoint.sh
-CMD [ "/work/entrypoint.sh" ]
+COPY tests /work/tests
+RUN ./cc1 -quiet -O2 /work/tests/little_endian.c && grep -E 'lbu\s\$2,0\(\$4\)' /work/tests/little_endian.s
+
+RUN mv xgcc gcc
+RUN mkdir /build && cp cpp cc1 gcc cc1plus g++ /build/ || true
+
+FROM scratch AS export
+COPY --from=build /build/* .
diff --git a/gcc-2.5.7.Dockerfile b/gcc-2.5.7.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:focal as build
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get install -y build-essential gcc gcc-multilib wget
@@ -18,6 +18,7 @@ RUN patch -u -p1 collect2.c -i ../patches/collect2-2.6.0.c.patch
 RUN patch -u -p1 cccp.c -i ../patches/cccp-2.5.7.c.patch
 RUN patch -u -p1 gcc.c -i ../patches/gcc-2.5.7.c.patch
 RUN patch -u -p1 g++.c -i ../patches/g++-2.5.7.c.patch
+RUN patch -u -p1 config/mips/mips.h -i ../patches/mipsel-2.6.patch
 
 RUN ./configure \
     --target=mips-linux-gnu \
@@ -27,8 +28,13 @@ RUN ./configure \
     --host=i386-pc-linux \
     --build=i386-pc-linux
 
-RUN make cpp cc1 xgcc cc1plus g++ CFLAGS="-std=gnu89 -m32 -static -Dbsd4_4 -Dmips -DHAVE_STRERROR" || true
+RUN make cpp cc1 xgcc cc1plus g++ CFLAGS="-std=gnu89 -m32 -static -Dbsd4_4 -Dmips -DHAVE_STRERROR"
 
-COPY entrypoint.sh /work/
-RUN chmod +x /work/entrypoint.sh
-CMD [ "/work/entrypoint.sh" ]
+COPY tests /work/tests
+RUN ./cc1 -quiet -O2 /work/tests/little_endian.c && grep -E 'lbu\s\$2,0\(\$4\)' /work/tests/little_endian.s
+
+RUN mv xgcc gcc
+RUN mkdir /build && cp cpp cc1 gcc cc1plus g++ /build/
+
+FROM scratch AS export
+COPY --from=build /build/* .