Skip to content

Commit 871668a

Browse files
committed
Switch to -m4-single
1 parent 30e0c4e commit 871668a

File tree

13 files changed

+32
-24
lines changed

13 files changed

+32
-24
lines changed

exports_gcc.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ include kos/exports.h
22
include exports_fix.h
33

44
#GCC
5+
__fixdfdi
6+
__fixunsdfdi
7+
__floatundidf
8+
__unorddf2
59
__floatdidf
610
__divdf3
711
__ledf2
@@ -45,4 +49,4 @@ _Unwind_SetGR
4549
_Unwind_SetIP
4650
_Unwind_RaiseException
4751
_Unwind_GetTextRelBase
48-
_Unwind_Resume_or_Rethrow
52+
_Unwind_Resume_or_Rethrow

firmware/isoldr/loader/Makefile.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ TARGETLD = $(TARGETPREFIX)-ld
3939
TARGETAS = $(TARGETPREFIX)-as
4040
TARGETSIZE = $(TARGETPREFIX)-size
4141
TARGETLDFLAGS = -Wl,--gc-sections -Tshlelf.xc -nostartfiles -nostdlib -nodefaultlibs
42-
TARGETCFLAGS = -ml -m4-single-only -ffunction-sections -fdata-sections -ffreestanding \
42+
TARGETCFLAGS = -ml -m4-single -ffunction-sections -fdata-sections -ffreestanding \
4343
-fno-builtin -fno-strict-aliasing -fomit-frame-pointer \
4444
-Wall -std=c17 -Wextra -Werror \
4545
-DLOADER_ADDR=$(TARGET) \

firmware/isoldr/syscalls/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ TARGETLD = $(TARGETPREFIX)-ld
1616
TARGETAS = $(TARGETPREFIX)-as
1717
TARGETSIZE = $(TARGETPREFIX)-size
1818
TARGETLDFLAGS = -Wl,--gc-sections -Tshlelf.xc -nostartfiles -nostdlib -nodefaultlibs
19-
TARGETCFLAGS = -ml -m4-single-only -ffunction-sections -fdata-sections -ffreestanding \
19+
TARGETCFLAGS = -ml -m4-single -ffunction-sections -fdata-sections -ffreestanding \
2020
-fno-builtin -fno-strict-aliasing -fomit-frame-pointer \
2121
-Wall -std=c17 -Wextra -Werror
2222

include/exports_fix.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ int net_ipv4_input(netif_t *src, const uint8 *pkt, size_t pktsize,
4242
const eth_hdr_t *eth);
4343

4444
/* GCC exports */
45+
extern uint32 __fixdfdi;
46+
extern uint32 __fixunsdfdi;
47+
extern uint32 __floatundidf;
48+
extern uint32 __unorddf2;
4549
extern uint32 __floatdidf;
4650
extern uint32 __divdf3;
4751
extern uint32 __ledf2;

modules/mp3/libmp3/mpg123/Makefile.orig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ AWK = gawk
109109
CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
110110
CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
111111
CCASDEPMODE = depmode=gcc3
112-
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
112+
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
113113
CCDEPMODE = depmode=gcc3
114-
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
114+
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
115115
COREAUDIO_CFLAGS =
116116
COREAUDIO_LDFLAGS =
117117
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -158,7 +158,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
158158
JACK_CFLAGS =
159159
JACK_LDFLAGS =
160160
JACK_LIBS =
161-
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
161+
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
162162
LFS_LOBJ = lfs_alias.lo
163163
LIBMPG123_VERSION = 32:0:32
164164
LIBOBJS =

modules/mp3/libmp3/mpg123/doc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ AWK = gawk
6868
CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
6969
CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
7070
CCASDEPMODE = depmode=gcc3
71-
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
71+
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
7272
CCDEPMODE = depmode=gcc3
73-
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
73+
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
7474
COREAUDIO_CFLAGS =
7575
COREAUDIO_LDFLAGS =
7676
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -117,7 +117,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
117117
JACK_CFLAGS =
118118
JACK_LDFLAGS =
119119
JACK_LIBS =
120-
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
120+
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
121121
LFS_LOBJ = lfs_alias.lo
122122
LIBMPG123_VERSION = 32:0:32
123123
LIBOBJS =

modules/mp3/libmp3/mpg123/libtool

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ AR_FLAGS="cru"
8585
LTCC="/opt/toolchains/dc/sh-elf/bin/sh-elf-gcc"
8686

8787
# LTCC compiler flags.
88-
LTCFLAGS="-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"
88+
LTCFLAGS="-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"
8989

9090
# A language-specific compiler.
9191
CC="/opt/toolchains/dc/sh-elf/bin/sh-elf-gcc"
@@ -7358,7 +7358,7 @@ AR_FLAGS="cru"
73587358
LTCC="/opt/toolchains/dc/sh-elf/bin/sh-elf-gcc"
73597359

73607360
# LTCC compiler flags.
7361-
LTCFLAGS="-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"
7361+
LTCFLAGS="-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"
73627362

73637363
# A language-specific compiler.
73647364
CC="sh-elf-g++"

modules/mp3/libmp3/mpg123/src/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ AWK = gawk
144144
CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
145145
CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
146146
CCASDEPMODE = depmode=gcc3
147-
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
147+
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
148148
CCDEPMODE = depmode=gcc3
149-
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
149+
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
150150
COREAUDIO_CFLAGS =
151151
COREAUDIO_LDFLAGS =
152152
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -193,7 +193,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
193193
JACK_CFLAGS =
194194
JACK_LDFLAGS =
195195
JACK_LIBS =
196-
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
196+
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
197197
LFS_LOBJ = lfs_alias.lo
198198
LIBMPG123_VERSION = 32:0:32
199199
LIBOBJS =

modules/mp3/libmp3/mpg123/src/libmpg123/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ AWK = gawk
114114
CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
115115
CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
116116
CCASDEPMODE = depmode=gcc3
117-
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
117+
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
118118
CCDEPMODE = depmode=gcc3
119-
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
119+
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
120120
COREAUDIO_CFLAGS =
121121
COREAUDIO_LDFLAGS =
122122
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -163,7 +163,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
163163
JACK_CFLAGS =
164164
JACK_LDFLAGS =
165165
JACK_LIBS =
166-
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
166+
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
167167
LFS_LOBJ = lfs_alias.lo
168168
LIBMPG123_VERSION = 32:0:32
169169
LIBOBJS =

modules/mp3/libmp3/mpg123/src/output/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@ AWK = gawk
368368
CC = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
369369
CCAS = /opt/toolchains/dc/sh-elf/bin/sh-elf-gcc
370370
CCASDEPMODE = depmode=gcc3
371-
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
371+
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
372372
CCDEPMODE = depmode=gcc3
373-
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
373+
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
374374
COREAUDIO_CFLAGS =
375375
COREAUDIO_LDFLAGS =
376376
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
@@ -417,7 +417,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
417417
JACK_CFLAGS =
418418
JACK_LDFLAGS =
419419
JACK_LIBS =
420-
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
420+
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
421421
LFS_LOBJ = lfs_alias.lo
422422
LIBMPG123_VERSION = 32:0:32
423423
LIBOBJS =

0 commit comments

Comments
 (0)