Merge branch '96flashbacks:main' into main

Author: stalechilibeans

Makefile

@@ -284,10 +284,39 @@ else
     ACPP      := $(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/lib/acpp
     COPT      := $(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/lib/copt
   else
-    IDO_ROOT  := $(TOOLS_DIR)/ido-static-recomp/build/out
-    CC        := $(IDO_ROOT)/cc
-    ACPP      := $(IDO_ROOT)/acpp
-    COPT      := $(IDO_ROOT)/copt
+    # Detect host platform for IDO recomp binaries (allow override via IDO_PLATFORM)
+    ifndef IDO_PLATFORM
+      DETECTED_OS := $(shell uname -s)
+      ifeq ($(DETECTED_OS),Linux)
+        DETECTED_ARCH := $(shell uname -m)
+        ifeq ($(DETECTED_ARCH),aarch64)
+          IDO_PLATFORM := linux-arm
+        else
+          IDO_PLATFORM := linux
+        endif
+      else ifeq ($(DETECTED_OS),Darwin)
+        IDO_PLATFORM := macos
+      else ifneq (,$(findstring MINGW,$(DETECTED_OS)))
+        IDO_PLATFORM := windows
+      else ifneq (,$(findstring MSYS,$(DETECTED_OS)))
+        IDO_PLATFORM := windows
+      else ifneq (,$(findstring CYGWIN,$(DETECTED_OS)))
+        IDO_PLATFORM := windows
+      else
+        $(error Unsupported platform: $(DETECTED_OS))
+      endif
+    endif
+
+    # Windows binaries carry the .exe suffix
+    IDO_EXE_SUFFIX :=
+    ifeq ($(IDO_PLATFORM),windows)
+      IDO_EXE_SUFFIX := .exe
+    endif
+
+    IDO_ROOT  := $(TOOLS_DIR)/ido-5.3-recomp-$(IDO_PLATFORM)
+    CC        := $(IDO_ROOT)/cc$(IDO_EXE_SUFFIX)
+    ACPP      := $(IDO_ROOT)/acpp$(IDO_EXE_SUFFIX)
+    COPT      := $(IDO_ROOT)/copt$(IDO_EXE_SUFFIX)
   endif
 endif
 LD            := $(CROSS)ld
@@ -358,12 +387,6 @@ VADPCM_ENC            := $(TOOLS_DIR)/vadpcm_enc
 EXTRACT_DATA_FOR_MIO  := $(TOOLS_DIR)/extract_data_for_mio
 SKYCONV               := $(TOOLS_DIR)/skyconv
 FLIPS                 := $(TOOLS_DIR)/flips
-# Use the system installed armips if available. Otherwise use the one provided with this repository.
-ifneq (,$(call find-command,armips))
-  RSPASM              := armips
-else
-  RSPASM              := $(TOOLS_DIR)/armips
-endif
 ENDIAN_BITWIDTH       := $(BUILD_DIR)/endian-and-bitwidth
 EMULATOR = mupen64plus
 EMU_FLAGS = --noosd

tools/.gitignore

@@ -13,3 +13,7 @@
 !/ido5.3_compiler/usr/lib/*.so
 !/ido5.3_compiler/usr/lib/*.so.1
 !/ido5.3_compiler/**/*.o
+!/ido-5.3-recomp-linux/*
+!/ido-5.3-recomp-linux-arm/*
+!/ido-5.3-recomp-macos/*
+!/ido-5.3-recomp-windows/*

tools/ido-static-recomp/README.md tools/IDO.mdtools/ido-static-recomp/README.md renamed to tools/IDO.md

@@ -48,19 +48,6 @@ Add `RELEASE=1` to build release builds with optimizations and stripped binaries
 By default, make build script create native binaries on macOS. This was done to minimize the time to build the recompiled suite.
 In order to create "fat," universal ARM and x86_64, pass `TARGET=universal` to `gmake`.
 
-### Manual Building
+## Binaries
 
-Example for compiling `as1` in a Linux environment:
-
-```bash
-make -C tools/rabbitizer
-g++ -Itools/rabbitizer/include -Itools/rabbitizer/cplusplus/include recomp.cpp -o recomp.elf -g -Ltools/rabbitizer/build -lrabbitizerpp
-./recomp.elf ido/7.1/usr/lib/as1 > as1_c.c
-gcc libc_impl.c as1_c.c -o as1 -g -fno-strict-aliasing -lm -DIDO71
-```
-
-Use the same approach for `cc`, `cfe`, `uopt`, `ugen`, `as1` (and `copt` if you need that).
-
-Use `-DIDO53` instead of `-DIDO71` if the program you are trying to recompile was compiled with IDO 5.3 rather than IDO 7.1.
-
-To compile `ugen` for IDO 5.3, add `--conservative` when invoking `./recomp.elf`. This mimics UB present in `ugen53`. That program reads uninitialized stack memory and its result depends on that stack memory.
+The binaries in this folder originate from [these releases](https://github.com/klorfmorf/ido-static-recomp/releases/tag/v1.0.0) and have not been altered in any way, shape or form.

tools/Makefile

@@ -7,15 +7,10 @@ CC           := gcc
 CXX          := g++
 CFLAGS       := -I . -I sm64tools -Wall -Wextra -Wno-unused-parameter -pedantic -O2 -s
 LDFLAGS      := -lm
-ALL_PROGRAMS := armips textconv patch_elf_32bit aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv slienc
+ALL_PROGRAMS := textconv patch_elf_32bit aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv slienc
 LIBAUDIOFILE := audiofile/libaudiofile.a
 
-# Only build armips from tools if it is not found on the system
-ifeq ($(call find-command,armips),)
-  BUILD_PROGRAMS := $(ALL_PROGRAMS)
-else
-  BUILD_PROGRAMS := $(filter-out armips,$(ALL_PROGRAMS))
-endif
+BUILD_PROGRAMS := $(ALL_PROGRAMS)
 
 default: all
 
@@ -39,14 +34,6 @@ extract_data_for_mio_SOURCES := extract_data_for_mio.c
 
 skyconv_SOURCES := skyconv.c sm64tools/n64graphics.c sm64tools/utils.c
 
-armips: CC := $(CXX)
-armips_SOURCES := armips.cpp
-armips_CFLAGS  := -std=gnu++11 -fno-exceptions -fno-rtti -pipe
-armips_LDFLAGS := -pthread
-ifeq ($(HOST_ENV),MinGW)
-  armips_LDFLAGS += -municode
-endif
-
 ifeq ($(shell uname -s),Linux)
   BUILD_PROGRAMS += flips
 endif
@@ -65,25 +52,20 @@ slienc_CFLAGS :=
 
 all-except-recomp: $(LIBAUDIOFILE) $(BUILD_PROGRAMS)
 
-all: all-except-recomp ido-static-recomp
+all: all-except-recomp
 
 clean:
 	$(RM) $(ALL_PROGRAMS)
 	$(MAKE) -C audiofile clean
-	$(MAKE) -C ido-static-recomp clean
 
 define COMPILE
 $(1): $($1_SOURCES)
 	$$(CC) $(CFLAGS) $($1_CFLAGS) $$^ -o $$@ $($1_LDFLAGS) $(LDFLAGS)
 endef
 
-ido-static-recomp:
-	@$(MAKE) -C ido-static-recomp setup
-	@$(MAKE) -C ido-static-recomp
-
 $(foreach p,$(BUILD_PROGRAMS),$(eval $(call COMPILE,$(p))))
 
 $(LIBAUDIOFILE):
 	@$(MAKE) -C audiofile
 
-.PHONY: all all-except-recomp clean default ido-static-recomp
+.PHONY: all all-except-recomp clean default