diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 16 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 23 | ||||
| -rw-r--r-- | sys/arch/i386/stand/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/Makefile | 9 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/Makefile | 9 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libkern/Makefile | 22 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/Makefile | 9 |
7 files changed, 48 insertions, 44 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 4ff169db45c..6b33f326b96 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.48 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.49 2007/11/25 18:25:28 deraadt Exp $ # Makefile for OpenBSD # @@ -54,19 +54,12 @@ HOSTCC= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} -### find out what to use for libkern -.include "$S/lib/libkern/Makefile.inc" -.ifndef PROF -LIBKERN= ${KERNLIB} -.else -LIBKERN= ${KERNLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP} # where TYPE is NORMAL, DRIVER, or PROFILE; SUFFIX is the file suffix, # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file # is marked as config-dependent. +NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $< @@ -89,7 +82,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ @@ -121,6 +114,9 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${NORMAL_C_C} +mcount.o: $S/lib/libkern/mcount.c Makefile + ${NORMAL_C_NOP} + ioconf.o: ioconf.c ${NORMAL_C} diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 0466e09ec8e..6c288408bd8 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.169 2007/11/25 17:11:12 oga Exp $ +# $OpenBSD: files.i386,v 1.170 2007/11/25 18:25:28 deraadt Exp $ # # new style config file for i386 architecture # @@ -446,3 +446,24 @@ file arch/i386/i386/esm.c esm needs-flag include "dev/vesa/files.vesa" #include "dev/rasops/files.rasops" + +# quad support is neccessary for 32 bit architectures +file lib/libkern/adddi3.c +file lib/libkern/anddi3.c +file lib/libkern/ashldi3.c +file lib/libkern/ashrdi3.c +file lib/libkern/cmpdi2.c +file lib/libkern/divdi3.c +file lib/libkern/iordi3.c +file lib/libkern/lshldi3.c +file lib/libkern/lshrdi3.c +file lib/libkern/moddi3.c +file lib/libkern/muldi3.c +file lib/libkern/negdi2.c +file lib/libkern/notdi2.c +file lib/libkern/qdivrem.c +file lib/libkern/subdi3.c +file lib/libkern/ucmpdi2.c +file lib/libkern/udivdi3.c +file lib/libkern/umoddi3.c +file lib/libkern/xordi3.c diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile index 8bd42d130d2..29178462331 100644 --- a/sys/arch/i386/stand/Makefile +++ b/sys/arch/i386/stand/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.14 2007/04/13 17:34:40 millert Exp $ +# $OpenBSD: Makefile,v 1.15 2007/11/25 18:25:31 deraadt Exp $ .if ${MACHINE} == "i386" -SUBDIR= etc libsa libkern libz mbr cdbr +SUBDIR= etc libsa libz mbr cdbr .endif SUBDIR+= biosboot installboot boot pxeboot cdboot diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index 6f81bbe376a..04f3a5337d7 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2006/10/30 18:28:57 jmc Exp $ +# $OpenBSD: Makefile,v 1.34 2007/11/25 18:25:31 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -24,11 +24,14 @@ SRCS+= boot.c cmd.c vars.c bootarg.c conf.c S =${.CURDIR}/../../../.. SADIR= ${.CURDIR}/.. -LDADD= ${LIBSA} ${LIBZ} ${LIBKERN} -DPADD= ${LIBSA} ${LIBZ} ${LIBKERN} +LDADD= ${LIBSA} ${LIBZ} +DPADD= ${LIBSA} ${LIBZ} .PATH: ${S}/stand/boot +.PATH: ${S}/lib/libkern/arch/i386 ${S}/lib/libkern +SRCS+= strlcpy.c moddi3.c divdi3.c qdivrem.c + boot.bin: boot objcopy -v -O binary ${PROG} boot.bin diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index 5e2e9b82ac0..f4f98939815 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/05/29 00:03:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2007/11/25 18:25:32 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -19,8 +19,11 @@ SRCS+= boot.c cmd.c vars.c bootarg.c conf.c S =${.CURDIR}/../../../.. SADIR= ${.CURDIR}/.. -LDADD= ${LIBSA} ${LIBZ} ${LIBKERN} -DPADD= ${LIBSA} ${LIBZ} ${LIBKERN} +LDADD= ${LIBSA} ${LIBZ} +DPADD= ${LIBSA} ${LIBZ} + +.PATH: ${S}/lib/libkern/arch/i386 ${S}/lib/libkern +SRCS+= strlcpy.c moddi3.c divdi3.c qdivrem.c .PATH: ${S}/stand/boot diff --git a/sys/arch/i386/stand/libkern/Makefile b/sys/arch/i386/stand/libkern/Makefile deleted file mode 100644 index 5492d91d137..00000000000 --- a/sys/arch/i386/stand/libkern/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2006/09/18 21:14:15 mpf Exp $ - -.include "${.CURDIR}/../Makefile.inc" - -LIB= kern - -S=${.CURDIR}/../../../.. -SADIR=${.CURDIR}/.. - -.PATH: ${S}/lib/libkern - -NOPROFILE=noprofile -NOPIC=nopic - -# kern routines -SRCS+= divdi3.c moddi3.c qdivrem.c strlcpy.c strlcat.c - -all: ${KERNLIB} - -install: - -.include <bsd.lib.mk> diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile index fce837db82b..85a8f2fac03 100644 --- a/sys/arch/i386/stand/pxeboot/Makefile +++ b/sys/arch/i386/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/07/30 14:32:46 millert Exp $ +# $OpenBSD: Makefile,v 1.3 2007/11/25 18:25:32 deraadt Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -19,8 +19,11 @@ SRCS+= boot.c cmd.c vars.c bootarg.c conf.c devopen.c net.c open.c S =${.CURDIR}/../../../.. SADIR= ${.CURDIR}/.. -LDADD= ${LIBSA} ${LIBZ} ${LIBKERN} -DPADD= ${LIBSA} ${LIBZ} ${LIBKERN} +LDADD= ${LIBSA} ${LIBZ} +DPADD= ${LIBSA} ${LIBZ} + +.PATH: ${S}/lib/libkern/arch/i386 ${S}/lib/libkern +SRCS+= strlcpy.c moddi3.c divdi3.c qdivrem.c .PATH: ${S}/stand/boot |