From 6dbbff240f603717cdbcda553fa097c3e2a87947 Mon Sep 17 00:00:00 2001 From: bde Date: Sun, 1 Jun 1997 20:25:55 +0000 Subject: Don't use -fomit-frame-pointer for ipl_funcs.c if ${PROF} is nonempty, is incompatible with -pg. (We use a different version of mcount for profiling frame-pointer-less assembler functions, but gcc doesn't know about this.) Added a missing dependency. Cleaned up trailing backslashes. Added comment about config's limitations/bugs handling dependencies and backslashe/newlines. Finished removing support for isdn drivers. --- sys/conf/files.i386 | 16 +++++++++------- sys/i386/conf/files.i386 | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'sys') diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 3b86875..f917fc0 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.162 1997/05/31 09:23:44 peter Exp $ +# $Id: files.i386,v 1.163 1997/05/31 18:01:38 peter Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -9,11 +9,15 @@ aic7xxx_asm optional ahc device-driver \ no-obj no-implicit-rule \ clean "aic7xxx_asm" # +# The long compile-with and dependency lines are required because of +# limitations in config: backslash-newline doesn't work in strings, and +# dependency lines other than the first are silently ignored. +# aic7xxx_{seq,reg}.h optional ahc device-driver \ compile-with "./aic7xxx_asm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend \ clean "aic7xxx_seq.h aic7xxx_reg.h" \ - dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} aic7xxx_asm" + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/scsi/scsi_message.h aic7xxx_asm" # linux_genassym optional compat_linux \ dependency "$S/i386/linux/linux_genassym.c $S/i386/linux/linux.h" \ @@ -120,8 +124,8 @@ i386/isa/if_sr.c optional sr device-driver i386/isa/if_wl.c optional wl device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver -i386/isa/ipl_funcs.c standard \ - compile-with "${CC} -c ${CFLAGS} ${PROF} -fomit-frame-pointer $<" +i386/isa/ipl_funcs.c standard \ + compile-with "${CC} -c ${CFLAGS} ${PROF:S/^$/-fomit-frame-pointer/} $<" i386/isa/isa.c optional isa device-driver i386/isa/istallion.c optional stli device-driver i386/isa/joy.c optional joy device-driver @@ -219,7 +223,7 @@ i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_file.c optional compat_linux i386/linux/linux_ioctl.c optional compat_linux i386/linux/linux_ipc.c optional compat_linux -i386/linux/linux_locore.s optional compat_linux \ +i386/linux/linux_locore.s optional compat_linux \ dependency "linux_assym.h" i386/linux/linux_misc.c optional compat_linux i386/linux/linux_signal.c optional compat_linux @@ -282,6 +286,4 @@ gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate gnu/i386/isa/dgb.c optional dgb device-driver -gnu/i386/isa/nic3008.c optional nic device-driver -gnu/i386/isa/nic3009.c optional nnic device-driver pci/wd82371.c optional wd device-driver diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 3b86875..f917fc0 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.162 1997/05/31 09:23:44 peter Exp $ +# $Id: files.i386,v 1.163 1997/05/31 18:01:38 peter Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -9,11 +9,15 @@ aic7xxx_asm optional ahc device-driver \ no-obj no-implicit-rule \ clean "aic7xxx_asm" # +# The long compile-with and dependency lines are required because of +# limitations in config: backslash-newline doesn't work in strings, and +# dependency lines other than the first are silently ignored. +# aic7xxx_{seq,reg}.h optional ahc device-driver \ compile-with "./aic7xxx_asm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend \ clean "aic7xxx_seq.h aic7xxx_reg.h" \ - dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} aic7xxx_asm" + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/scsi/scsi_message.h aic7xxx_asm" # linux_genassym optional compat_linux \ dependency "$S/i386/linux/linux_genassym.c $S/i386/linux/linux.h" \ @@ -120,8 +124,8 @@ i386/isa/if_sr.c optional sr device-driver i386/isa/if_wl.c optional wl device-driver i386/isa/if_ze.c optional ze device-driver i386/isa/if_zp.c optional zp device-driver -i386/isa/ipl_funcs.c standard \ - compile-with "${CC} -c ${CFLAGS} ${PROF} -fomit-frame-pointer $<" +i386/isa/ipl_funcs.c standard \ + compile-with "${CC} -c ${CFLAGS} ${PROF:S/^$/-fomit-frame-pointer/} $<" i386/isa/isa.c optional isa device-driver i386/isa/istallion.c optional stli device-driver i386/isa/joy.c optional joy device-driver @@ -219,7 +223,7 @@ i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_file.c optional compat_linux i386/linux/linux_ioctl.c optional compat_linux i386/linux/linux_ipc.c optional compat_linux -i386/linux/linux_locore.s optional compat_linux \ +i386/linux/linux_locore.s optional compat_linux \ dependency "linux_assym.h" i386/linux/linux_misc.c optional compat_linux i386/linux/linux_signal.c optional compat_linux @@ -282,6 +286,4 @@ gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate gnu/i386/isa/dgb.c optional dgb device-driver -gnu/i386/isa/nic3008.c optional nic device-driver -gnu/i386/isa/nic3009.c optional nnic device-driver pci/wd82371.c optional wd device-driver -- cgit v1.1