Browse Source

Fixes from M. R. Brown <mrbrown@0xd6.org> to fixup some little
compile nits with the SH architecture, and support SH4,

Eric Andersen 22 years ago
parent
commit
fc90506367

+ 4 - 0
extra/Configs/Config.sh

@@ -75,6 +75,10 @@ ifeq ($(strip $(TARGET_PROC)),SH3)
 ARCH_CFLAGS += -ml
 HAS_MMU = true
 endif
+ifeq ($(strip $(TARGET_PROC)),SH4)
+ARCH_CFLAGS += -ml -m4
+HAS_MMU = true
+endif
 endif
 
 # Set this to `false' if you don't have/need basic floating point support

+ 4 - 4
libc/sysdeps/linux/sh/Makefile

@@ -23,9 +23,9 @@
 
 TOPDIR=../../../../
 include $(TOPDIR)Rules.mak
-ASFLAGS=$(CFLAGS)
 
-CFLAGS+= -I../ -D__ASSEMBLER__ -DASM_GLOBAL_DIRECTIVE=.globl
+CFLAGS+= -I../
+SFLAGS= $(CFLAGS) -D__ASSEMBLER__ -DASM_GLOBAL_DIRECTIVE=.globl
 
 TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine)
 
@@ -50,11 +50,11 @@ ar-target: $(OBJS) $(CRT0_OBJ)
 	cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
 
 $(CRT0_OBJ): %.o : %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(SFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(SOBJS): %.o : %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(SFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(COBJS): %.o : %.c

+ 1 - 0
libc/sysdeps/linux/sh/_mmap.c

@@ -20,6 +20,7 @@
 */
 
 #include <unistd.h>
+#include <errno.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
 

+ 1 - 0
libc/sysdeps/linux/sh/pipe.c

@@ -1,6 +1,7 @@
 
 /* Copyright (C) 2001 Lineo, <davidm@lineo.com> */
 
+#include <errno.h>
 #include <unistd.h>
 #include <syscall.h>