Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ HelenOS.config	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -255,5 +255,4 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
-@ "suncc" Sun Studio C Compiler
 @ "clang" Clang
 ! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
@@ -268,5 +267,4 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-@ "suncc" Sun Studio C Compiler
 ! [PLATFORM=sparc64] COMPILER (choice)
 
Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ boot/Makefile.build	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -47,8 +47,4 @@
 	-Werror-implicit-function-declaration -wd170
 
-SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
-	-xnolib -xc99=all -features=extensions \
-	-erroff=E_ZERO_SIZED_STRUCT_UNION
-
 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
 	-fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
@@ -66,5 +62,4 @@
 	GCC_CFLAGS += -g
 	ICC_CFLAGS += -g
-	SUNCC_CFLAGS += -g
 	CLANG_CFLAGS += -g
 endif
@@ -83,10 +78,4 @@
 	CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),suncc)
-	CFLAGS = $(SUNCC_CFLAGS) $(EXTRA_CFLAGS)
-	DEFS += $(CONFIG_DEFS)
-	DEPEND_DEFS = $(DEFS)
 endif
 
Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ kernel/Makefile	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -103,8 +103,4 @@
 	-Werror-implicit-function-declaration -wd170
 
-SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
-	-xnolib -xc99=all -features=extensions \
-	-erroff=E_ZERO_SIZED_STRUCT_UNION
-
 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
 	-fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
@@ -126,5 +122,4 @@
 	GCC_CFLAGS += -g
 	ICC_CFLAGS += -g
-	SUNCC_CFLAGS += -g
 	CLANG_CFLAGS += -g
 endif
@@ -180,11 +175,4 @@
 	CFLAGS = $(ICC_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-	INSTRUMENTATION =
-endif
-
-ifeq ($(COMPILER),suncc)
-	CFLAGS = $(SUNCC_CFLAGS)
-	DEFS += $(CONFIG_DEFS)
-	DEPEND_DEFS = $(DEFS)
 	INSTRUMENTATION =
 endif
Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ kernel/arch/amd64/Makefile.inc	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -55,5 +55,4 @@
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += -m64 -xmodel=kernel
 
 BITS = 64
@@ -67,5 +66,4 @@
 	GCC_CFLAGS += $(CMN2)
 	ICC_CFLAGS += $(CMN2)
-	SUNCC_CFLAGS += -xtarget=opteron
 endif
 
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ kernel/arch/ia32/Makefile.inc	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -38,5 +38,4 @@
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += $(CMN1)
 CLANG_CFLAGS += $(CMN1)
 
@@ -50,25 +49,20 @@
 ifeq ($(PROCESSOR),athlon_xp)
 	CMN2 = -march=athlon-xp
-	SUNCC_CFLAGS += -xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),athlon_mp)
 	CMN2 = -march=athlon-mp
-	SUNCC_CFLAGS += xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),pentium3)
 	CMN2 = -march=pentium3
-	SUNCC_CFLAGS += -xarch=sse
 endif
 
 ifeq ($(PROCESSOR),pentium4)
 	CMN2 = -march=pentium4
-	SUNCC_CFLAGS += -xarch=sse2
 endif
 
 ifeq ($(PROCESSOR),core)
 	CMN2 = -march=prescott
-	SUNCC_CFLAGS += -xarch=sse3
 endif
 
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ kernel/arch/sparc64/Makefile.inc	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -32,5 +32,4 @@
 
 GCC_CFLAGS += -m64 -mcpu=ultrasparc -mcmodel=medlow -mno-fpu
-SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
 
 LFLAGS += -no-check-sections
Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ tools/autotool.py	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -720,10 +720,4 @@
 			check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
 		
-		if (config['COMPILER'] == "suncc"):
-			common['CC'] = "suncc"
-			check_app([common['CC'], "-V"], "Sun Studio Compiler", "support is experimental")
-			check_gcc(None, "", common, PACKAGE_GCC)
-			check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
-		
 		if (config['COMPILER'] == "clang"):
 			common['CC'] = "clang"
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 652b77645d9fbe7e7938050afd87bf83238f7044)
+++ uspace/Makefile.common	(revision 33f96708f7ea32bedcc423594c60e331329f0173)
@@ -207,5 +207,4 @@
 	GCC_CFLAGS += -g
 	ICC_CFLAGS += -g
-	SUNCC_CFLAGS += -g
 	CLANG_CFLAGS += -g
 endif