diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index cd8225b2a..28f852e13 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -1,5 +1,10 @@ # $NetBSD: Makefile,v 1.10 2004/02/09 06:52:34 lukem Exp $ +.if defined(__MINIX) +NOCLANGERROR=yes +NOGCCERROR=yes +.endif + PROG= install-info SRCS= install-info.c diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile index fe651aa39..4a24d4586 100644 --- a/gnu/usr.bin/texinfo/texindex/Makefile +++ b/gnu/usr.bin/texinfo/texindex/Makefile @@ -1,5 +1,10 @@ # $NetBSD: Makefile,v 1.4 2003/01/17 15:32:25 wiz Exp $ +.if defined(__MINIX) +NOGCCERROR=yes +NOCLANGERROR=yes +.endif + PROG= texindex SRCS= texindex.c diff --git a/kernel/arch/earm/omap_padconf.c b/kernel/arch/earm/omap_padconf.c index cb67cac95..3b6638a8b 100644 --- a/kernel/arch/earm/omap_padconf.c +++ b/kernel/arch/earm/omap_padconf.c @@ -45,7 +45,7 @@ void arch_padconf_init(void) { kern_phys_map_ptr(omap_padconf.base, omap_padconf.size, - &padconf_phys_map, &omap_padconf.base); + &padconf_phys_map, (vir_bytes) &omap_padconf.base); return; } diff --git a/kernel/arch/earm/omap_rtc.c b/kernel/arch/earm/omap_rtc.c index 849d77fbd..26e2eca33 100644 --- a/kernel/arch/earm/omap_rtc.c +++ b/kernel/arch/earm/omap_rtc.c @@ -41,7 +41,7 @@ omap3_rtc_init(void) { #ifdef AM335X kern_phys_map_ptr(omap_rtc.base, omap_rtc.size, &rtc_phys_map, - &omap_rtc.base); + (vir_bytes) &omap_rtc.base); #endif /* AM335X */ } diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 448d098f6..5bdb81b27 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -85,12 +85,6 @@ LDS_RELOC= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xr LDS_SHARED_LIB= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xsc LDS_N= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xbn -# LSC In the current state there is too much to be done -# Some package have been identified by directly adding NOGCCERROR -# To their Makefiles -NOGCCERROR?= yes -NOCLANGERROR?= yes - AFLAGS+= -D__ASSEMBLY__ CFLAGS+= -fno-builtin