Remove CRIS-specific stuff from M32R code
diff --git a/klibc/arch/m32r/MCONFIG b/klibc/arch/m32r/MCONFIG
index 2762494..6706d9d 100644
--- a/klibc/arch/m32r/MCONFIG
+++ b/klibc/arch/m32r/MCONFIG
@@ -1,6 +1,6 @@
# -*- makefile -*-
#
-# arch/cris/MCONFIG
+# arch/m32r/MCONFIG
#
# Special rules for this architecture. Note that this is actually
# included from the main Makefile, and that pathnames should be
@@ -13,14 +13,6 @@
# Extra linkflags when building the shared version of the library
# This address needs to be reachable using normal inter-module
# calls, and work on the memory models for this architecture
-# 224 MB - normal binaries start at 0
+# 224 MB - normal binaries start at 0 (?)
# (lib?)gcc on cris seems to insist on producing .init and .fini sections
SHAREDFLAGS = --section-start .init=0x0e000100
-
-# The CRIS compiler needs an -iprefix to find libgcc includes when
-# nostdinc is used. It also needs -mlinux to compile linux applications.
-INCLUDE_PREFIX = $(shell $(CC) -print-libgcc-file-name | sed -e s/libgcc.a//)
-ARCHREQFLAGS = -iprefix $(INCLUDE_PREFIX) -mlinux
-
-# Special flags needed for linking
-LDFLAGS += -mcrislinux
diff --git a/klibc/arch/m32r/Makefile.inc b/klibc/arch/m32r/Makefile.inc
index 75fa17b..43cb44e 100644
--- a/klibc/arch/m32r/Makefile.inc
+++ b/klibc/arch/m32r/Makefile.inc
@@ -1,6 +1,6 @@
# -*- makefile -*-
#
-# arch/cris/Makefile.inc
+# arch/m32r/Makefile.inc
#
# Special rules for this architecture. Note that this is actually
# included from the main Makefile, and that pathnames should be
@@ -8,11 +8,6 @@
#
ARCHOBJS = \
- arch/$(ARCH)/__Umod.o \
- arch/$(ARCH)/__Udiv.o \
- arch/$(ARCH)/__Mod.o \
- arch/$(ARCH)/__Div.o \
- arch/$(ARCH)/__negdi2.o \
arch/$(ARCH)/setjmp.o \
arch/$(ARCH)/syscall.o \
libgcc/__divdi3.o \
@@ -21,13 +16,4 @@
libgcc/__umoddi3.o \
libgcc/__udivmoddi4.o
-arch/$(ARCH)/__Umod.o: arch/$(ARCH)/divide.c
- $(CC) $(CFLAGS) -DSIGNED=0 -DREM=1 -DBITS=32 -DNAME=__Umod -c -o $@ $<
-arch/$(ARCH)/__Udiv.o: arch/$(ARCH)/divide.c
- $(CC) $(CFLAGS) -DSIGNED=0 -DREM=0 -DBITS=32 -DNAME=__Udiv -c -o $@ $<
-arch/$(ARCH)/__Mod.o: arch/$(ARCH)/divide.c
- $(CC) $(CFLAGS) -DSIGNED=1 -DREM=1 -DBITS=32 -DNAME=__Mod -c -o $@ $<
-arch/$(ARCH)/__Div.o: arch/$(ARCH)/divide.c
- $(CC) $(CFLAGS) -DSIGNED=1 -DREM=0 -DBITS=32 -DNAME=__Div -c -o $@ $<
-
archclean:
