diff options
24 files changed, 78 insertions, 293 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 8965a2d5695..5435fc97c1f 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.39 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.alpha,v 1.40 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD @@ -58,14 +58,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -85,7 +77,7 @@ HOSTED_C= ${HOSTED_CC} ${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} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 489acf807cb..fc428942bb0 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.12 2007/10/29 22:29:13 espie Exp $ +# $OpenBSD: Makefile.amd64,v 1.13 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -64,14 +64,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -99,8 +91,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o vector.o copy.o spl.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o vector.o copy.o spl.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index 4c3c5203bcf..002d5a65e23 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.5 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.armish,v 1.6 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -69,14 +69,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -104,8 +96,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD_HEAD+=; \ diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index ddbcd56313b..3ddc96a1bae 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.3 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.aviion,v 1.4 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD # @@ -47,6 +47,7 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS} +# Kernel is linked as a ZMAGIC executable, with start at 10020 #LINKFLAGS= -N -Ttext 0x1000 -e start LINKFLAGS= -Ttext 0x1000 -e start STRIPFLAGS= -d @@ -65,14 +66,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -99,9 +92,7 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -# Kernel is linked as a ZMAGIC executable, with start at 10020 -SYSTEM_OBJ= locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 1154d21e8d4..a4d766b8fab 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.40 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.hp300,v 1.41 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $ # Makefile for OpenBSD @@ -100,14 +100,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - ### for the Motorola 68040 Floating Point Software Product .include "${M68K}/fpsp/Makefile.inc" @@ -130,8 +122,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o ${FPSP} \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index f5219054fa8..49e5dfc0632 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.28 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.hppa,v 1.29 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -84,14 +84,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -106,8 +98,12 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< %SFILES -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} \ - ${LIBKERN} ${LIBCOMPAT} ${LIBSPMATH} +# load lines for config "xxx" will be emitted as: +# xxx: ${SYSTEM_DEP} swapxxx.o +# ${SYSTEM_LD_HEAD} +# ${SYSTEM_LD} swapxxx.o +# ${SYSTEM_LD_TAIL} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 9d912b223f1..2f7422a58cd 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.4 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.hppa64,v 1.5 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -66,14 +66,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -88,8 +80,12 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< %SFILES -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} \ - ${LIBKERN} ${LIBCOMPAT} ${LIBSPMATH} +# load lines for config "xxx" will be emitted as: +# xxx: ${SYSTEM_DEP} swapxxx.o +# ${SYSTEM_LD_HEAD} +# ${SYSTEM_LD} swapxxx.o +# ${SYSTEM_LD_TAIL} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 0a163942930..4ff169db45c 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.47 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.i386,v 1.48 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -62,14 +62,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -97,8 +89,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} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index dfaf4f0fc11..84740c25be5 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.4 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.landisk,v 1.5 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD/landisk # @@ -64,14 +64,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -101,7 +93,7 @@ NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index 4863c797786..3a8643e3a4b 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.9 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.luna88k,v 1.10 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD # @@ -62,14 +62,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -96,8 +88,7 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 24896a3e666..5477aead64a 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.36 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.mac68k,v 1.37 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $ # Makefile for OpenBSD @@ -63,14 +63,6 @@ LIBKERN=${KERNLIB} LIBKERN=${KERNLIB_PROF} .endif -### Find out what to use for libcompat. -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT=${COMPATLIB} -.else -LIBCOMPAT=${COMPATLIB_PROF} -.endif - ### for the Motorola 68040 Floating Point Software Product .include "${M68K}/fpsp/Makefile.inc" @@ -101,8 +93,7 @@ NORMAL_S_C= ${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o ${FPSP} \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 18c2369380e..5b27d0a3bdc 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.25 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.macppc,v 1.26 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD PowerPC # @@ -63,14 +63,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -100,7 +92,7 @@ NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index 2b158ce6600..b754748e0ed 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.28 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.29 2007/11/25 11:23:33 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -62,14 +62,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - ### for the Motorola 68040 Floating Point Software Product .include "${M68K}/fpsp/Makefile.inc" @@ -95,8 +87,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o ${FPSP} ${060SP}\ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${060SP} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 5d2939594d1..b0d78b7c7da 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.40 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.41 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD # @@ -64,14 +64,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -99,8 +91,7 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \ # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} # Kernel is linked as a ZMAGIC executable, with start at 10020 -SYSTEM_OBJ= locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index e8278e3ca89..efea50b1815 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.23 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.24 2007/11/25 11:23:33 deraadt Exp $ # # Makefile for OpenBSD PowerPC # @@ -63,14 +63,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -100,7 +92,7 @@ NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index edf33468247..9ab40a13c2b 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.16 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.sgi,v 1.17 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -69,14 +69,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< @@ -93,10 +85,7 @@ NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@ # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} - -SYSTEM_OBJ= locore.o ${OBJS} param.o ioconf.o \ - ${LIBKERN} ${LIBCOMPAT} -# +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @if [ X${DEBUG} = X-g ]; \ diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne index fb196a39fd3..caa8bdd1b43 100644 --- a/sys/arch/solbourne/conf/Makefile.solbourne +++ b/sys/arch/solbourne/conf/Makefile.solbourne @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.solbourne,v 1.4 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.solbourne,v 1.5 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -64,14 +64,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -99,8 +91,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} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index c0afee4baa6..bc1a6f1a357 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.39 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.sparc,v 1.40 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $ # Makefile for OpenBSD @@ -70,14 +70,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -105,8 +97,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} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 6a4a9bf8da6..d6fdd153eb4 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -41,14 +41,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -76,8 +68,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} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index c3f94bb4166..da991ff7aff 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.28 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.vax,v 1.29 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $ # Makefile for OpenBSD/vax @@ -90,14 +90,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -112,8 +104,7 @@ HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= intvec.o subr.o \ - param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN} +SYSTEM_OBJ= intvec.o subr.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 465b32646eb..6ea67d220ca 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.8 2007/07/30 16:23:33 thib Exp $ +# $OpenBSD: Makefile.zaurus,v 1.9 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -69,14 +69,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_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 @@ -105,7 +97,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} + param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD_HEAD+=; \ diff --git a/sys/compat/common/Makefile b/sys/compat/common/Makefile deleted file mode 100644 index 8ac83e47cef..00000000000 --- a/sys/compat/common/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $OpenBSD: Makefile,v 1.19 2004/09/16 13:57:47 miod Exp $ -# $NetBSD: Makefile,v 1.8 1996/05/18 15:52:19 christos Exp $ - -LIB= compat -NOPIC= - -MACHINE= ${XMACHINE} -MACHINE_ARCH= ${XMACHINE_ARCH} - -.PATH: ${COMPATDIR} - -SRCS= compat_exec.c compat_util.c compat_dir.c compat_vm.c \ - kern_exit_43.c kern_ipc_23.c kern_ipc_35.c kern_info_09.c \ - kern_info_43.c kern_resource_43.c kern_sig_43.c tty_43.c \ - uipc_syscalls_43.c vfs_syscalls_25.c vfs_syscalls_35.c \ - vfs_syscalls_43.c vm_43.c - -# really, all machines where sizeof(int) != sizeof(long) -.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "amd64") && \ - (${MACHINE_ARCH} != "mips64") && (${MACHINE_ARCH} != "sparc64") -SRCS+= kern_ipc_10.c -.endif - -install: - -.include <bsd.lib.mk> diff --git a/sys/compat/common/Makefile.inc b/sys/compat/common/Makefile.inc deleted file mode 100644 index 3918ba7871b..00000000000 --- a/sys/compat/common/Makefile.inc +++ /dev/null @@ -1,38 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.7 2002/07/14 09:20:24 mdw Exp $ -# $NetBSD: Makefile.inc,v 1.5 1996/05/20 17:23:59 mrg Exp $ -# -# NOTE: $S must correspond to the top of the 'sys' tree - -PWD!= pwd -COMPATDIR!= cd $S/compat/common; pwd -COMPATDST?= lib/compat -COMPATLIB= ${COMPATDST}/libcompat.a -COMPATLIB_PROF= ${COMPATDST}/libcompat_p.a - -COMPATMAKE= \ - cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR}/Makefile \ - CC="${CC}" CFLAGS="${CFLAGS:S/-I./-I${PWD}\/./g}" \ - LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" LORDER="${LORDER}" \ - NM="${NM}" \ - XMACHINE='${MACHINE}' XMACHINE_ARCH='${MACHINE_ARCH}' \ - CPPFLAGS="${CPPFLAGS:S/-I./-I${PWD}\/./g}" \ - COMPATDIR="${COMPATDIR}" - -${COMPATLIB}: .NOTMAIN __always_make_compatlib - @echo making sure the compat library is up to date... - @${COMPATMAKE} libcompat.a - -${COMPATLIB_PROF}: .NOTMAIN __always_make_compatlib - @echo making sure the profiled compat library is up to date... - @${COMPATMAKE} libcompat_p.a - -clean:: .NOTMAIN __always_make_compatlib - @echo cleaning the compat library objects - @${COMPATMAKE} clean - -depend:: .NOTMAIN __always_make_compatlib - @echo depending the compat library objects - @${COMPATMAKE} depend - -__always_make_compatlib: .NOTMAIN - @mkdir -p ${COMPATDST} diff --git a/sys/conf/files b/sys/conf/files index a955515b27a..6442ddd73dc 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.415 2007/11/23 10:25:15 deraadt Exp $ +# $OpenBSD: files,v 1.416 2007/11/25 11:23:33 deraadt Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -962,3 +962,28 @@ file net/pfkey.c key | ipsec | tcp_signature file net/pfkeyv2.c key | ipsec | tcp_signature file net/pfkeyv2_parsemessage.c key | ipsec | tcp_signature file net/pfkeyv2_convert.c key | ipsec | tcp_signature + +# COMPAT_* support code (base and other shared code) +file compat/common/compat_exec.c !small_kernel +file compat/common/compat_util.c !small_kernel +file compat/common/compat_dir.c !small_kernel +file compat/common/compat_vm.c !small_kernel & + (compat_freebsd | compat_bsdos | compat_sunos | compat_hpux | compat_linux) +file compat/common/kern_info_09.c !small_kernel & + (compat_freebsd | compat_ibcs2 | compat_sunos | compat_hpux | compat_linux) +file compat/common/kern_ipc_10.c !small_kernel & + (compat_freebsd | compat_ibcs2 | compat_sunos | compat_hpux | compat_bsdos) +file compat/common/vfs_syscalls_25.c !small_kernel & + (compat_freebsd | compat_bsdos | compat_sunos | compat_hpux) +file compat/common/vfs_syscalls_35.c !small_kernel & + (compat_freebsd | compat_bsdos | compat_sunos | compat_hpux) +file compat/common/kern_ipc_35.c !small_kernel & compat_35 +file compat/common/kern_ipc_23.c !small_kernel & compat_23 +file compat/common/kern_exit_43.c !small_kernel +file compat/common/kern_info_43.c !small_kernel +file compat/common/kern_resource_43.c !small_kernel +file compat/common/kern_sig_43.c !small_kernel +file compat/common/tty_43.c !small_kernel +file compat/common/uipc_syscalls_43.c !small_kernel +file compat/common/vfs_syscalls_43.c !small_kernel +file compat/common/vm_43.c !small_kernel |