Now that -A prints -- markers as it is supposed to filter them out when

doing the consistency check for locore.o; ok millert@

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 289e609..68e8aee 100644 (file)
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.amd64,v 1.123 2021/12/17 14:59:22 patrick Exp $
+#      $OpenBSD: Makefile.amd64,v 1.124 2021/12/28 16:29:59 otto Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,7 +158,8 @@ ioconf.o: ioconf.c
 
 locore.o: assym.h
        ${NORMAL_S}
-       @[[ -n `objdump -D $@ | grep -A1 doreti_iret | sort | uniq -d` ]] || \
+       @[[ -n `objdump -D $@ | grep -A1 doreti_iret | grep -v ^-- | sort | \
+        uniq -d` ]] || \
         { rm -f $@; echo "ERROR: overlaid iretq instructions don't line up"; \
           echo "#GP-on-iretq fault handling would be broken"; exit 1; }