Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/Makefile	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -53,6 +53,5 @@
 
 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
-	-xnolib -xc99=all -xregs=no%float \
-	-D__FUNCTION__=__func__ -features=extensions \
+	-xnolib -xc99=all -features=extensions \
 	-erroff=E_ZERO_SIZED_STRUCT_UNION
 
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/amd64/src/interrupt.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -70,5 +70,5 @@
 		symbol = "";
 
-	printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __FUNCTION__);
+	printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __func__);
 	printf("%%rip: %#llx (%s)\n",istate->rip, symbol);
 	printf("ERROR_WORD=%#llx\n", istate->error_word);
Index: kernel/arch/ia32/src/smp/mps.c
===================================================================
--- kernel/arch/ia32/src/smp/mps.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/ia32/src/smp/mps.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -193,5 +193,5 @@
 	if (fs->config_type == 0 && fs->configuration_table) {
 		if (fs->mpfib2 >> 7) {
-			printf("%s: PIC mode not supported\n", __FUNCTION__);
+			printf("%s: PIC mode not supported\n", __func__);
 			return;
 		}
@@ -212,13 +212,13 @@
 		
 	if (ct->signature != CT_SIGNATURE) {
-		printf("%s: bad ct->signature\n", __FUNCTION__);
+		printf("%s: bad ct->signature\n", __func__);
 		return 1;
 	}
 	if (!mps_ct_check()) {
-		printf("%s: bad ct checksum\n", __FUNCTION__);
+		printf("%s: bad ct checksum\n", __func__);
 		return 1;
 	}
 	if (ct->oem_table) {
-		printf("%s: ct->oem_table not supported\n", __FUNCTION__);
+		printf("%s: ct->oem_table not supported\n", __func__);
 		return 1;
 	}
@@ -275,5 +275,5 @@
 				 */
 				 
-				printf("%s: ct badness\n", __FUNCTION__);
+				printf("%s: ct badness\n", __func__);
 				return 1;
 		}
@@ -292,5 +292,5 @@
 	 * Not yet implemented.
 	 */
-	printf("%s: not supported\n", __FUNCTION__);
+	printf("%s: not supported\n", __func__);
 	return 1;
 }
Index: kernel/arch/ia32xen/src/smp/mps.c
===================================================================
--- kernel/arch/ia32xen/src/smp/mps.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/ia32xen/src/smp/mps.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -195,5 +195,5 @@
 	if (fs->config_type == 0 && fs->configuration_table) {
 		if (fs->mpfib2 >> 7) {
-			printf("%s: PIC mode not supported\n", __FUNCTION__);
+			printf("%s: PIC mode not supported\n", __func__);
 			return;
 		}
@@ -214,13 +214,13 @@
 		
 	if (ct->signature != CT_SIGNATURE) {
-		printf("%s: bad ct->signature\n", __FUNCTION__);
+		printf("%s: bad ct->signature\n", __func__);
 		return 1;
 	}
 	if (!mps_ct_check()) {
-		printf("%s: bad ct checksum\n", __FUNCTION__);
+		printf("%s: bad ct checksum\n", __func__);
 		return 1;
 	}
 	if (ct->oem_table) {
-		printf("%s: ct->oem_table not supported\n", __FUNCTION__);
+		printf("%s: ct->oem_table not supported\n", __func__);
 		return 1;
 	}
@@ -277,5 +277,5 @@
 				 */
 				 
-				printf("%s: ct badness\n", __FUNCTION__);
+				printf("%s: ct badness\n", __func__);
 				return 1;
 		}
@@ -294,5 +294,5 @@
 	 * Not yet implemented.
 	 */
-	printf("%s: not supported\n", __FUNCTION__);
+	printf("%s: not supported\n", __func__);
 	return 1;
 }
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -471,5 +471,5 @@
 		if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
 		}
 	}
@@ -518,5 +518,5 @@
 		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
 		}
 	}
@@ -532,5 +532,5 @@
 void data_nested_tlb_fault(uint64_t vector, istate_t *istate)
 {
-	panic("%s\n", __FUNCTION__);
+	panic("%s\n", __func__);
 }
 
@@ -564,5 +564,5 @@
 		if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
 			t->d = true;
 			dtc_pte_copy(t);
