From 519756318ce73e0a01e3031499b4483b3f618f2e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Thu, 2 May 2002 21:14:03 +0000
Subject: [PATCH] * sysdeps/mach/hurd/close.c: #undef __close before function
 defn,

	and use INTDEF on it.
	* sysdeps/mach/hurd/fcntl.c: Use INTDEF2.

	* sysdeps/mach/hurd/dl-sysdep.c (errno): New variable.

	* sysdeps/mach/hurd/alpha/static-start.S: New file (unfinished).
---
 ChangeLog                     | 10 ++++++++++
 sysdeps/mach/hurd/close.c     |  8 +++++---
 sysdeps/mach/hurd/dl-sysdep.c |  4 ++++
 sysdeps/mach/hurd/fcntl.c     |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4818c56..2e404aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-01  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/hurd/close.c: #undef __close before function defn,
+	and use INTDEF on it.
+	* sysdeps/mach/hurd/fcntl.c: Use INTDEF2.
+
+	* sysdeps/mach/hurd/dl-sysdep.c (errno): New variable.
+
+	* sysdeps/mach/hurd/alpha/static-start.S: New file (unfinished).
+
 2002-05-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* malloc/memusage.c: Add support for tracking mmap & friends.
diff --git a/sysdeps/mach/hurd/close.c b/sysdeps/mach/hurd/close.c
index 291fdbf..7a64fa4 100644
--- a/sysdeps/mach/hurd/close.c
+++ b/sysdeps/mach/hurd/close.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,10 +21,11 @@
 #include <hurd.h>
 #include <hurd/fd.h>
 
+#undef __close
+
 /* Close the file descriptor FD.  */
 int
-__close (fd)
-     int fd;
+__close (int fd)
 {
   error_t err;
 
@@ -33,4 +34,5 @@ __close (fd)
   return err ? __hurd_fail (err) : 0;
 }
 
+INTDEF (__close)
 weak_alias (__close, close)
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 11493a7..88e3c8b 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -57,6 +57,10 @@ void *__libc_stack_end;
 
 struct hurd_startup_data *_dl_hurd_data;
 
+/* This is used only within ld.so, via dl-minimal.c's __errno_location.  */
+#undef errno
+int errno attribute_hidden;
+
 /* Defining these variables here avoids the inclusion of hurdsig.c.  */
 unsigned long int __hurd_sigthread_stack_base;
 unsigned long int __hurd_sigthread_stack_end;
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 15aa3ae..5c492df 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -201,5 +201,6 @@ __libc_fcntl (int fd, int cmd, ...)
   return result;
 }
 
+INTDEF2 (__libc_fcntl, __fcntl)
 weak_alias (__libc_fcntl, __fcntl)
 weak_alias (__libc_fcntl, fcntl)
-- 
2.7.4