6309152 gcc and mdesc don't get along

6309756 gcc and niagara perfctr don't get along
6309977 gcc and glvc don't get along
6310446 gcc and gcn don't get along
6310609 gcc and sun4v kernel support don't get along

8 files changed, 12 insertions, 11 deletions

diff --git a/usr/src/common/mdesc/mdesc_init_intern.c b/usr/src/common/mdesc/mdesc_init_intern.c
index 2ba2877abb..d4a9226e9e 100644
--- a/usr/src/common/mdesc/mdesc_init_intern.c
+++ b/usr/src/common/mdesc/mdesc_init_intern.c
@@ -45,7 +45,7 @@ md_init_intern(uint64_t *ptr, void *(*allocp)(size_t),
 	 * Very basic checkup for alignment to avoid
 	 * bus error issues.
 	 */
-	if ((((uint64_t)ptr)&7) != 0)
+	if ((((uintptr_t)ptr)&7) != 0)
 		return (NULL);
 
 	mdp = (md_impl_t *)allocp(sizeof (md_impl_t));
diff --git a/usr/src/uts/common/sys/mdesc_impl.h b/usr/src/uts/common/sys/mdesc_impl.h
index 9d8083a513..e0f2ced499 100644
--- a/usr/src/uts/common/sys/mdesc_impl.h
+++ b/usr/src/uts/common/sys/mdesc_impl.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#define	LIBMD_MAGIC	0x4d61636844657363	/* MachDesc */
+#define	LIBMD_MAGIC	0x4d61636844657363ULL	/* MachDesc */
 
 #ifndef _ASM
 
diff --git a/usr/src/uts/sun4v/cpu/niagara_perfctr.c b/usr/src/uts/sun4v/cpu/niagara_perfctr.c
index c90132aa49..ced81d742f 100644
--- a/usr/src/uts/sun4v/cpu/niagara_perfctr.c
+++ b/usr/src/uts/sun4v/cpu/niagara_perfctr.c
@@ -410,7 +410,7 @@ ni_cntr_kstat_update(kstat_t *ksp, int rw)
 	if (rw == KSTAT_WRITE) {
 #ifdef DEBUG
 		if (ni_perf_debug)
-			printf("ni_cntr_kstat_update: wr pcr-%d: %llx\n",
+			printf("ni_cntr_kstat_update: wr pcr-%d: %lx\n",
 			    ksinfop->pcr_reg, data_p[0].value.ui64);
 #endif
 		if (hv_niagara_setperf(ksinfop->pcr_reg, data_p[0].value.ui64))
diff --git a/usr/src/uts/sun4v/io/glvc.c b/usr/src/uts/sun4v/io/glvc.c
index 7e720ed110..0743b9d329 100644
--- a/usr/src/uts/sun4v/io/glvc.c
+++ b/usr/src/uts/sun4v/io/glvc.c
@@ -936,7 +936,7 @@ glvc_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cred_p,
 					    glvc_peek_msg.buflen;
 
 				if (ddi_copyout((caddr_t)glvc_peek_msg.buf,
-				    (caddr_t)msg_peek_cmd32.buf32,
+				    (caddr_t)(uintptr_t)msg_peek_cmd32.buf32,
 				    msg_peek_cmd32.buflen32, mode) == -1) {
 					retval = EFAULT;
 					break;
diff --git a/usr/src/uts/sun4v/io/mdesc.c b/usr/src/uts/sun4v/io/mdesc.c
index e09290a8de..84dc13fdc0 100644
--- a/usr/src/uts/sun4v/io/mdesc.c
+++ b/usr/src/uts/sun4v/io/mdesc.c
@@ -197,7 +197,7 @@ mdesc_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg, void **resultp)
 			*resultp = NULL;
 		break;
 	case DDI_INFO_DEVT2INSTANCE:
-		*resultp = (void *)getminor((dev_t)arg);
+		*resultp = (void *)(uintptr_t)getminor((dev_t)arg);
 		retval = DDI_SUCCESS;
 		break;
 	}
diff --git a/usr/src/uts/sun4v/io/qcn.c b/usr/src/uts/sun4v/io/qcn.c
index 50853cc010..e68e1bde53 100644
--- a/usr/src/uts/sun4v/io/qcn.c
+++ b/usr/src/uts/sun4v/io/qcn.c
@@ -376,7 +376,7 @@ qcn_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	    (ddi_iblock_cookie_t)(uint64_t)soft_prip;
 
 	mutex_init(&qcn_state->qcn_hi_lock, NULL, MUTEX_DRIVER,
-	    (void *)(qcn_state->qcn_intr_pri));
+	    (void *)(uintptr_t)(qcn_state->qcn_intr_pri));
 	mutex_init(&qcn_state->qcn_softlock, NULL, MUTEX_DRIVER,
 	    (void *)(qcn_state->qcn_soft_pri));
 	}
@@ -448,7 +448,7 @@ qcn_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result)
 		prom_printf("qcn_getinfo(): devt2instance %lx\n", arg);
 #endif
 		if (getminor((dev_t)arg) == 0) {
-			*result = (void *)instance;
+			*result = (void *)(uintptr_t)instance;
 			error = DDI_SUCCESS;
 		}
 		break;
@@ -831,7 +831,7 @@ qcn_flush(void)
 
 	q = qcn_state->qcn_writeq;
 
-	prom_printf("qcn_flush(): WARNING console output is dropped time=%x\n",
+	prom_printf("qcn_flush(): WARNING console output is dropped time=%lx\n",
 	    gethrestime_sec());
 	while (mp = getq(q))
 		freemsg(mp);
diff --git a/usr/src/uts/sun4v/os/mach_cpu_states.c b/usr/src/uts/sun4v/os/mach_cpu_states.c
index 5e6a757cfa..75e2421e69 100644
--- a/usr/src/uts/sun4v/os/mach_cpu_states.c
+++ b/usr/src/uts/sun4v/os/mach_cpu_states.c
@@ -410,7 +410,8 @@ ptl1_init_cpu(struct cpu *cpu)
 	/*CONSTCOND*/
 	if (sizeof (struct cpu) + PTL1_SSIZE > CPU_ALLOC_SIZE) {
 		panic("ptl1_init_cpu: not enough space left for ptl1_panic "
-		    "stack, sizeof (struct cpu) = %d", sizeof (struct cpu));
+		    "stack, sizeof (struct cpu) = %lu",
+		    (unsigned long)sizeof (struct cpu));
 	}
 
 	pstate->ptl1_stktop = (uintptr_t)cpu + CPU_ALLOC_SIZE;
diff --git a/usr/src/uts/sun4v/os/mach_startup.c b/usr/src/uts/sun4v/os/mach_startup.c
index 8da9058619..6fd5ccd530 100644
--- a/usr/src/uts/sun4v/os/mach_startup.c
+++ b/usr/src/uts/sun4v/os/mach_startup.c
@@ -325,13 +325,13 @@ htrap_trace_register(int cpuid)
 		if (ret != H_EOK) {
 			cmn_err(CE_WARN,
 			    "!cpu%d: HV traptracing not enabled, "
-			    "ta: 0x%x returned error: %d",
+			    "ta: 0x%x returned error: %ld",
 			    cpuid, TTRACE_ENABLE, ret);
 		}
 	} else {
 		cmn_err(CE_WARN,
 		    "!cpu%d: HV traptrace buffer not configured, "
-		    "ta: 0x%x returned error: %d",
+		    "ta: 0x%x returned error: %ld",
 		    cpuid, TTRACE_BUF_CONF, ret);
 	}
 	/* set hvaddr_base to NULL when traptrace buffer registration fails */