Changeset 656b789 in mainline

Timestamp:

2009-03-16T22:58:11Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

be6038b

Parents:

f36c061

Message:

resurrect big endian support for mips32: switch from mips-sgi-irix5 toolchain to mips-linux-gnu
the kernel is working alright, the user space has some bugs yet

Files:

• boot/arch/mips32/loader/Makefile (modified) (5 diffs)
• boot/arch/mips32/loader/_link.ld.in (moved) (moved from boot/arch/mips32/loader/_link.ld.in.binary ) (2 diffs)
• boot/arch/mips32/loader/_link.ld.in.ecoff (deleted)
• contrib/toolchain/toolchain.mipseb32.sh (modified) (3 diffs)
• kernel/arch/mips32/Makefile.inc (modified) (2 diffs)
• uspace/lib/libc/arch/mips32eb/Makefile.inc (modified) (2 diffs)
• uspace/lib/libc/arch/mips32eb/include/ddi.h (added)

boot/arch/mips32/loader/Makefile

@@ -37 +37 @@
 endif
 
-ifeq ($(IMAGE),binary)
-        LD_IN = binary
-endif
-
-ifeq ($(IMAGE),ecoff)
-        LD_IN = ecoff
-endif
-
-BFD_NAME = elf32-tradlittlemips
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
+
+ifeq ($(MACHINE),lgxemul)
+        BFD_NAME = elf32-tradlittlemips
+        BFD = ecoff-littlemips
+endif
+ifeq ($(MACHINE),bgxemul)
+        BFD_NAME = elf32-tradbigmips
+        BFD = ecoff-bigmips
+        TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
+        TARGET = mips-linux-gnu
+endif
+ifeq ($(MACHINE),msim)
+        BFD_NAME = elf32-tradlittlemips
+        BFD = binary
+endif
 
 ifeq ($(COMPILER),gcc_native)
@@ -84 +90 @@
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs 
+        $(USPACEDIR)/srv/vfs/vfs
 ifeq ($(RDFMT),tmpfs)
         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
@@ -115 +121 @@
 -include Makefile.depend
 
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
-        $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
+image.boot: image.raw
+        $(OBJCOPY) -O $(BFD) $< $@
+
+image.raw: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+        $(LD) -no-check-sections -N -T _link.ld -o $@ $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
 
 depend:
@@ -128 +137 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
+        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.raw image.boot Makefile.depend
 
 _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
@@ -147 +156 @@
         ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned int" $(COMPONENTS) ./initrd.img
 
-_link.ld.in: _link.ld.in.$(LD_IN)
-        cp $< $@
-
 %.o: %.S
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

boot/arch/mips32/loader/_link.ld.in

@@ -1 @@
-OUTPUT_FORMAT("binary") 
-ENTRY(start) 
- 
+ENTRY(start)
+
 SECTIONS {
         .boot 0xbfc00000: AT (0) {
@@ -9 +8 @@
                 *(.rodata);
                 *(.rodata.*);
-                *(.data);               /* initialized data */
+                *(.data);       /* initialized data */
                 *(.sdata);
                 *(.sdata2);
                 *(.sbss);
                 *(.scommon);
-                *(.bss);                /* uninitialized static variables */    
-                *(COMMON);              /* global variables */
+                *(.bss);        /* uninitialized static variables */
+                *(COMMON);      /* global variables */
                 *(.reginfo);
 [[COMPONENTS]]

contrib/toolchain/toolchain.mipseb32.sh

@@ -20 +20 @@
 fi
 
-BINUTILS_VERSION="2.19"
-GCC_VERSION="4.3.2"
+BINUTILS_VERSION="2.19.1"
+GCC_VERSION="4.3.3"
 
 BINUTILS="binutils-${BINUTILS_VERSION}.tar.gz"
@@ -33 +33 @@
 PLATFORM="mips"
 WORKDIR=`pwd`
-TARGET="${PLATFORM}-sgi-irix5"
+TARGET="${PLATFORM}-linux-gnu"
 PREFIX="${CROSS_PREFIX}/${PLATFORM}"
 BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
@@ -85 +85 @@
 cd "${BINUTILSDIR}"
 check_error $? "Change directory failed."
-patch -p1 <<EOF
-diff -Naur binutils-2.19.orig/bfd/elfxx-mips.c binutils-2.19/bfd/elfxx-mips.c
---- binutils-2.19.orig/bfd/elfxx-mips.c 2008-08-18 20:14:04.000000000 +0200
-+++ binutils-2.19/bfd/elfxx-mips.c      2009-01-18 18:14:47.292011299 +0100
-@@ -1409,7 +1409,7 @@
-    function, or 0 if we can't decide which function that is.  */
- 
- static unsigned long
--mips16_stub_symndx (asection *sec, const Elf_Internal_Rela *relocs,
-+mips16_stub_symndx (asection *sec __attribute__((unused)), const Elf_Internal_Rela *relocs,
-                    const Elf_Internal_Rela *relend)
- {
-   const Elf_Internal_Rela *rel;
-EOF
-check_error $? "Error patching binutils"
 ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" "--disable-nls"
 check_error $? "Error configuring binutils."

kernel/arch/mips32/Makefile.inc

@@ -31 +31 @@
 
 BFD_ARCH = mips
+BFD = binary
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel
 
-GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
+GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
 
 DEFS += -D__32_BITS__
@@ -43 +44 @@
 ifeq ($(MACHINE),lgxemul)
         BFD_NAME = elf32-tradlittlemips
-        BFD = binary
-        GCC_CFLAGS += -mips3
 endif
 ifeq ($(MACHINE),bgxemul)
-        BFD_NAME = elf32-bigmips
-        BFD = ecoff-bigmips
+        BFD_NAME = elf32-tradbigmips
         TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
-        TARGET = mips-sgi-irix5
-        GCC_CFLAGS += -EB -DBIG_ENDIAN -mips3
+        TARGET = mips-linux-gnu
+        GCC_CFLAGS += -DBIG_ENDIAN
 endif
 ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
-        BFD = binary
-        GCC_CFLAGS += -mhard-float -mips3
+        GCC_CFLAGS += -mhard-float
 endif
 

uspace/lib/libc/arch/mips32eb/Makefile.inc

@@ -30 +30 @@
 #
 
-TARGET = mips-sgi-irix5
+TARGET = mips-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
-CFLAGS += -mips3 
+CFLAGS += -mips3
 
 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
@@ -41 +41 @@
 
 BFD_ARCH = mips
-BFD_NAME = elf32-big
+BFD_NAME = elf32-tradbigmips