@@ -601,5 +601,5 @@
 		if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
 			t->a = true;
 			itc_pte_copy(t);
@@ -638,5 +638,5 @@
 		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
 			t->a = true;
 			itc_pte_copy(t);
@@ -680,5 +680,5 @@
 		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
 			fault_if_from_uspace(istate,"Page fault at %p",va);
-			panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rid);
+			panic("%s: va=%p, rid=%d\n", __func__, va, rid);
 		}
 	}
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/sparc64/Makefile.inc	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -37,5 +37,5 @@
 
 GCC_CFLAGS += -m64 -mcpu=ultrasparc 
-SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl
+SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
 
 LFLAGS += -no-check-sections -N
Index: kernel/arch/sparc64/src/mm/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tlb.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/sparc64/src/mm/tlb.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -226,5 +226,5 @@
 		if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
 			do_fast_instruction_access_mmu_miss_fault(istate,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
@@ -254,5 +254,5 @@
 			/* NULL access in kernel */
 			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 		do_fast_data_access_mmu_miss_fault(istate, tag, "Unexpected "
@@ -281,5 +281,5 @@
 		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
 			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
@@ -327,5 +327,5 @@
 		if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
 			do_fast_data_access_protection_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
Index: kernel/arch/sparc64/src/smp/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/smp.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/sparc64/src/smp/smp.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -101,5 +101,5 @@
 		if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
 			printf("%s: waiting for processor (mid = %d) timed out\n",
-			    __FUNCTION__, mid);
+			    __func__, mid);
 	}
 }
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -54,7 +54,7 @@
 void instruction_access_exception(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -62,7 +62,7 @@
 void instruction_access_error(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -70,7 +70,7 @@
 void illegal_instruction(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -78,7 +78,7 @@
 void privileged_opcode(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -86,7 +86,7 @@
 void unimplemented_LDD(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -94,7 +94,7 @@
 void unimplemented_STD(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -114,7 +114,7 @@
 	scheduler_fpu_lazy_request();
 #else
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 #endif
 }
@@ -123,7 +123,7 @@
 void fp_exception_ieee_754(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -131,7 +131,7 @@
 void fp_exception_other(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -139,7 +139,7 @@
 void tag_overflow(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -147,7 +147,7 @@
 void division_by_zero(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -155,8 +155,8 @@
 void data_access_exception(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
 	dump_istate(istate);
 	dump_sfsr_and_sfar();
-	panic("%s\n", __FUNCTION__);
+	panic("%s\n", __func__);
 }
 
@@ -164,7 +164,7 @@
 void data_access_error(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -172,7 +172,7 @@
 void mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -180,7 +180,7 @@
 void LDDF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -188,7 +188,7 @@
 void STDF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -196,7 +196,7 @@
 void privileged_action(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -204,7 +204,7 @@
 void LDQF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -212,7 +212,7 @@
 void STQF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
Index: kernel/generic/include/panic.h
===================================================================
--- kernel/generic/include/panic.h	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/generic/include/panic.h	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -37,5 +37,5 @@
 
 #ifdef CONFIG_DEBUG
-#	define panic(format, ...) panic_printf("Kernel panic in %s() at %s on line %d: " format, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__);
+#	define panic(format, ...) panic_printf("Kernel panic in %s() at %s on line %d: " format, __func__, __FILE__, __LINE__, ##__VA_ARGS__);
 #else
 #	define panic(format, ...) panic_printf("Kernel panic: " format, ##__VA_ARGS__);
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/generic/include/synch/spinlock.h	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -113,5 +113,5 @@
 		printf("Deadlock probe %s: exceeded threshold %d\n",	\
 		    "cpu%d: function=%s, line=%d\n",			\
-		    #pname, (value), CPU->id, __FUNCTION__, __LINE__);	\
+		    #pname, (value), CPU->id, __func__, __LINE__);	\
 	}
 #else
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
+++ kernel/generic/src/console/kconsole.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -412,5 +412,5 @@
 
 	if (!stdin) {
-		printf("%s: no stdin\n", __FUNCTION__);
+		printf("%s: no stdin\n", __func__);
 		return;
 	}