Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
+++ HelenOS.config	(revision 1e847fbcb4712071589c4f54374e938fab6054fb)
@@ -25,5 +25,5 @@
 @ "gcc_native" GCC Native
 @ "icc_native" ICC Native
-@ "sscc_native" Sun Studio C Compiler
+@ "suncc_native" Sun Studio C Compiler
 ! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen] COMPILER (choice)
 
@@ -37,5 +37,5 @@
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-@ "sscc_native" Sun Studio C Compiler
+@ "suncc_native" Sun Studio C Compiler
 ! [PLATFORM=sparc64] COMPILER (choice)
 
Index: boot/boot.config
===================================================================
--- boot/boot.config	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
+++ boot/boot.config	(revision 1e847fbcb4712071589c4f54374e938fab6054fb)
@@ -17,5 +17,5 @@
 @ "gcc_native" GCC Native                                                                                         
 @ "icc_native" ICC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=amd64|ARCH=ia32|ARCH=ia32xen] COMPILER (choice)                                               
                                                                                                                   
@@ -29,5 +29,5 @@
 @ "gcc_cross" GCC Cross-compiler                                                                                  
 @ "gcc_native" GCC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=sparc64] COMPILER (choice)                                                                            
                                                                                                                   
Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
+++ kernel/Makefile	(revision 1e847fbcb4712071589c4f54374e938fab6054fb)
@@ -130,4 +130,13 @@
 ifeq ($(COMPILER),icc_native)
 	CC = icc
+	AS = as
+	LD = ld
+	OBJCOPY = objcopy
+	OBJDUMP = objdump
+	LIBDIR = /usr/lib
+endif
+
+ifeq ($(COMPILER),suncc_native)
+	CC = suncc
 	AS = as
 	LD = ld
Index: kernel/kernel.config
===================================================================
--- kernel/kernel.config	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
+++ kernel/kernel.config	(revision 1e847fbcb4712071589c4f54374e938fab6054fb)
@@ -17,5 +17,5 @@
 @ "gcc_native" GCC Native                                                                                         
 @ "icc_native" ICC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=amd64|ARCH=ia32|ARCH=ia32xen] COMPILER (choice)                                               
                                                                                                                   
@@ -29,5 +29,5 @@
 @ "gcc_cross" GCC Cross-compiler                                                                                  
 @ "gcc_native" GCC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=sparc64] COMPILER (choice)                                                                            
                                                                                                                   
Index: uspace/uspace.config
===================================================================
--- uspace/uspace.config	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
+++ uspace/uspace.config	(revision 1e847fbcb4712071589c4f54374e938fab6054fb)
@@ -17,5 +17,5 @@
 @ "gcc_native" GCC Native                                                                                         
 @ "icc_native" ICC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=amd64|ARCH=ia32] COMPILER (choice)                                               
                                                                                                                   
@@ -29,5 +29,5 @@
 @ "gcc_cross" GCC Cross-compiler                                                                                  
 @ "gcc_native" GCC Native                                                                                         
-@ "sscc_native" Sun Studio C Compiler                                                                             
+@ "suncc_native" Sun Studio C Compiler                                                                             
 ! [ARCH=sparc64] COMPILER (choice)