Changeset 67f5fbd9 in mainline


Ignore:
Timestamp:
2007-05-31T21:14:14Z (18 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e8a0b90
Parents:
c31e536
Message:

update for new compiler configuration scheme

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/mips32/loader/Makefile

    rc31e536 r67f5fbd9  
    3636TOOLCHAIN_DIR = /usr/local/mipsel/bin
    3737
    38 ifeq ($(COMPILER),native)
     38ifeq ($(COMPILER),gcc_native)
    3939        CC = gcc
    4040        AS = as
    … …  
    4242        OBJCOPY = objcopy
    4343        OBJDUMP = objdump
    44 else
     44endif
     45
     46ifeq ($(COMPILER),icc_native)
     47        CC = icc
     48        AS = as
     49        LD = ld
     50        OBJCOPY = objcopy
     51        OBJDUMP = objdump
     52endif
     53
     54ifeq ($(COMPILER),gcc_cross)
    4555        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    4656        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

  • boot/arch/ppc32/loader/Makefile

    rc31e536 r67f5fbd9  
    3636TOOLCHAIN_DIR = /usr/local/ppc/bin
    3737
    38 ifeq ($(COMPILER),native)
     38ifeq ($(COMPILER),gcc_native)
    3939        CC = gcc
    4040        AS = as
    … …  
    4242        OBJCOPY = objcopy
    4343        OBJDUMP = objdump
    44 else
     44endif
     45
     46ifeq ($(COMPILER),icc_native)
     47        CC = icc
     48        AS = as
     49        LD = ld
     50        OBJCOPY = objcopy
     51        OBJDUMP = objdump
     52endif
     53
     54ifeq ($(COMPILER),gcc_cross)
    4555        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    4656        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

  • boot/arch/ppc64/loader/Makefile

    rc31e536 r67f5fbd9  
    3636TOOLCHAIN_DIR = /usr/local/ppc64/bin
    3737
    38 ifeq ($(COMPILER),native)
     38ifeq ($(COMPILER),gcc_native)
    3939        CC = gcc
    4040        AS = as
    … …  
    4242        OBJCOPY = objcopy
    4343        OBJDUMP = objdump
    44 else
     44endif
     45
     46ifeq ($(COMPILER),icc_native)
     47        CC = icc
     48        AS = as
     49        LD = ld
     50        OBJCOPY = objcopy
     51        OBJDUMP = objdump
     52endif
     53
     54ifeq ($(COMPILER),gcc_cross)
    4555        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    4656        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

  • boot/arch/sparc64/loader/Makefile

    rc31e536 r67f5fbd9  
    3636TOOLCHAIN_DIR = /usr/local/sparc64/bin
    3737
    38 ifeq ($(COMPILER),native)
     38ifeq ($(COMPILER),gcc_native)
    3939        CC = gcc
    4040        AS = as
    … …  
    4242        OBJCOPY = objcopy
    4343        OBJDUMP = objdump
    44 else
     44endif
     45
     46ifeq ($(COMPILER),icc_native)
     47        CC = icc
     48        AS = as
     49        LD = ld
     50        OBJCOPY = objcopy
     51        OBJDUMP = objdump
     52endif
     53
     54ifeq ($(COMPILER),gcc_cross)
    4555        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    4656        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

  • boot/boot.config

    rc31e536 r67f5fbd9  
    1414
    1515# Compiler
    16 @ "cross" Cross-compiler
    17 @ "native" Native
     16@ "gcc_cross" GCC Cross-compiler
     17@ "gcc_native" GCC Native
     18@ "icc_native" ICC Native
    1819! COMPILER (choice)
    1920

  • kernel/arch/ia32/Makefile.inc

    rc31e536 r67f5fbd9  
    6262endif
    6363ifeq ($(MACHINE),pentium4)
    64         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
     64        ifeq ($(COMPILER),icc_native)
     65                CFLAGS += -march=pentium4
     66        else
     67                CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
     68        endif
    6569        DEFS += -DCONFIG_FENCES_P4
    6670endif

  • tools/build

    rc31e536 r67f5fbd9  
    1919        cd "$BASE"
    2020        make distclean
    21         make "PLATFORM=$TARGET" "COMPILER=cross" "CONFIG_DEBUG=n"
     21        make "PLATFORM=$TARGET" "COMPILER=gcc_cross" "CONFIG_DEBUG=n"
    2222       
    2323        cp -v "$BASE/uspace/libc/arch/$UTARGET/src/entry.o" "$OUTPUT/$TARGET"

  • uspace/libc/Makefile.toolchain

    rc31e536 r67f5fbd9  
    4141#
    4242
    43 ifeq ($(COMPILER),native)
     43ifeq ($(COMPILER),gcc_native)
    4444        CC = gcc
    4545        AS = as
    … …  
    4848        OBJCOPY = objcopy
    4949        OBJDUMP = objdump
    50 else
     50endif
     51
     52ifeq ($(COMPILER),icc_native)
     53        CC = icc
     54        AS = as
     55        LD = ld
     56        AR = ar
     57        OBJCOPY = objcopy
     58        OBJDUMP = objdump
     59endif
     60
     61ifeq ($(COMPILER),gcc_cross)
    5162        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    5263        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

  • uspace/uspace.config

    rc31e536 r67f5fbd9  
    1414
    1515# Compiler
    16 @ "cross" Cross-compiler
    17 @ "native" Native
     16@ "gcc_cross" GCC Cross-compiler
     17@ "gcc_native" GCC Native
     18@ "icc_native" ICC Native
    1819! COMPILER (choice)
    1920
Note: See TracChangeset for help on using the changeset viewer.