Fix GCC image building

2011-07-09 15:04:42 +02:00 · 2011-07-09 15:04:42 +02:00 · b956c8735e
commit b956c8735e
parent a97a80178e
42 changed files with 64 additions and 57 deletions
--- a/drivers/Makefile.inc
+++ b/drivers/Makefile.inc
@ -1,7 +1,7 @@
-.if (${NBSD_LIBC} != "no")
+.if ${COMPILER_TYPE} == "gnu"
 CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix
-DEPEND+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
 .else
 CPPFLAGS+= -D_MINIX -D_POSIX_SOURCE
 .endif
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@ -149,6 +149,6 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>

 .endif
--- a/drivers/ahci/Makefile
+++ b/drivers/ahci/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/amddev/Makefile
+++ b/drivers/amddev/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/at_wini/Makefile
+++ b/drivers/at_wini/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/atl2/Makefile
+++ b/drivers/atl2/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/bios_wini/Makefile
+++ b/drivers/bios_wini/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/dec21140A/Makefile
+++ b/drivers/dec21140A/Makefile
@ -14,4 +14,4 @@ BINDIR?= /usr/sbin
 debug=		0
 CPPFLAGS+=	-Ddebug=${debug} -w

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/dp8390/Makefile
+++ b/drivers/dp8390/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/dpeth/Makefile
+++ b/drivers/dpeth/Makefile
@ -14,4 +14,4 @@ BINDIR?= /usr/sbin
 debug=		0
 CPPFLAGS+=	-Ddebug=$(debug)

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/e1000/Makefile
+++ b/drivers/e1000/Makefile
@ -11,4 +11,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/filter/Makefile
+++ b/drivers/filter/Makefile
@ -11,4 +11,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS+= -DDEBUG=1 -DDEBUG2=0

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/floppy/Makefile
+++ b/drivers/floppy/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/fxp/Makefile
+++ b/drivers/fxp/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/hello/Makefile
+++ b/drivers/hello/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/lance/Makefile
+++ b/drivers/lance/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/orinoco/Makefile
+++ b/drivers/orinoco/Makefile
@ -11,4 +11,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS.orinoco.c+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/printer/Makefile
+++ b/drivers/printer/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@ -159,4 +159,4 @@ elfstrip: $(PROGRAMS)
 	strip $(PROGRAMS)
 .endif

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@ -13,5 +13,5 @@ BINDIR?= /usr/sbin

 CPPFLAGS.random.c+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>

--- a/drivers/readclock/Makefile
+++ b/drivers/readclock/Makefile
@ -11,4 +11,4 @@ BINDIR?= /sbin

 CPPFLAGS+= -D_SYSTEM=1

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@ -11,4 +11,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/rtl8169/Makefile
+++ b/drivers/rtl8169/Makefile
@ -11,4 +11,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/drivers/ti1225/Makefile
+++ b/drivers/ti1225/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/kernel/Makefile
+++ b/kernel/Makefile
@ -22,26 +22,17 @@ CFLAGS += -D__kernel__
 LDFLAGS+= -.o
 .elif ${COMPILER_TYPE} == "gnu"
 CFLAGS+=-march=i386
-CPPFLAGS+= -ffreestanding -fno-stack-protector
+CPPFLAGS+= -ffreestanding -fno-stack-protector -D_NETBSD_SOURCE
 LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds
 LDFLAGS+= -nostdlib -L${LIBDIR}
-.endif
-
-.if (${NBSD_LIBC} != "no")
 LDADD+= -lminlib
 DPADD+= ${LIBMINLIB}
-CPPFLAGS+= -D_NETBSD_SOURCE
-.else
-
 .if ${CC} == "gcc"
-DPADD+=	${LIBC}
-LDADD+=	-lgcc -lc -lgcc
+LDADD+=	-lgcc -lsys -lgcc
 .elif ${CC} == "clang"
+LDADD+= -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
 DPADD+=	${LIBC}
-LDADD+= -L/usr/pkg/lib
-LDADD+= -lCompilerRT-Generic -lc -lCompilerRT-Generic
 .endif
-
 .endif

 CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
--- a/nbsd_include/stdlib.h
+++ b/nbsd_include/stdlib.h
@ -244,6 +244,8 @@ int	 posix_memalign(void **, size_t, size_t);
 void	*alloca(int);     /* built-in for gcc */
 #elif defined(__PCC__) && !defined(__GNUC__)
 #define alloca(size) __builtin_alloca(size)
