hurd: rule out some mach headers when generating errno.h

While mach/kern_return.h happens to pull mach/machine/kern_return.h,
mach/machine/boolean.h, and mach/machine/vm_types.h (and realpath-ing them
exposes the machine-specific machine symlink content), those headers do not
actually define anything machine-specific for the content of errno.h.

So we can just rule out these machine-specific from the dependency
comment.

diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index 069865189f79697b2b170dd76a2cd2315a6fd574..a0794f96aa79def949c0739b788c392afdfcee07 100644 (file)
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -4,11 +4,8 @@
      libc-symbols.h
      mach/message.h
      mach/kern_return.h
-     mach/i386/kern_return.h
      mach/port.h
      mach/boolean.h
-     mach/i386/boolean.h
-     mach/i386/vm_types.h
      stdint.h
      ../stdlib/stdint.h
      ../bits/libc-header-start.h

diff --git a/sysdeps/mach/hurd/errnos.awk b/sysdeps/mach/hurd/errnos.awk
index 22c9ceef65949aed69ba2b316525a116cc4e5cd6..b9f717c1af31f456a3b56bf7c3752f9c83ab8625 100644 (file)
--- a/sysdeps/mach/hurd/errnos.awk
+++ b/sysdeps/mach/hurd/errnos.awk
@@ -25,6 +25,10 @@ BEGIN {
        arg = ARGV[i];
        sub(/.*(manual|include)\//, "", arg);
        if (arg ~ /.*errnos.d/) continue;
+       # Those not not actually define anything for errno.h
+       if (arg ~ /mach\/.*\/kern_return.h/) continue;
+       if (arg ~ /mach\/.*\/boolean.h/) continue;
+       if (arg ~ /mach\/.*\/vm_types.h/) continue;
        print "     " arg;
       }
     print "   Do not edit this file; edit errnos.awk and regenerate it.  */";