Mercurial > illumos > illumos-gate
changeset 969:d3e3a7657934
6350648 gcc and boston putback don't get along
| author | anovick |
|---|---|
| date | Tue, 22 Nov 2005 12:35:05 -0800 |
| parents | 762cb2d9308b |
| children | 4574571f2d00 |
| files | usr/src/uts/sun4u/boston/os/boston.c usr/src/uts/sun4u/boston/platmod/Makefile usr/src/uts/sun4u/io/epic.c usr/src/uts/sun4u/seattle/os/seattle.c usr/src/uts/sun4u/seattle/platmod/Makefile |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/sun4u/boston/os/boston.c Tue Nov 22 11:25:34 2005 -0800 +++ b/usr/src/uts/sun4u/boston/os/boston.c Tue Nov 22 12:35:05 2005 -0800 @@ -384,7 +384,7 @@ void * plat_lgrp_cpu_to_hand(processorid_t id) { - return ((void *) CPUID_TO_LGRP(id)); + return ((void *)(uintptr_t)CPUID_TO_LGRP(id)); } /*
--- a/usr/src/uts/sun4u/boston/platmod/Makefile Tue Nov 22 11:25:34 2005 -0800 +++ b/usr/src/uts/sun4u/boston/platmod/Makefile Tue Nov 22 12:35:05 2005 -0800 @@ -75,7 +75,7 @@ LINT_LIB_DIR = $(BOSTON_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o"
--- a/usr/src/uts/sun4u/io/epic.c Tue Nov 22 11:25:34 2005 -0800 +++ b/usr/src/uts/sun4u/io/epic.c Tue Nov 22 12:35:05 2005 -0800 @@ -185,7 +185,7 @@ break; case DDI_INFO_DEVT2INSTANCE: - *result = (void *)inst; + *result = (void *)(uintptr_t)inst; break; default:
--- a/usr/src/uts/sun4u/seattle/os/seattle.c Tue Nov 22 11:25:34 2005 -0800 +++ b/usr/src/uts/sun4u/seattle/os/seattle.c Tue Nov 22 12:35:05 2005 -0800 @@ -353,7 +353,7 @@ void * plat_lgrp_cpu_to_hand(processorid_t id) { - return ((void *) CPUID_TO_LGRP(id)); + return ((void *)(uintptr_t)CPUID_TO_LGRP(id)); } /*
--- a/usr/src/uts/sun4u/seattle/platmod/Makefile Tue Nov 22 11:25:34 2005 -0800 +++ b/usr/src/uts/sun4u/seattle/platmod/Makefile Tue Nov 22 12:35:05 2005 -0800 @@ -75,7 +75,7 @@ LINT_LIB_DIR = $(SEATTLE_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o"