mirror of
https://github.com/vivier/EMILE.git
synced 2024-05-31 17:41:33 +00:00
second: because of mess between gcc and as: remove cpu directive and use the
default provided by gcc (68020). Add rules to manage 68040 and 68030 assembly files in the Makefile. Classic will wait later... Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
aba7a139c5
commit
c4f9714d63
|
@ -48,8 +48,8 @@ OBJS = $(patsubst %.c,%.o,$(SOURCES:.S=.o)) $(SOURCES_CLI:.c=.o) \
|
||||||
|
|
||||||
# ARCHITECTURE
|
# ARCHITECTURE
|
||||||
|
|
||||||
SOURCES_MMU030 = MMU030_asm.S MMU030.c enter_kernel030.S
|
SOURCES_MMU030 = asm_MMU030.S MMU030.c enter_kernel030.S
|
||||||
SOURCES_MMU040 = MMU040_asm.S MMU040.c enter_kernel040.S
|
SOURCES_MMU040 = asm_MMU040.S MMU040.c enter_kernel040.S
|
||||||
SOURCES_MMU = $(SOURCES_MMU030) $(SOURCES_MMU040)
|
SOURCES_MMU = $(SOURCES_MMU030) $(SOURCES_MMU040)
|
||||||
SOURCES_noMMU = enter_kernelnoMMU.S
|
SOURCES_noMMU = enter_kernelnoMMU.S
|
||||||
SOURCES_M68K = $(SOURCES_MMU) $(SOURCES_noMMU)
|
SOURCES_M68K = $(SOURCES_MMU) $(SOURCES_noMMU)
|
||||||
|
@ -77,7 +77,7 @@ ifeq ("$(TARGET)", "m68k-linux")
|
||||||
|
|
||||||
OBJS_TARGET = $(OBJS_M68K) $(OBJS_LINUX_M68K)
|
OBJS_TARGET = $(OBJS_M68K) $(OBJS_LINUX_M68K)
|
||||||
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040
|
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040
|
||||||
CFLAGS_TARGET = -m68020 -Wa,-m68020 -Os
|
CFLAGS_TARGET = -Os
|
||||||
|
|
||||||
else
|
else
|
||||||
ifeq ("$(TARGET)", "classic-linux")
|
ifeq ("$(TARGET)", "classic-linux")
|
||||||
|
@ -91,21 +91,21 @@ ifeq ("$(TARGET)", "ppc-linux")
|
||||||
|
|
||||||
OBJS_TARGET = $(OBJS_PPC) $(OBJS_LINUX_PPC)
|
OBJS_TARGET = $(OBJS_PPC) $(OBJS_LINUX_PPC)
|
||||||
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_PPC
|
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_PPC
|
||||||
CFLAGS_TARGET = -m68020 -Wa,-m68020 -Os
|
CFLAGS_TARGET = -Os
|
||||||
|
|
||||||
else
|
else
|
||||||
ifeq ("$(TARGET)", "mixed-linux")
|
ifeq ("$(TARGET)", "mixed-linux")
|
||||||
|
|
||||||
OBJS_TARGET = $(OBJS_M68K) $(OBJS_LINUX_M68K) $(OBJS_PPC) $(OBJS_LINUX_PPC)
|
OBJS_TARGET = $(OBJS_M68K) $(OBJS_LINUX_M68K) $(OBJS_PPC) $(OBJS_LINUX_PPC)
|
||||||
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040 -DARCH_PPC
|
CPPFLAGS_TARGET = -D__LINUX__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040 -DARCH_PPC
|
||||||
CFLAGS_TARGET = -m68020 -Wa,-m68020 -Os
|
CFLAGS_TARGET = -Os
|
||||||
|
|
||||||
else
|
else
|
||||||
ifeq ("$(TARGET)", "m68k-netbsd")
|
ifeq ("$(TARGET)", "m68k-netbsd")
|
||||||
|
|
||||||
OBJS_TARGET = $(OBJS_M68K) $(OBJS_NETBSD_M68K)
|
OBJS_TARGET = $(OBJS_M68K) $(OBJS_NETBSD_M68K)
|
||||||
CPPFLAGS_TARGET = -D__NETBSD__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040
|
CPPFLAGS_TARGET = -D__NETBSD__ -DARCH_M68K -DUSE_MMU030 -DUSE_MMU040
|
||||||
CFLAGS_TARGET = -m68020 -Wa,-m68020 -Os
|
CFLAGS_TARGET = -Os
|
||||||
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -180,6 +180,9 @@ endif
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
|
||||||
|
|
||||||
|
%030.o: %030.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68030 -c -o $@ $^
|
||||||
|
%040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -c -o $@ $^
|
||||||
|
|
||||||
install::
|
install::
|
||||||
install -d $(DESTDIR)/$(PREFIX)/boot/emile/
|
install -d $(DESTDIR)/$(PREFIX)/boot/emile/
|
||||||
install $(KARCH)-linux-scsi/second $(DESTDIR)/$(PREFIX)/boot/emile/$(KARCH)-second_scsi
|
install $(KARCH)-linux-scsi/second $(DESTDIR)/$(PREFIX)/boot/emile/$(KARCH)-second_scsi
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68030
|
|
||||||
|
|
||||||
.global MMU030_disable_cache
|
.global MMU030_disable_cache
|
||||||
MMU030_disable_cache:
|
MMU030_disable_cache:
|
||||||
lea 0x0808, %a0
|
lea 0x0808, %a0
|
|
@ -4,8 +4,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68040
|
|
||||||
|
|
||||||
.global MMU040_disable_cache
|
.global MMU040_disable_cache
|
||||||
MMU040_disable_cache:
|
MMU040_disable_cache:
|
||||||
moveq.l #0, %d0
|
moveq.l #0, %d0
|
|
@ -4,8 +4,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68030
|
|
||||||
|
|
||||||
.include "copymem.i"
|
.include "copymem.i"
|
||||||
|
|
||||||
.align 4
|
.align 4
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68040
|
|
||||||
|
|
||||||
.include "copymem.i"
|
.include "copymem.i"
|
||||||
|
|
||||||
.align 4
|
.align 4
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
* (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
|
* (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
.cpu 68000
|
|
||||||
|
|
||||||
.include "copymem.i"
|
.include "copymem.i"
|
||||||
|
|
||||||
.align 4
|
.align 4
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68000
|
|
||||||
|
|
||||||
.include "../first/macos.i"
|
.include "../first/macos.i"
|
||||||
|
|
||||||
#if defined(APPLE_DRIVER)
|
#if defined(APPLE_DRIVER)
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.cpu 68020
|
|
||||||
|
|
||||||
.equ PC, 0x00FC
|
.equ PC, 0x00FC
|
||||||
.equ GPR, 0x0100
|
.equ GPR, 0x0100
|
||||||
.equ FPR, 0x0200
|
.equ FPR, 0x0200
|
||||||
|
|
Loading…
Reference in New Issue
Block a user