mergegcc9

7 files changed, 17 insertions, 23 deletions

diff --git a/usr/src/cmd/mdb/sparc/kmdb/kaif.c b/usr/src/cmd/mdb/sparc/kmdb/kaif.c
index b8a8565b16..6251b2e30e 100644
--- a/usr/src/cmd/mdb/sparc/kmdb/kaif.c
+++ b/usr/src/cmd/mdb/sparc/kmdb/kaif.c
@@ -397,7 +397,7 @@ kaif_wapt_reserve(kmdb_wapt_t *wp)
 	else
 		addrp = &kaif_vwapt_addr;
 
-	if (*addrp != NULL)
+	if (*addrp != 0)
 		return (set_errno(EMDB_WPTOOMANY));
 
 	*addrp = wp->wp_addr;
@@ -412,8 +412,8 @@ kaif_wapt_release(kmdb_wapt_t *wp)
 	uint64_t *addrp = (wp->wp_type == DPI_WAPT_TYPE_PHYS ?
 	    &kaif_pwapt_addr : &kaif_vwapt_addr);
 
-	ASSERT(*addrp != NULL);
-	*addrp = NULL;
+	ASSERT(*addrp != 0);
+	*addrp = 0;
 }
 
 /*ARGSUSED*/
@@ -487,10 +487,10 @@ kaif_wapt_set_regs(void)
 
 	ASSERT((kaif_lsuctl & ~KAIF_LSUCTL_WAPT_MASK) == NULL);
 
-	lsu = rdasi(ASI_LSU, NULL);
+	lsu = rdasi(ASI_LSU, (uintptr_t)NULL);
 	lsu &= ~KAIF_LSUCTL_WAPT_MASK;
 	lsu |= kaif_lsuctl;
-	wrasi(ASI_LSU, NULL, lsu);
+	wrasi(ASI_LSU, (uintptr_t)NULL, lsu);
 #endif /* sun4v */
 }
 
@@ -501,9 +501,9 @@ kaif_wapt_clear_regs(void)
 	 * Sun4v doesn't have watch point regs
 	 */
 #ifndef sun4v
-	uint64_t lsu = rdasi(ASI_LSU, NULL);
+	uint64_t lsu = rdasi(ASI_LSU, (uintptr_t)NULL);
 	lsu &= ~KAIF_LSUCTL_WAPT_MASK;
-	wrasi(ASI_LSU, NULL, lsu);
+	wrasi(ASI_LSU, (uintptr_t)NULL, lsu);
 #endif /* sun4v */
 }
 
