From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 10 May 2023 23:51:10 +0000 (+0200)
Subject: hurd: rule out some mach headers when generating errno.h
X-Git-Tag: glibc-2.38~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c72f976c61d3c1465699f2bcad77e62bafe61d;p=thirdparty%2Fglibc.git

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 069865189f7..a0794f96aa7 100644
--- 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 22c9ceef659..b9f717c1af3 100644
--- 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.  */";