+#elif (__GNUC__ >= 2)
+#define alloca(size) __builtin_alloca(size)
 #else
 void	*alloca(size_t);
 #endif /* __GNUC__ */
--- a/servers/Makefile.inc
+++ b/servers/Makefile.inc
@ -1,4 +1,4 @@
-.if (${NBSD_LIBC} != "no")
+.if ${COMPILER_TYPE} == "gnu"
 CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
--- a/servers/devman/Makefile
+++ b/servers/devman/Makefile
@ -9,4 +9,4 @@ BINDIR?= /sbin
 INSTALLFLAGS+=	-S 128k

 MAN=
-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/ext2/Makefile
+++ b/servers/ext2/Makefile
@ -16,4 +16,4 @@ INSTALLFLAGS+= -S 128k
 DEFAULT_NR_BUFS= 1024
 CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/hgfs/Makefile
+++ b/servers/hgfs/Makefile
@ -11,4 +11,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@ -21,4 +21,4 @@ BINDIR?= /usr/sbin

 CPPFLAGS+=  -I${.CURDIR} -D_MINIX

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/init/Makefile
+++ b/servers/init/Makefile
@ -1,4 +1,6 @@
 # Makefile for the init program (INIT)
+.include <bsd.own.mk>
+
 PROG=	init
 SRCS=	init.c

@ -7,4 +9,8 @@ MAN=
 BINDIR?= /usr/sbin
 INSTALLFLAGS+=	-S 64k

-.include <minix.bootprog.mk>
+.if ${OBJECT_FMT} == "ELF"
+LDFLAGS+= -Wl,--section-start=.init=0x0
+.endif
+
+.include <bsd.prog.mk>
--- a/servers/ipc/Makefile
+++ b/servers/ipc/Makefile
@ -9,4 +9,4 @@ MAN=

 BINDIR?= /usr/sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@ -13,4 +13,4 @@ CPPFLAGS.dmp_kernel.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.dmp_rs.c+=	-I${MINIXSRCDIR}
 CPPFLAGS.dmp_vm.c+=	-I${MINIXSRCDIR}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/iso9660fs/Makefile
+++ b/servers/iso9660fs/Makefile
@ -13,4 +13,4 @@ BINDIR?= /sbin
 NR_BUFS= 100
 CPPFLAGS+= -DNR_BUFS=${NR_BUFS}

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/lwip/Makefile
+++ b/servers/lwip/Makefile
@ -23,4 +23,4 @@ CPPFLAGS+= -I${.CURDIR}/../../lib/liblwip/include

 CFLAGS += -Wextra -std=c99

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/servers/procfs/Makefile
+++ b/servers/procfs/Makefile
@ -11,4 +11,4 @@ MAN=

 BINDIR?= /sbin

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@ -11,7 +11,7 @@ FILES=	bsd.ack.mk bsd.dep.mk bsd.files.mk \
 	pkgsrchooks.mk sys.mk

 # MINIX-specific files
-FILES+= minix.bootprog.mk
+FILES+= minix.bootprog.mk minix.service.mk

 FILESDIR=/usr/share/mk
 .endif
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@ -187,12 +187,6 @@ _LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
 _LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}

-.if defined(NBSD_LIBC) && (${NBSD_LIBC} == "yes") && \
-    !empty(_LDADD.${_P}:M-lsys)
-#    defined(USE_LIBSYS) && (${USE_LIBSYS} == "yes")
-_LDADD.${_P}+=		-nodefaultlibs -lgcc -lsys -lgcc
-.endif
-
 ##### Build and install rules
 .if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
 SRCS+=		${SRCS.${_P}} # For bsd.dep.mk
--- a/share/mk/minix.bootprog.mk
+++ b/share/mk/minix.bootprog.mk
@ -5,4 +5,4 @@
 LDFLAGS+= -Wl,--section-start=.init=0x0
 .endif

-.include <bsd.prog.mk>
+.include <minix.service.mk>
--- a/share/mk/minix.service.mk
+++ b/share/mk/minix.service.mk
@ -0,0 +1,14 @@
+# MINIX-specific servers/drivers options
+.include <bsd.own.mk>
+
+.if ${COMPILER_TYPE} == "gnu"
+
+.if ${CC} == "gcc"
+LDADD+= -nodefaultlibs -lgcc -lsys -lgcc
+.elif ${CC} == "clang"
+LDADD+= -nodefaultlibs -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
+.endif
+
+.endif
+
+.include <bsd.prog.mk>