[src/netbsd-9]: src/etc Pull up following revision(s) (requested by tsutsui i...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dd31a4eca3e3
branches:  netbsd-9
changeset: 1001085:dd31a4eca3e3
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 04 14:35:57 2019 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #397):

        etc/MAKEDEV.awk: revision 1.28

PR port-arm/54640: hack to work around conditional RAW_PART definition in
arm/include/disklabel.h.

Recognize this special case and skip lines between #ifndef RAW_PART and
the next #endif.

diffstat:

 etc/MAKEDEV.awk |  17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 0ca5be2cfc6e -r dd31a4eca3e3 etc/MAKEDEV.awk
--- a/etc/MAKEDEV.awk   Mon Nov 04 14:34:28 2019 +0000
+++ b/etc/MAKEDEV.awk   Mon Nov 04 14:35:57 2019 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -
 #
-#      $NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $
+#      $NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $
 #
 # Copyright (c) 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -135,7 +135,18 @@
                                diskpartitions = $3
                        else if ($1 == "#define" && $2 == "OLDMAXPARTITIONS")
                                diskbackcompat = $3
-                       else if ($1 == "#define" && $2 == "RAW_PART")
+                       else if ($1 == "#ifndef" && $2 == "RAW_PART" &&
+                           RAWDISK_OFF) {
+                               # special case to ignore #ifndef RAW_PART
+                               # sections (e.g. in arm/include/disklabel.h,
+                               # when it is already set in
+                               # zaurus/include/disklabel.h)
+                               while (getline < inc) {
+                                       # skip all lines upto the next #endif
+                                       if ($1 == "#endif")
+                                               break;
+                               }
+                       } else if ($1 == "#define" && $2 == "RAW_PART")
                                RAWDISK_OFF = $3
                        else if ($1 == "#include" && 
                                 $2 ~ "<.*/disklabel.h>" &&
@@ -214,7 +225,7 @@
        print "# Generated from:"
 
        # MAKEDEV.awk (this script) RCS Id
-       ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $"
+       ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $"
        gsub(/\$/, "", ARCSID)
        print "#        " ARCSID