head 1.8; access; symbols netbsd-10-0-RC6:1.8 netbsd-10-0-RC5:1.8 netbsd-10-0-RC4:1.8 netbsd-10-0-RC3:1.8 netbsd-10-0-RC2:1.8 thorpej-ifq:1.8.0.6 thorpej-ifq-base:1.8 thorpej-altq-separation:1.8.0.4 thorpej-altq-separation-base:1.8 netbsd-10-0-RC1:1.8 netbsd-10:1.8.0.2 netbsd-10-base:1.8 bouyer-sunxi-drm:1.7.0.18 bouyer-sunxi-drm-base:1.7 netbsd-9-3-RELEASE:1.5 thorpej-i2c-spi-conf2:1.7.0.16 thorpej-i2c-spi-conf2-base:1.7 thorpej-futex2:1.7.0.14 thorpej-futex2-base:1.7 thorpej-cfargs2:1.7.0.12 thorpej-cfargs2-base:1.7 cjep_sun2x-base1:1.7 cjep_sun2x:1.7.0.10 cjep_sun2x-base:1.7 cjep_staticlib_x-base1:1.7 netbsd-9-2-RELEASE:1.5 cjep_staticlib_x:1.7.0.8 cjep_staticlib_x-base:1.7 thorpej-i2c-spi-conf:1.7.0.6 thorpej-i2c-spi-conf-base:1.7 thorpej-cfargs:1.7.0.4 thorpej-cfargs-base:1.7 thorpej-futex:1.7.0.2 thorpej-futex-base:1.7 netbsd-9-1-RELEASE:1.5 bouyer-xenpvh-base2:1.5 phil-wifi-20200421:1.5 bouyer-xenpvh-base1:1.5 phil-wifi-20200411:1.5 bouyer-xenpvh:1.5.0.32 bouyer-xenpvh-base:1.5 is-mlppp:1.5.0.30 is-mlppp-base:1.5 phil-wifi-20200406:1.5 netbsd-8-2-RELEASE:1.5 ad-namecache-base3:1.5 netbsd-9-0-RELEASE:1.5 netbsd-9-0-RC2:1.5 ad-namecache-base2:1.5 ad-namecache-base1:1.5 ad-namecache:1.5.0.28 ad-namecache-base:1.5 netbsd-9-0-RC1:1.5 phil-wifi-20191119:1.5 netbsd-9:1.5.0.26 netbsd-9-base:1.5 phil-wifi-20190609:1.5 netbsd-8-1-RELEASE:1.5 netbsd-8-1-RC1:1.5 isaki-audio2:1.5.0.24 isaki-audio2-base:1.5 pgoyette-compat-merge-20190127:1.5 pgoyette-compat-20190127:1.5 pgoyette-compat-20190118:1.5 pgoyette-compat-1226:1.5 pgoyette-compat-1126:1.5 pgoyette-compat-1020:1.5 pgoyette-compat-0930:1.5 pgoyette-compat-0906:1.5 pgoyette-compat-0728:1.5 netbsd-8-0-RELEASE:1.5 phil-wifi:1.5.0.22 phil-wifi-base:1.5 pgoyette-compat-0625:1.5 netbsd-8-0-RC2:1.5 pgoyette-compat-0521:1.5 pgoyette-compat-0502:1.5 pgoyette-compat-0422:1.5 netbsd-8-0-RC1:1.5 pgoyette-compat-0415:1.5 pgoyette-compat-0407:1.5 pgoyette-compat-0330:1.5 pgoyette-compat-0322:1.5 pgoyette-compat-0315:1.5 pgoyette-compat:1.5.0.20 pgoyette-compat-base:1.5 tls-maxphys:1.5.0.18 tls-maxphys-base-20171202:1.5 matt-nb8-mediatek:1.5.0.16 matt-nb8-mediatek-base:1.5 nick-nhusb-base-20170825:1.5 perseant-stdc-iso10646:1.5.0.14 perseant-stdc-iso10646-base:1.5 netbsd-8:1.5.0.12 netbsd-8-base:1.5 prg-localcount2-base3:1.5 prg-localcount2-base2:1.5 prg-localcount2-base1:1.5 prg-localcount2:1.5.0.10 prg-localcount2-base:1.5 pgoyette-localcount-20170426:1.5 bouyer-socketcan-base1:1.5 jdolecek-ncq:1.5.0.8 jdolecek-ncq-base:1.5 pgoyette-localcount-20170320:1.5 nick-nhusb-base-20170204:1.5 bouyer-socketcan:1.5.0.6 bouyer-socketcan-base:1.5 pgoyette-localcount-20170107:1.5 nick-nhusb-base-20161204:1.5 pgoyette-localcount-20161104:1.5 nick-nhusb-base-20161004:1.5 localcount-20160914:1.5 pgoyette-localcount-20160806:1.5 pgoyette-localcount-20160726:1.5 pgoyette-localcount:1.5.0.4 pgoyette-localcount-base:1.5 nick-nhusb-base-20160907:1.5 nick-nhusb-base-20160529:1.5 nick-nhusb-base-20160422:1.5 nick-nhusb-base-20160319:1.5 nick-nhusb-base-20151226:1.5 nick-nhusb:1.5.0.2 nick-nhusb-base-20150921:1.5; locks; strict; comment @# @; 1.8 date 2022.11.19.07.54.25; author yamt; state Exp; branches; next 1.7; commitid WrNwufWa7cFLLh2E; 1.7 date 2020.07.09.02.13.58; author christos; state Exp; branches; next 1.6; commitid 2jPUCMnXtzwWClfC; 1.6 date 2020.07.08.19.39.22; author uwe; state Exp; branches; next 1.5; commitid keOTvUNTIVYArjfC; 1.5 date 2015.09.10.13.11.39; author uebayasi; state Exp; branches 1.5.2.1 1.5.18.1; next 1.4; commitid WHSB2hQ81IkUXHAy; 1.4 date 2015.09.10.09.30.01; author uebayasi; state Exp; branches; next 1.3; commitid EoObIwHwe2hYJGAy; 1.3 date 2015.09.09.03.27.15; author uebayasi; state Exp; branches; next 1.2; commitid 5W63a5gI8qiALwAy; 1.2 date 2015.09.09.03.16.14; author uebayasi; state Exp; branches; next 1.1; commitid 03Ztuj1JXuVHHwAy; 1.1 date 2015.09.06.06.13.16; author uebayasi; state Exp; branches; next ; commitid XfgaWAjWSgb1M9Ay; 1.5.2.1 date 2015.09.10.13.11.39; author skrll; state dead; branches; next 1.5.2.2; commitid CpNWKp3ozVNTafCy; 1.5.2.2 date 2015.09.22.12.05.56; author skrll; state Exp; branches; next ; commitid CpNWKp3ozVNTafCy; 1.5.18.1 date 2015.09.10.13.11.39; author jdolecek; state dead; branches; next 1.5.18.2; commitid XcIYRZTAh1LmerhA; 1.5.18.2 date 2017.12.03.11.36.57; author jdolecek; state Exp; branches; next ; commitid XcIYRZTAh1LmerhA; desc @@ 1.8 log @assym.mk: Fix assym.d generation It seems that the genassym/mkdep output has been changed. This commit adapts the assym.d generation rule to the new output. @ text @# $NetBSD: assym.mk,v 1.7 2020/07/09 02:13:58 christos Exp $ GENASSYM_FLAGS=${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \ ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} > assym.h.tmp && \ mv -f assym.h.tmp assym.h .if !defined(___USE_SUFFIX_RULES___) ${SRCS:T:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:T:M*.[sS]:C|\.[Ss]|.d|}: assym.h .else ${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h .endif # assym.dep in the below target looks like: # # assym.o: \ # /var/folders/74/hw1sphgx0lv63q6pq_n5grw00000gn/T//genassym.BCtq6a/assym.c \ # opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \ # : # : # # The following sed modifies it to: # # assym.h: \ # opt_arm_start.h opt_execfmt.h opt_multiprocessor.h \ # : # : assym.d: assym.h ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \ ${GENASSYM} -- ${MKDEP} -f assym.dep -- ${GENASSYM_FLAGS} ${TOOL_SED} -e '1{N;s/\\\n//;}' -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} rm -f assym.dep DEPS+= assym.d .if defined(___USE_SUFFIX_RULES___) .SUFFIXES: .genassym .assym.h .genassym.assym.h: ${_MKTARGET_CREATE} ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} < $< > $@@ mv -f $@@.tmp $@@ .endif # ___USE_SUFFIX_RULES___ @ 1.7 log @factor out common code. @ text @d1 1 a1 1 # $NetBSD: assym.mk,v 1.6 2020/07/08 19:39:22 uwe Exp $ d19 15 d38 1 a38 1 ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} @ 1.6 log @Drop -fstack-usage* from CFLAGS passed genassym. We don't want it to create a "-.su" file. @ text @d1 3 a3 1 # $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $ d8 1 a8 3 ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \ ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} > assym.h.tmp && \ d22 1 a22 2 ${GENASSYM} -- ${MKDEP} -f assym.dep -- \ ${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} d32 1 a32 3 ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \ ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} < $< > $@@ @ 1.5 log @Fix dependency of *.d -> assym.h in `-S' mode. @ text @d1 1 a1 1 # $NetBSD$ d6 2 a7 1 ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ d23 1 a23 1 ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} d33 2 a34 1 ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ @ 1.5.18.1 log @file assym.mk was added on branch tls-maxphys on 2017-12-03 11:36:57 +0000 @ text @d1 35 @ 1.5.18.2 log @update from HEAD @ text @a0 35 # $NetBSD$ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} > assym.h.tmp && \ mv -f assym.h.tmp assym.h .if !defined(___USE_SUFFIX_RULES___) ${SRCS:T:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:T:M*.[sS]:C|\.[Ss]|.d|}: assym.h .else ${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h .endif assym.d: assym.h ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \ ${GENASSYM} -- ${MKDEP} -f assym.dep -- \ ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} rm -f assym.dep DEPS+= assym.d .if defined(___USE_SUFFIX_RULES___) .SUFFIXES: .genassym .assym.h .genassym.assym.h: ${_MKTARGET_CREATE} ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} < $< > $@@ mv -f $@@.tmp $@@ .endif # ___USE_SUFFIX_RULES___ @ 1.5.2.1 log @file assym.mk was added on branch nick-nhusb on 2015-09-22 12:05:56 +0000 @ text @d1 35 @ 1.5.2.2 log @Sync with HEAD @ text @a0 35 # $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} > assym.h.tmp && \ mv -f assym.h.tmp assym.h .if !defined(___USE_SUFFIX_RULES___) ${SRCS:T:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:T:M*.[sS]:C|\.[Ss]|.d|}: assym.h .else ${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h .endif assym.d: assym.h ${_MKTARGET_CREATE} cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \ ${GENASSYM} -- ${MKDEP} -f assym.dep -- \ ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS} ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} rm -f assym.dep DEPS+= assym.d .if defined(___USE_SUFFIX_RULES___) .SUFFIXES: .genassym .assym.h .genassym.assym.h: ${_MKTARGET_CREATE} ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \ ${GENASSYM_CPPFLAGS} < $< > $@@ mv -f $@@.tmp $@@ .endif # ___USE_SUFFIX_RULES___ @ 1.4 log @Simplify the dependency line further. @ text @d10 4 d15 2 @ 1.3 log @Improve previous. @ text @d10 1 a10 5 .if !defined(___USE_SUFFIX_RULES___) ${_MD_SFILES:C/\.[Ss]/.o/} ${_SFILES:C/\.[Ss]/.o/}: assym.h .else ${SRCS:M*.[sS]}: assym.h .endif @ 1.2 log @Restore *.[sS] -> assym.h dependency in `-S' mode. @ text @d13 1 a13 1 ${ALLFILES:M*.[sS]}: assym.h @ 1.1 log @Clean up. Move assym.h/vers.c related code out of Makefile.kern.inc. @ text @d9 2 d12 3 @