Switch to m4-single (again)

Makefile

@@ -104,7 +104,7 @@ GUI_OBJS = $(SDL_GUI)/SDL_gui.o $(SDL_GUI)/Exception.o $(SDL_GUI)/Object.o \
 CONSOLE_OBJ = $(SDL_CONSOLE)/SDL_console.o $(SDL_CONSOLE)/DT_drawtext.o \
 				$(SDL_CONSOLE)/internal.o
 
-DRIVERS_OBJ = $(SRC_DIR)/drivers/spi.o $(SRC_DIR)/drivers/enc28j60.o
+DRIVERS_OBJ =
 
 UTILS_DIR = $(SRC_DIR)/utils
 UTILS_OBJ = $(SRC_DIR)/utils.o $(UTILS_DIR)/gmtime.o $(UTILS_DIR)/strftime.o \

exports.txt

@@ -1582,17 +1582,6 @@ cfg_fprint_error
 cfg_get_error_str
 cfg_get_static_error_str
 #
-spi_init
-spi_shutdown
-spi_cs_on
-spi_cs_off
-spi_send_byte
-spi_rec_byte
-spi_sr_byte
-spi_slow_sr_byte
-spi_send_data
-spi_rec_data
-#
 # Parallax
 plx_font_load
 plx_font_destroy

firmware/isoldr/loader/Makefile.cfg

@@ -41,7 +41,7 @@ TARGETSIZE		= $(TARGETPREFIX)-size
 TARGETLDFLAGS	= -Wl,--gc-sections -Wl,--no-warn-rwx-segments \
 					-Tshlelf.xc -Ttext=$(TARGET) \
 					-nostartfiles -nostdlib -nodefaultlibs
-TARGETCFLAGS	= -ml -m4-single-only -ffunction-sections -fdata-sections -ffreestanding \
+TARGETCFLAGS	= -ml -m4-single -ffunction-sections -fdata-sections -ffreestanding \
 					-fno-builtin -fno-strict-aliasing -fomit-frame-pointer \
 					-freorder-blocks-algorithm=simple -flto=auto \
 					-Wall -std=c17 -Wextra -Werror \

firmware/isoldr/syscalls/Makefile

@@ -16,7 +16,7 @@ TARGETLD		= $(TARGETPREFIX)-ld
 TARGETAS		= $(TARGETPREFIX)-as
 TARGETSIZE		= $(TARGETPREFIX)-size
 TARGETLDFLAGS	= -Wl,--gc-sections -Tshlelf.xc -nostartfiles -nostdlib -nodefaultlibs
-TARGETCFLAGS	= -ml -m4-single-only -ffunction-sections -fdata-sections -ffreestanding \
+TARGETCFLAGS	= -ml -m4-single -ffunction-sections -fdata-sections -ffreestanding \
 					-fno-builtin -fno-strict-aliasing -fomit-frame-pointer \
 					-Wall -std=c17 -Wextra -Werror
 

include/gl/gl.h

@@ -32,7 +32,7 @@ typedef int32		GLsizei;	/* 4-byte signed */
 typedef float		GLfloat;	/* single precision float */
 typedef float		GLclampf;	/* single precision float in [0,1] */
 
-/* For these next two, KOS is generally compiled in m4-single-only, so we
+/* For these next two, KOS is generally compiled in m4-single, so we
    just use floats for everything anyway. */
 typedef float		GLdouble;	/* double precision float */
 typedef float		GLclampd;	/* double precision float in [0,1] */

modules/mp3/libmp3/libmp3/sndmp3.c

@@ -9,7 +9,7 @@
 /* This library is designed to be called from another program in a thread. It
    expects an input filename, and it will do all the setup and playback work.
 
-   This requires a working math library for m4-single-only (such as newlib).
+   This requires a working math library for m4-single (such as newlib).
 
  */
 

modules/mp3/libmp3/libmp3/sndmp3_mpg123.c

@@ -7,7 +7,7 @@
 
 /* This library is designed to be called from another program in a thread. It
    expects an input filename, and it will do all the setup and playback work.
-   This requires a working math library for m4-single-only (such as newlib).
+   This requires a working math library for m4-single (such as newlib).
  */
 
 

modules/mp3/libmp3/libmp3/sndmp3_mpglib.c

@@ -16,7 +16,7 @@
 /* This library is designed to be called from another program in a thread. It
    expects an input filename, and it will do all the setup and playback work.
 
-   This requires a working math library for m4-single-only (such as newlib).
+   This requires a working math library for m4-single (such as newlib).
 
  */
 

modules/mp3/libmp3/mpg123/Makefile.orig

@@ -109,9 +109,9 @@ AWK = gawk
 CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
 CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
 CCASDEPMODE = depmode=gcc3
-CCASFLAGS = -O2 -fomit-frame-pointer -ml -m4-single-only -fno-crossjumping -I/usr/local/dc/kos/kos/../kos-ports/include -I/usr/local/dc/kos/kos/include -I/usr/local/dc/kos/kos/kernel/arch/dreamcast/include -I/usr/local/dc/kos/kos/addons/include -D_arch_dreamcast -D_arch_sub_pristine -Wall -g -fno-builtin -fno-strict-aliasing
+CCASFLAGS = -O2 -fomit-frame-pointer -ml -m4-single -fno-crossjumping -I/usr/local/dc/kos/kos/../kos-ports/include -I/usr/local/dc/kos/kos/include -I/usr/local/dc/kos/kos/kernel/arch/dreamcast/include -I/usr/local/dc/kos/kos/addons/include -D_arch_dreamcast -D_arch_sub_pristine -Wall -g -fno-builtin -fno-strict-aliasing
 CCDEPMODE = depmode=gcc3
-CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math  -O2 -fomit-frame-pointer -ml -m4-single-only -fno-crossjumping -I/usr/local/dc/kos/kos/../kos-ports/include -I/usr/local/dc/kos/kos/include -I/usr/local/dc/kos/kos/kernel/arch/dreamcast/include -I/usr/local/dc/kos/kos/addons/include -D_arch_dreamcast -D_arch_sub_pristine -Wall -g -fno-builtin -fno-strict-aliasing
+CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math  -O2 -fomit-frame-pointer -ml -m4-single -fno-crossjumping -I/usr/local/dc/kos/kos/../kos-ports/include -I/usr/local/dc/kos/kos/include -I/usr/local/dc/kos/kos/kernel/arch/dreamcast/include -I/usr/local/dc/kos/kos/addons/include -D_arch_dreamcast -D_arch_sub_pristine -Wall -g -fno-builtin -fno-strict-aliasing
 COREAUDIO_CFLAGS = 
 COREAUDIO_LDFLAGS = 
 COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -158,7 +158,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 JACK_CFLAGS = 
 JACK_LDFLAGS = 
 JACK_LIBS = 
-LDFLAGS =   -ml -m4-single-only -Wl,-Ttext=0x8c010000 -T/usr/local/dc/kos/kos/utils/ldscripts/shlelf.xc -nodefaultlibs -L/usr/local/dc/kos/kos/lib/dreamcast -L/usr/local/dc/kos/kos/addons/lib/dreamcast
+LDFLAGS =   -ml -m4-single -Wl,-Ttext=0x8c010000 -T/usr/local/dc/kos/kos/utils/ldscripts/shlelf.xc -nodefaultlibs -L/usr/local/dc/kos/kos/lib/dreamcast -L/usr/local/dc/kos/kos/addons/lib/dreamcast
 LFS_LOBJ =  lfs_alias.lo
 LIBMPG123_VERSION = 32:0:32
 LIBOBJS =