Merge pull request #1965 from nicolasnoble/brew-hotfix

Updating for latest github macos image.

Author: nicolasnoble

.github/workflows/macos-toolchain.yml

@@ -19,9 +19,11 @@ jobs:
     - uses: n1hility/cancel-previous-runs@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
+    - name: install dependencies
+      run: brew install --verbose nikitabobko/tap/brew-install-path
     - name: build mips binutils
-      run: brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-binutils.rb
     - name: build mips gcc
-      run: brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-gcc.rb
     - name: build openbios
       run: make -C ./src/mips/openbios

README.md

@@ -130,8 +130,9 @@ You need MacOS Catalina or later with the latest XCode to build, as well as a fe
 
 Compiling OpenBIOS will require a mips compiler, that you can generate using the following commands:
 ```bash
-brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb
-brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb
+brew install nikitabobko/tap/brew-install-path
+brew install-path ./tools/macos-mips/mipsel-none-elf-binutils.rb
+brew install-path ./tools/macos-mips/mipsel-none-elf-gcc.rb
 ```
 
 Then, you can compile OpenBIOS using `make -C ./src/mips/openbios`.

src/mips/openbios/card/device.c

@@ -632,9 +632,9 @@ static const struct Device s_cardDevice = {
     .desc = "MEMORY CARD",
     .init = (void (*)())psxdummy,
     .open = dev_bu_open,
-    .action = psxdummy,
+    .action = (int (*)(struct File *, enum FileAction))psxdummy,
     .close = dev_bu_close,
-    .ioctl = psxdummy,
+    .ioctl = (int (*)(struct File *, int,  int))psxdummy,
     .read = dev_bu_read,
     .write = dev_bu_write,
     .erase = dev_bu_erase,

src/mips/openbios/cdrom/cdrom.c

@@ -101,18 +101,18 @@ static const struct Device s_cdromDevice = {
     .desc = "CD-ROM",
     .init = (void (*)())psxdummy,
     .open = dev_cd_open,
-    .action = psxdummy,
-    .close = psxdummy,
-    .ioctl = psxdummy,
+    .action = (int (*)(struct File *, enum FileAction))psxdummy,
+    .close = (int (*)(struct File *))psxdummy,
+    .ioctl = (int (*)(struct File *, int,  int))psxdummy,
     .read = dev_cd_read,
-    .write = psxdummy,
-    .erase = psxdummy,
+    .write = (int (*)(struct File *, void *, int))psxdummy,
+    .erase = (int (*)(struct File *, const char *))psxdummy,
     .undelete = psxdummy,
     .firstFile = dev_cd_firstFile,
     .nextFile = dev_cd_nextFile,
-    .format = psxdummy,
+    .format = (int (*)(struct File *))psxdummy,
     .chdir = dev_cd_chdir,
-    .rename = psxdummy,
+    .rename = (int (*)(struct File *, const char *, struct File *, const char *))psxdummy,
     .deinit = deinitCDRom,
     .check = psxdummy,
 };

src/mips/openbios/tty/tty.c

@@ -54,17 +54,17 @@ static const struct Device s_ttyDevice = {
     .init = dev_tty_init,
     .open = dev_tty_open,
     .action = dev_tty_action,
-    .close = psxdummy,
+    .close = (int (*)(struct File *))psxdummy,
     .ioctl = dev_tty_ioctl,
-    .read = psxdummy,
-    .write = psxdummy,
-    .erase = psxdummy,
+    .read = (int (*)(struct File *, void *, int))psxdummy,
+    .write = (int (*)(struct File *, void *, int))psxdummy,
+    .erase = (int (*)(struct File *, const char *))psxdummy,
     .undelete = psxdummy,
     .firstFile = (struct DirEntry * (*)(struct File *, const char *, struct DirEntry *)) psxdummy,
     .nextFile = (struct DirEntry * (*)(struct File *, struct DirEntry *)) psxdummy,
-    .format = psxdummy,
+    .format = (int (*)(struct File *))psxdummy,
     .chdir = psxdummy,
-    .rename = psxdummy,
+    .rename = (int (*)(struct File *, const char *, struct File *, const char *))psxdummy,
     .deinit = (void (*)())psxdummy,
     .check = psxdummy,
 };
@@ -77,19 +77,19 @@ static const struct Device s_dummyDevice = {
     .blockSize = 1,
     .desc = "CONSOLE",
     .init = (void (*)())psxdummy,
-    .open = psxdummy,
-    .action = psxdummy,
-    .close = psxdummy,
-    .ioctl = psxdummy,
-    .read = psxdummy,
-    .write = psxdummy,
-    .erase = psxdummy,
+    .open = (int (*)(struct File *, const char *, int))psxdummy,
+    .action = (int (*)(struct File *, enum FileAction))psxdummy,
+    .close = (int (*)(struct File *))psxdummy,
+    .ioctl = (int (*)(struct File *, int, int))psxdummy,
+    .read = (int (*)(struct File *, void *, int))psxdummy,
+    .write = (int (*)(struct File *, void *, int))psxdummy,
+    .erase = (int (*)(struct File *, const char *))psxdummy,
     .undelete = psxdummy,
     .firstFile = (struct DirEntry * (*)(struct File *, const char *, struct DirEntry *)) psxdummy,
     .nextFile = (struct DirEntry * (*)(struct File *, struct DirEntry *)) psxdummy,
-    .format = psxdummy,
+    .format = (int (*)(struct File *))psxdummy,
     .chdir = psxdummy,
-    .rename = psxdummy,
+    .rename = (int (*)(struct File *, const char *, struct File *, const char *))psxdummy,
     .deinit = (void (*)())psxdummy,
     .check = psxdummy,
 };

src/mips/psyqo/GETTING_STARTED.md

@@ -26,8 +26,9 @@ trizen -S cross-mipsel-linux-gnu-binutils cross-mipsel-linux-gnu-gcc
 Using [Homebrew](https://brew.sh/), you can install the mips toolchain after downloading [these two scripts](https://github.com/grumpycoders/pcsx-redux/tree/main/tools/macos-mips) (or cloning the whole PCSX-Redux repository).
 
 ```bash
-brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb
-brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb
+brew install nikitabobko/tap/brew-install-path
+brew install-path ./tools/macos-mips/mipsel-none-elf-binutils.rb
+brew install-path ./tools/macos-mips/mipsel-none-elf-gcc.rb
 ```
 
 ## Windows

src/mips/psyqo/src/xprintf.c

@@ -315,11 +315,7 @@ static const info fmtinfo[] = {
 ** seems to make a big difference in determining how fast this beast
 ** will run.
 */
-int vxprintf(func, arg, format, ap) void (*func)(const char *, int, void *);
-void *arg;
-const char *format;
-va_list ap;
-{
+int vxprintf(void (*func)(const char *, int, void *), void *arg, const char *format, va_list ap) {
     register const char *fmt; /* The format string. */
     register int c;           /* Next character in the format string */
     register char *bufpt;     /* Pointer to the conversion buffer */
@@ -704,10 +700,7 @@ struct s_strargument { /* Describes the string being written to */
     char *last;        /* Last available slot in the string */
 };
 
-static void sout(txt, amt, arg) char *txt;
-int amt;
-void *arg;
-{
+static void sout(const char *txt, int amt, void *arg) {
     register char *head;
     register const char *t;
     register int a;
@@ -756,10 +749,7 @@ struct sgMprintf {
 };
 
 /* The xprintf callback function. */
-static void mout(zNewText, nNewChar, arg) char *zNewText;
-int nNewChar;
-void *arg;
-{
+static void mout(const char *zNewText, int nNewChar, void *arg) {
     struct sgMprintf *pM = (struct sgMprintf *)arg;
     if (pM->nChar + nNewChar + 1 > pM->nAlloc) {
         pM->nAlloc = pM->nChar + nNewChar * 2 + 1;

tools/linux-mips/spawn-compiler.sh

@@ -13,21 +13,21 @@ set -ex
 
 PREFIX=${PREFIX:-"/usr/local"}
 
-for url in https://ftpmirror.gnu.org/gnu/binutils/binutils-2.43.tar.gz https://mirrors.kernel.org/gnu/binutils/binutils-2.43.tar.gz ; do
+for url in https://ftpmirror.gnu.org/gnu/binutils/binutils-2.45.tar.gz https://mirrors.kernel.org/gnu/binutils/binutils-2.45.tar.gz ; do
     wget --max-redirect=2 --timeout=60 --continue --trust-server-names $url && break
 done
-tar xvfz binutils-2.43.tar.gz
-cd binutils-2.43
+tar xvfz binutils-2.45.tar.gz
+cd binutils-2.45
 ./configure --target=mipsel-none-elf --disable-multilib --disable-nls --disable-werror --prefix=$PREFIX
 make
 make install-strip
 cd ..
 
-for url in https://ftpmirror.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.gz https://mirrors.kernel.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.gz ; do
+for url in https://ftpmirror.gnu.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.gz https://mirrors.kernel.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.gz ; do
     wget --max-redirect=2 --timeout=60 --continue --trust-server-names $url && break
 done
-tar xvfz gcc-14.2.0.tar.gz
-cd gcc-14.2.0
+tar xvfz gcc-15.2.0.tar.gz
+cd gcc-15.2.0
 ./contrib/download_prerequisites
 mkdir build
 cd build

tools/macos-mips/mipsel-none-elf-binutils.rb

@@ -1,12 +1,14 @@
 class MipselNoneElfBinutils < Formula
   desc "FSF Binutils for mipsel cross development"
   homepage "https://www.gnu.org/software/binutils/"
-  url "https://ftpmirror.gnu.org/gnu/binutils/binutils-2.43.tar.gz"
-  mirror "https://mirrors.kernel.org/gnu/binutils/binutils-2.43.tar.gz"
-  sha256 "025c436d15049076ebe511d29651cc4785ee502965a8839936a65518582bdd64"
+  url "https://ftpmirror.gnu.org/gnu/binutils/binutils-2.45.tar.gz"
+  mirror "https://mirrors.kernel.org/gnu/binutils/binutils-2.45.tar.gz"
+  sha256 "8a3eb4b10e7053312790f21ee1a38f7e2bbd6f4096abb590d3429e5119592d96"
 
   depends_on "texinfo" => :build
 
+  patch :DATA
+
   def install
     system "./configure", "--target=mipsel-none-elf",
                           "--disable-multilib",
@@ -20,3 +22,47 @@ def install
     assert_match "f()", shell_output("#{bin}/mipsel-none-elf-c++filt _Z1fv")
   end
 end
+
+__END__
+diff --git a/zlib/zutil.h b/zlib/zutil.h
+index 0bd2dbcba..bb513cb4b 100644
+--- a/zlib/zutil.h
++++ b/zlib/zutil.h
+@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #  endif
+ #endif
+
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ #  define OS_CODE  7
+-#  ifndef Z_SOLO
+-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+-#      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+-#    endif
+-#  endif
+ #endif
+
+ #ifdef __acorn
+@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #  define OS_CODE 19
+ #endif
+
+-#if defined(_BEOS_) || defined(RISCOS)
+-#  define fdopen(fd,mode) NULL /* No fdopen() */
+-#endif
+-
+-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+-#  if defined(_WIN32_WCE)
+-#    define fdopen(fd,mode) NULL /* No fdopen() */
+-#  else
+-#    define fdopen(fd,type)  _fdopen(fd,type)
+-#  endif
+-#endif
+-
+ #if defined(__BORLANDC__) && !defined(MSDOS)
+   #pragma warn -8004
+   #pragma warn -8008

tools/macos-mips/mipsel-none-elf-gcc.rb

@@ -1,16 +1,18 @@
 class MipselNoneElfGcc < Formula
   desc "The GNU compiler collection for mipsel"
   homepage "https://gcc.gnu.org"
-  url "https://ftpmirror.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
-  mirror "https://mirrors.kernel.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
-  sha256 "a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9"
+  url "https://ftpmirror.gnu.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz"
+  mirror "https://mirrors.kernel.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz"
+  sha256 "438fd996826b0c82485a29da03a72d71d6e3541a83ec702df4271f6fe025d24e"
 
   depends_on "gmp"
   depends_on "mipsel-none-elf-binutils"
   depends_on "libmpc"
   depends_on "mpfr"
   depends_on "gnu-sed"
 
+  patch :DATA
+
   def install
     ENV.prepend_path "PATH", Formula["gnu-sed"].opt_libexec/"gnubin"
     mkdir "mipsel-none-elf-gcc-build" do
@@ -50,3 +52,47 @@ def install
     system "#{bin}/mipsel-none-elf-gcc", "-c", "-o", "test-c.o", "test-c.c"
   end
 end
+
+__END__
+diff --git a/zlib/zutil.h b/zlib/zutil.h
+index 0bd2dbcba..bb513cb4b 100644
+--- a/zlib/zutil.h
++++ b/zlib/zutil.h
+@@ -130,17 +130,8 @@
+ #  endif
+ #endif
+
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ #  define OS_CODE  7
+-#  ifndef Z_SOLO
+-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+-#      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+-#    endif
+-#  endif
+ #endif
+
+ #ifdef __acorn
+@@ -163,19 +154,12 @@
+ #  define OS_CODE 19
+ #endif
+
+-#if defined(_BEOS_) || defined(RISCOS)
+-#  define fdopen(fd,mode) NULL /* No fdopen() */
+-#endif
+-
+ #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+ #  if defined(_WIN32_WCE)
+-#    define fdopen(fd,mode) NULL /* No fdopen() */
+ #    ifndef _PTRDIFF_T_DEFINED
+        typedef int ptrdiff_t;
+ #      define _PTRDIFF_T_DEFINED
+ #    endif
+-#  else
+-#    define fdopen(fd,type)  _fdopen(fd,type)
+ #  endif
+ #endif