Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision b4c46666922667b8ff6484f133293a5cd5acd0fd)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -87,7 +87,7 @@
 	 * Determine keyboard serial controller type.
 	 */
-	if (strcmp(name, "zs") == 0)
+	if (str_cmp(name, "zs") == 0)
 		kbd_type = KBD_Z8530;
-	else if (strcmp(name, "su") == 0)
+	else if (str_cmp(name, "su") == 0)
 		kbd_type = KBD_NS16550;
 	
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision b4c46666922667b8ff6484f133293a5cd5acd0fd)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -184,5 +184,5 @@
 	 * First, verify this is a PCI node.
 	 */
-	ASSERT(strcmp(ofw_tree_node_name(node), "pci") == 0);
+	ASSERT(str_cmp(ofw_tree_node_name(node), "pci") == 0);
 
 	/*
@@ -193,5 +193,5 @@
 		return NULL;
 	
-	if (strcmp(prop->value, "SUNW,sabre") == 0) {
+	if (str_cmp(prop->value, "SUNW,sabre") == 0) {
 		/*
 		 * PCI controller Sabre.
@@ -199,5 +199,5 @@
 		 */
 		return pci_sabre_init(node);
-	} else if (strcmp(prop->value, "SUNW,psycho") == 0) {
+	} else if (str_cmp(prop->value, "SUNW,psycho") == 0) {
 		/*
 		 * PCI controller Psycho.
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision b4c46666922667b8ff6484f133293a5cd5acd0fd)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -64,11 +64,11 @@
 	name = ofw_tree_node_name(node);
 	
-	if (strcmp(name, "SUNW,m64B") == 0)
+	if (str_cmp(name, "SUNW,m64B") == 0)
 		scr_type = SCR_ATYFB;
-	else if (strcmp(name, "SUNW,XVR-100") == 0)
+	else if (str_cmp(name, "SUNW,XVR-100") == 0)
 		scr_type = SCR_XVR;
-	else if (strcmp(name, "SUNW,ffb") == 0)
+	else if (str_cmp(name, "SUNW,ffb") == 0)
 		scr_type = SCR_FFB;
-	else if (strcmp(name, "cgsix") == 0)
+	else if (str_cmp(name, "cgsix") == 0)
 		scr_type = SCR_CGSIX;
 	
Index: kernel/arch/sparc64/src/drivers/sgcn.c
===================================================================
--- kernel/arch/sparc64/src/drivers/sgcn.c	(revision b4c46666922667b8ff6484f133293a5cd5acd0fd)
+++ kernel/arch/sparc64/src/drivers/sgcn.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -208,10 +208,10 @@
 	init_sram_begin();
 		
-	ASSERT(strcmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
+	ASSERT(str_cmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
 	
 	/* lookup TOC entry with the correct key */
 	uint32_t i;
 	for (i = 0; i < MAX_TOC_ENTRIES; i++) {
-		if (strcmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
+		if (str_cmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
 			break;
 	}