Changeset 9060bd1 in mainline


Ignore:
Timestamp:
2005-09-10T11:20:47Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
24241cf
Parents:
f3a6c8e5
Message:

IA-32 can be now cross-compiled by ./build.ia32 cross.
Unify IA-32 Makefile.inc and Makefile.inc.cross.

Update doc/requirements.

Small changes elsewere.

Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • arch/ia32/Makefile.inc

    rf3a6c8e5 r9060bd1  
    1 CC=gcc
    2 AS=as
    3 LD=ld
    4 OBJDUMP=objdump
    5 OBJCOPY=objcopy
     1ifeq (${CROSS_COMPILER},yes)
     2        IA-32_TARGET=i686-pc-linux-gnu
     3
     4        IA-32_CC_DIR=/usr/local/i686/bin
     5        IA-32_BINUTILS_DIR=/usr/local/i686/bin
     6
     7        CC=$(IA-32_CC_DIR)/$(IA-32_TARGET)-gcc
     8        AS=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-as
     9        LD=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-ld
     10        OBJCOPY=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objcopy
     11        OBJDUMP=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objdump
     12else
     13        CC=gcc
     14        AS=as
     15        LD=ld
     16        OBJCOPY=objcopy
     17        OBJDUMP=objdump
     18endif
     19
    620BFD_NAME=elf32-i386
    721BFD_ARCH=i386
    8 
    922
    1023DEFS:=-DARCH=$(ARCH) -DFPU_LAZY
     
    1831endif
    1932
    20 CFLAGS=$(DEFS) -nostdlib -fno-builtin -fomit-frame-pointer -O3
    21 LFLAGS=-M -no-check-sections
     33CPPFLAGS=$(DEFS) -nostdinc -I../include
     34CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
     35LFLAGS=-M
    2236
    2337../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
    24         $(CC) $(CFLAGS) -C -E -x c $< | grep -v "^\#" > $@
     38        $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
    2539
    2640arch_sources= \
  • arch/ia32/_link.ld.in

    rf3a6c8e5 r9060bd1  
    3030        .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)): AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) {
    3131                ktext_start = .;
    32                 *(BOOT_DATA)
     32                *(BOOT_DATA);
    3333                *(.text);
    3434                ktext_end = .;
     
    4141                LONG(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
    4242                hardcoded_ktext_size = .;
    43                 LONG(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
     43                LONG((ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start));
    4444                hardcoded_kdata_size = .;
    45                 LONG(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
     45                LONG((kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start));
    4646                hardcoded_unmapped_ktext_size = .;
    4747                LONG(unmapped_ktext_end - unmapped_ktext_start);
  • arch/ia32/include/boot/boot.h

    rf3a6c8e5 r9060bd1  
    3131
    3232#define BOOTSTRAP_OFFSET                0x8000
    33 #define BOOT_OFFSET                             0x100000
     33#define BOOT_OFFSET                     0x100000
    3434
    3535#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
  • doc/requirements

    rf3a6c8e5 r9060bd1  
    77        COMPILER REQUIREMENTS
    88        o binutils 2.15 and gcc 3.3.5
     9        o binutils 2.16 and gcc 4.0.1
    910        o older versions may do as well, but are now obsoleted
    1011
    1112        SMP COMPATIBILITY
    12         o Bochs 2.0.2 - Bochs 2.2
     13        o Bochs 2.0.2 - Bochs 2.2.1
    1314                o 2x-8x 686 CPU
    1415        o Simics 2.0.28 - Simics 2.2.19
     
    1819   
    1920        EMULATORS AND VIRTUALIZERS
    20         o Bochs 2.0.2 - Bochs 2.2
     21        o Bochs 2.0.2 - Bochs 2.2.1
    2122        o VMware Workstation 4, VMware Workstation 5
     23        o Simics 2.2.19
    2224
    2325amd64 port
    24 =========
     26==========
    2527        HARDWARE REQUIREMENTS
    2628        o no real hardware supported
    2729
    2830        SMP COMPATIBILITY
    29         o Bochs 2.2
     31        o Bochs 2.2.1
    3032                o 2x-8x AMD64 CPU
    3133        o Simics Simics 2.2.19
     
    3739
    3840mips32 port
    39 =========
     41===========
    4042
    4143        HARDWARE REQUIREMENTS
  • src/Makefile.config

    rf3a6c8e5 r9060bd1  
    44#ARCH=ppc
    55#ARCH=amd64
     6
     7# If this is yes, then cross compiler will be used instead of host compiler
     8CROSS_COMPILER=no
    69
    710# Support for symetric multiprocessors
  • src/build.ia32

    rf3a6c8e5 r9060bd1  
    11#! /bin/sh
    22
    3 make all ARCH=ia32
     3COMPILER=""
     4
     5if [ $1 == "cross" ];
     6then
     7        COMPILER="CROSS_COMPILER=yes";
     8fi;
     9
     10make all ARCH=ia32 $COMPILER
Note: See TracChangeset for help on using the changeset viewer.