WebSVN – HelenOS – Path Comparison – / – /trunk Rev 4133 and /trunk Rev 4134

Ignore whitespace Rev 4133 → Rev 4134

 /trunk/contrib/toolchain/toolchain.mipseb32.sh
 ,8 → 19,8
     CROSS_PREFIX="/usr/local"
 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"
 GCC_CORE="gcc-core-${GCC_VERSION}.tar.bz2"
 ,7 → 32,7
 PLATFORM="mips"
 WORKDIR=`pwd`
-TARGET="${PLATFORM}-sgi-irix5"
+TARGET="${PLATFORM}-linux-gnu"
 PREFIX="${CROSS_PREFIX}/${PLATFORM}"
 BINUTILSDIR="${WORKDIR}/binutils-${BINUTILS_VERSION}"
 GCCDIR="${WORKDIR}/gcc-${GCC_VERSION}"
 ,21 → 84,6
 echo ">>> Compiling and installing binutils"
 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."
 make all install

 /trunk/kernel/arch/mips32/Makefile.inc
 ,10 → 30,11
 #
 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__
 ,20 → 43,16
 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
 ARCH_SOURCES = \

/trunk/uspace/lib/libc/arch/mips32eb/include/ddi.h
0,0 → 1,0
link ../../mips32/include/ddi.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /trunk/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,9 → 29,9
 ## Toolchain configuration
 #
-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 \
         arch/$(UARCH)/src/fibril.S \
 ,4 → 40,4
 LFLAGS += -N
 BFD_ARCH = mips
-BFD_NAME = elf32-big
+BFD_NAME = elf32-tradbigmips

/trunk/boot/arch/mips32/loader/_link.ld.in.ecoff
File deleted

/trunk/boot/arch/mips32/loader/_link.ld.in.binary
File deleted

 /trunk/boot/arch/mips32/loader/_link.ld.in
 ,0 → 1,20
+ENTRY(start)
+SECTIONS {
+    .boot 0xbfc00000: AT (0) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.scommon);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        *(.reginfo);
+[[COMPONENTS]]
+    }
+}

 /trunk/boot/arch/mips32/loader/Makefile
 ,19 → 36,25
     CROSS_PREFIX = /usr/local
 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)
     CC = gcc
     AS = as
 ,7 → 89,7
     $(USPACEDIR)/app/init/init \
     $(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
 endif
 ,9 → 120,12
 -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:
     -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 ,7 → 136,7
     -for file in $(RD_APPS) ; do \
         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
     for file in $(RD_SRVS) ; do \
 ,9 → 155,6
     rm initrd.fs
     ../../../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 $@

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4133 → Rev 4134