Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 33f9670 in mainline


Ignore:
Timestamp:
2012-06-10T10:13:11Z (8 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
Children:
1d4024cf
Parents:
652b776 (diff), 2689a0b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r652b776 r33f9670  
    255255@ "gcc_native" GNU C Compiler (native)
    256256@ "icc" Intel C Compiler
    257 @ "suncc" Sun Studio C Compiler
    258257@ "clang" Clang
    259258! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
     
    268267@ "gcc_cross" GNU C Compiler (cross-compiler)
    269268@ "gcc_native" GNU C Compiler (native)
    270 @ "suncc" Sun Studio C Compiler
    271269! [PLATFORM=sparc64] COMPILER (choice)
    272270
  • boot/Makefile.build

    r652b776 r33f9670  
    4747        -Werror-implicit-function-declaration -wd170
    4848
    49 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
    50         -xnolib -xc99=all -features=extensions \
    51         -erroff=E_ZERO_SIZED_STRUCT_UNION
    52 
    5349CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    5450        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
     
    6662        GCC_CFLAGS += -g
    6763        ICC_CFLAGS += -g
    68         SUNCC_CFLAGS += -g
    6964        CLANG_CFLAGS += -g
    7065endif
     
    8378        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    8479        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    85 endif
    86 
    87 ifeq ($(COMPILER),suncc)
    88         CFLAGS = $(SUNCC_CFLAGS) $(EXTRA_CFLAGS)
    89         DEFS += $(CONFIG_DEFS)
    90         DEPEND_DEFS = $(DEFS)
    9180endif
    9281
  • kernel/Makefile

    r652b776 r33f9670  
    103103        -Werror-implicit-function-declaration -wd170
    104104
    105 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
    106         -xnolib -xc99=all -features=extensions \
    107         -erroff=E_ZERO_SIZED_STRUCT_UNION
    108 
    109105CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    110106        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
     
    126122        GCC_CFLAGS += -g
    127123        ICC_CFLAGS += -g
    128         SUNCC_CFLAGS += -g
    129124        CLANG_CFLAGS += -g
    130125endif
     
    180175        CFLAGS = $(ICC_CFLAGS)
    181176        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    182         INSTRUMENTATION =
    183 endif
    184 
    185 ifeq ($(COMPILER),suncc)
    186         CFLAGS = $(SUNCC_CFLAGS)
    187         DEFS += $(CONFIG_DEFS)
    188         DEPEND_DEFS = $(DEFS)
    189177        INSTRUMENTATION =
    190178endif
  • kernel/arch/amd64/Makefile.inc

    r652b776 r33f9670  
    5555GCC_CFLAGS += $(CMN1)
    5656ICC_CFLAGS += $(CMN1)
    57 SUNCC_CFLAGS += -m64 -xmodel=kernel
    5857
    5958BITS = 64
     
    6766        GCC_CFLAGS += $(CMN2)
    6867        ICC_CFLAGS += $(CMN2)
    69         SUNCC_CFLAGS += -xtarget=opteron
    7068endif
    7169
  • kernel/arch/ia32/Makefile.inc

    r652b776 r33f9670  
    3838GCC_CFLAGS += $(CMN1)
    3939ICC_CFLAGS += $(CMN1)
    40 SUNCC_CFLAGS += $(CMN1)
    4140CLANG_CFLAGS += $(CMN1)
    4241
     
    5049ifeq ($(PROCESSOR),athlon_xp)
    5150        CMN2 = -march=athlon-xp
    52         SUNCC_CFLAGS += -xarch=ssea
    5351endif
    5452
    5553ifeq ($(PROCESSOR),athlon_mp)
    5654        CMN2 = -march=athlon-mp
    57         SUNCC_CFLAGS += xarch=ssea
    5855endif
    5956
    6057ifeq ($(PROCESSOR),pentium3)
    6158        CMN2 = -march=pentium3
    62         SUNCC_CFLAGS += -xarch=sse
    6359endif
    6460
    6561ifeq ($(PROCESSOR),pentium4)
    6662        CMN2 = -march=pentium4
    67         SUNCC_CFLAGS += -xarch=sse2
    6863endif
    6964
    7065ifeq ($(PROCESSOR),core)
    7166        CMN2 = -march=prescott
    72         SUNCC_CFLAGS += -xarch=sse3
    7367endif
    7468
  • kernel/arch/sparc64/Makefile.inc

    r652b776 r33f9670  
    3232
    3333GCC_CFLAGS += -m64 -mcpu=ultrasparc -mcmodel=medlow -mno-fpu
    34 SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
    3534
    3635LFLAGS += -no-check-sections
  • tools/autotool.py

    r652b776 r33f9670  
    720720                        check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
    721721               
    722                 if (config['COMPILER'] == "suncc"):
    723                         common['CC'] = "suncc"
    724                         check_app([common['CC'], "-V"], "Sun Studio Compiler", "support is experimental")
    725                         check_gcc(None, "", common, PACKAGE_GCC)
    726                         check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
    727                
    728722                if (config['COMPILER'] == "clang"):
    729723                        common['CC'] = "clang"
  • uspace/Makefile.common

    r652b776 r33f9670  
    207207        GCC_CFLAGS += -g
    208208        ICC_CFLAGS += -g
    209         SUNCC_CFLAGS += -g
    210209        CLANG_CFLAGS += -g
    211210endif
Note: See TracChangeset for help on using the changeset viewer.