@@ -742,7 +742,7 @@ static const mdb_bitmask_t krm_flag_bits[] = {
 	{ "M_PE",	KAIF_CRUMB_F_MAIN_OBPPENT, KAIF_CRUMB_F_MAIN_OBPPENT },
 	{ "M_NRM",	KAIF_CRUMB_F_MAIN_NORMAL, KAIF_CRUMB_F_MAIN_NORMAL },
 	{ "I_RE",	KAIF_CRUMB_F_IVEC_REENTER, KAIF_CRUMB_F_IVEC_REENTER },
-	{ "I_OBP", 	KAIF_CRUMB_F_IVEC_INOBP, KAIF_CRUMB_F_IVEC_INOBP },
+	{ "I_OBP",	KAIF_CRUMB_F_IVEC_INOBP, KAIF_CRUMB_F_IVEC_INOBP },
 	{ "I_NRM",	KAIF_CRUMB_F_IVEC_NORMAL, KAIF_CRUMB_F_IVEC_NORMAL },
 	{ "O_NRM",	KAIF_CRUMB_F_OBP_NORMAL, KAIF_CRUMB_F_OBP_NORMAL },
 	{ "O_REVEC",	KAIF_CRUMB_F_OBP_REVECT, KAIF_CRUMB_F_OBP_REVECT },
@@ -798,7 +798,7 @@ kaif_dump_crumbs(uintptr_t addr, int cpuid)
 {
 	int i;
 
-	if (addr != NULL) {
+	if (addr != (uintptr_t)NULL) {
 		/* dump_crumb will protect us from bogus addresses */
 		dump_crumb((kaif_crumb_t *)addr);
 
diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c
index b7cc077dee..0b7b150c40 100644
--- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c
+++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * SPARC-specific portions of the KDI
  */
@@ -66,7 +64,8 @@ kdi_cpu_ready_iter(int (*cb)(int, void *), void *arg)
 static int
 kdi_xc_one(int cpuid, void (*cb)(void))
 {
-	return (mdb.m_kdi->mkdi_xc_one(cpuid, (void (*)())cb, NULL, NULL));
+	return (mdb.m_kdi->mkdi_xc_one(cpuid, (void (*)())cb, (uintptr_t)NULL,
+	    (uintptr_t)NULL));
 }
 
 /*ARGSUSED1*/
@@ -157,7 +156,7 @@ kdi_halt_cpu(int cpuid, void *state_saverp)
 
 	if (state != DPI_CPU_STATE_MASTER && state != DPI_CPU_STATE_SLAVE) {
 		res = kdi_xc_one(cpuid, state_saver);
-			rc = 1;
+		rc = 1;
 
 		if (res == KDI_XC_RES_OK)
 			msg = "accepted the";
diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c
index 1d3781f1e9..3b233209de 100644
--- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c
+++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Context-saving routine used for pipelines.  Designed for use only
  * with kmdb_setcontext, and with the assumption that func() will never
@@ -59,6 +57,6 @@ kmdb_makecontext(ucontext_t *ucp, void (*func)(void *), void *arg, caddr_t stk,
 	ucp->uc_mcontext.gregs[REG_nPC] = (greg_t)func + 4;
 	ucp->uc_mcontext.gregs[REG_O0] = (greg_t)arg;
 	ucp->uc_mcontext.gregs[REG_SP] = (greg_t)(stack - STACK_BIAS);
-	ucp->uc_mcontext.gregs[REG_O7] = NULL;
-	ucp->uc_mcontext.gregs[REG_G7] = NULL;
+	ucp->uc_mcontext.gregs[REG_O7] = 0;
+	ucp->uc_mcontext.gregs[REG_G7] = 0;
 }
diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c
index 6db4861bd7..ff7aa494a0 100644
--- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c
+++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c
@@ -75,7 +75,7 @@ kmdb_prom_get_ddi_prop(kmdb_auxv_t *kav, char *propname)
 	ssize_t len;
 	char *val;
 
-	if ((node = prom_finddevice("/options")) == NULL)
+	if ((node = prom_finddevice("/options")) == 0)
 		return (NULL);
 
 	if ((len = prom_getproplen(node, propname)) < 0)
diff --git a/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c b/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c
index 50f60516a1..2839f47219 100644
--- a/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c
+++ b/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c
@@ -17,8 +17,6 @@
  * implemented.
  */
 
-#ifndef _KMDB
-
 #include <mdb/mdb_gcore.h>
 
 /* ARGSUSED */
@@ -54,5 +52,3 @@ gcore_prgetrvals(mdb_klwp_t *lwp, long *rval1, long *rval2)
 {
 	return (0);
 }
-
-#endif /* _KMDB */
diff --git a/usr/src/cmd/mdb/sparc/modules/intr/intr.c b/usr/src/cmd/mdb/sparc/modules/intr/intr.c
index cdfbf1c4ce..1ffb7edcce 100644
--- a/usr/src/cmd/mdb/sparc/modules/intr/intr.c
+++ b/usr/src/cmd/mdb/sparc/modules/intr/intr.c
@@ -64,7 +64,7 @@ static int detailed = 0; /* Print detailed view */
 static int
 intr_walk_init(mdb_walk_state_t *wsp)
 {
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = (uintptr_t)NULL;
 
 	return (WALK_NEXT);
 }
diff --git a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
index 00dadda34b..8bfb17c607 100644
--- a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
@@ -38,6 +38,7 @@ KMODSRCS = \
 
 MODSRCS = \
 	$(COMMONSRCS) \
+	gcore.c \
 	typegraph.c
 
 #