Changeset 44bec47 in mainline


Ignore:
Timestamp:
2007-06-06T20:00:13Z (17 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3ee8a075
Parents:
99373fe
Message:

Better infrastructure for building with different compilers.
Separate ICC_CFLAGS added, SUNCC_CFLAGS extended.

Location:
kernel
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r99373fe r44bec47  
    3434-include Makefile.config
    3535
     36INCLUDES = generic/include
     37OPTIMIZATION = 3
     38
    3639## Common compiler flags
    3740#
    … …  
    4043        -DKERNEL
    4144
    42 GCC_CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes \
    43         -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
    44 
    45 SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all \
     45GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     46        -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror \
     47        -nostdlib -nostdinc
     48
     49ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     50        -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror \
     51        -nostdlib -nostdinc \
     52        -wd170
     53
     54SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
     55        -xnolib -xc99=all -xregs=no%float \
    4656        -D__FUNCTION__=__func__ -features=extensions \
    4757        -erroff=E_ZERO_SIZED_STRUCT_UNION
    48 
    4958
    5059LFLAGS = -M
    … …  
    147156        OBJDUMP = objdump
    148157        LIBDIR = /usr/lib
    149         CFLAGS = $(GCC_CFLAGS)
     158        CFLAGS = $(ICC_CFLAGS)
    150159endif
    151160

  • kernel/arch/amd64/Makefile.inc

    r99373fe r44bec47  
    3636TOOLCHAIN_DIR = /usr/local/amd64
    3737
    38 GCC_CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
     38CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables
     39GCC_CFLAGS += $(CMN1)
     40ICC_CFLAGS += $(CMN1)
    3941SUNCC_CFLAGS += -m64 -xmodel=kernel
    4042
    … …  
    4547
    4648ifeq ($(MACHINE),opteron)
    47         GCC_CFLAGS += -march=opteron   
     49        CMN2 := -march=opteron
     50        GCC_CFLAGS += $(CMN2)
     51        ICC_CFLAGS += $(CMN2)
     52        SUNCC_CFLAGS += -xtarget=opteron
    4853        DEFS += -DFENCES=p4
    4954endif

  • kernel/arch/ia32/Makefile.inc

    r99373fe r44bec47  
    3737
    3838DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
    39 SUNCC_CFLAGS += -m32
     39
     40CMN1 = -m32
     41GCC_CFLAGS += $(CMN1)
     42ICC_CFLAGS += $(CMN1)
     43SUNCC_CFLAGS += $(CMN1)
    4044
    4145## Accepted CPUs
    … …  
    4347
    4448ifeq ($(MACHINE),athlon-xp)
    45         GCC_CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
     49        CMN2 = -march=athlon-xp -mmmx -msse -m3dnow
     50        GCC_CFLAGS += $(CMN2)
     51        ICC_CFLAGS += $(CMN2)
     52        SUNCC_CFLAGS += -xarch=ssea
    4653        DEFS += -DCONFIG_FENCES_P3
    4754        CONFIG_SMP = n
    … …  
    4956endif
    5057ifeq ($(MACHINE),athlon-mp)
    51         GCC_CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
     58        CMN2 = -march=athlon-mp -mmmx -msse -m3dnow
     59        GCC_CFLAGS += $(CMN2)
     60        ICC_CFLAGS += $(CMN2)
     61        SUNCC_CFLAGS += xarch=ssea
    5262        DEFS += -DCONFIG_FENCES_P3
    5363        CONFIG_HT = n
    5464endif
    5565ifeq ($(MACHINE),pentium3)
    56         GCC_CFLAGS += -march=pentium3 -mmmx -msse
     66        CMN2 = -march=pentium3 -mmmx -msse
     67        GCC_CFLAGS += $(CMN2)
     68        ICC_CFLAGS += $(CMN2)
     69        SUNCC_CFLAGS += -xarch=sse
    5770        DEFS += -DCONFIG_FENCES_P3
    5871        CONFIG_HT = n
    5972endif
    6073ifeq ($(MACHINE),prescott)
    61         GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
     74        CMN2 = -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
     75        GCC_CFLAGS += $(CMN2)
     76        ICC_CFLAGS += $(CMN2)
     77        SUNCC_CFLAGS += -xarch=sse3
    6278        DEFS += -DCONFIG_FENCES_P4
    6379endif
    6480ifeq ($(MACHINE),pentium4)
    65         ifeq ($(COMPILER),icc_native)
    66                 GCC_CFLAGS += -march=pentium4
    67         else
    68                 GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
    69         endif
     81        GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
     82        ICC_CFLAGS += -march=pentium4
     83        SUNCC_CFLAGS += -xarch=sse2
    7084        DEFS += -DCONFIG_FENCES_P4
    7185endif

  • kernel/arch/ia32xen/Makefile.inc

    r99373fe r44bec47  
    3838DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
    3939
    40 SUNCC_CFLAGS += -m32
     40CMN1 = -m32
     41GCC_CFLAGS += $(CMN1)
     42ICC_CFLAGS += $(CMN1)
     43SUNCC_CFLAGS += $(CMN1)
    4144
    4245## Accepted CPUs
    … …  
    4447
    4548ifeq ($(MACHINE),athlon-xp)
    46         GCC_CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
     49        CMN2 = -march=athlon-xp -mmmx -msse -m3dnow
     50        GCC_CFLAGS += $(CMN2)
     51        ICC_CFLAGS += $(CMN2)
     52        SUNCC_CFLAGS += -xarch=ssea
    4753        DEFS += -DCONFIG_FENCES_P3
    4854        CONFIG_SMP = n
    … …  
    5056endif
    5157ifeq ($(MACHINE),athlon-mp)
    52         GCC_CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
     58        CMN2 = -march=athlon-mp -mmmx -msse -m3dnow
     59        GCC_CFLAGS += $(CMN2)
     60        ICC_CFLAGS += $(CMN2)
     61        SUNCC_CFLAGS += -xarch=ssea
    5362        DEFS += -DCONFIG_FENCES_P3
    5463        CONFIG_HT = n
    5564endif
    5665ifeq ($(MACHINE),pentium3)
    57         GCC_CFLAGS += -march=pentium3 -mmmx -msse
     66        CMN2 = -march=pentium3 -mmmx -msse
     67        GCC_CFLAGS += $(CMN2)
     68        ICC_CFLAGS += $(CMN2)
     69        SUNCC_CFLAGS += -xarch=sse
    5870        DEFS += -DCONFIG_FENCES_P3
    5971        CONFIG_HT = n
    6072endif
    6173ifeq ($(MACHINE),prescott)
    62         GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
     74        CMN2 = -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
     75        GCC_CFLAGS += $(CMN2)
     76        ICC_CFLAGS += $(CMN2)
     77        SUNCC_CFLAGS += -xarch=sse3
    6378        DEFS += -DCONFIG_FENCES_P4
    6479endif
    6580ifeq ($(MACHINE),pentium4)
    6681        GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
     82        ICC_CFLAGS += -march=pentium4
     83        SUNCC_CFLAGS += -xarch=sse2
    6784        DEFS += -DCONFIG_FENCES_P4
    6885endif

  • kernel/arch/ia64/Makefile.inc

    r99373fe r44bec47  
    3939INIT0_SIZE = 0x100000
    4040
    41 GCC_CFLAGS += -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
     41CMN1 = -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
     42GCC_CFLAGS += $(CMN1)
     43ICC_CFLAGS += $(CMN1)
     44
    4245LFLAGS += -EL
    4346AFLAGS += -mconstant-gp
    4447
    4548DEFS += -D__64_BITS__ -DINIT0_ADDRESS=$(INIT0_ADDRESS) -DINIT0_SIZE=$(INIT0_SIZE) -D$(MACHINE)
    46 
    4749
    4850

  • kernel/arch/sparc64/Makefile.inc

    r99373fe r44bec47  
    3636TOOLCHAIN_DIR = /usr/local/sparc64
    3737
    38 GCC_CFLAGS += -mcpu=ultrasparc -m64
    39 SUNCC_CFLAGS +=
     38GCC_CFLAGS += -m64 -mcpu=ultrasparc
     39SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl
     40
    4041LFLAGS += -no-check-sections -N
    4142
Note: See TracChangeset for help on using the changeset viewer.