summaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/mach/hurd')
-rw-r--r--sysdeps/mach/hurd/chown.c3
-rw-r--r--sysdeps/mach/hurd/close.c5
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c2
-rw-r--r--sysdeps/mach/hurd/dup2.c6
-rw-r--r--sysdeps/mach/hurd/fcntl.c8
-rw-r--r--sysdeps/mach/hurd/getpgid.c5
-rw-r--r--sysdeps/mach/hurd/getpid.c5
-rw-r--r--sysdeps/mach/hurd/open.c6
-rw-r--r--sysdeps/mach/hurd/pipe.c5
-rw-r--r--sysdeps/mach/hurd/poll.c3
-rw-r--r--sysdeps/mach/hurd/profil.c3
-rw-r--r--sysdeps/mach/hurd/pwrite64.c2
-rw-r--r--sysdeps/mach/hurd/read.c5
-rw-r--r--sysdeps/mach/hurd/sbrk.c4
-rw-r--r--sysdeps/mach/hurd/select.c4
-rw-r--r--sysdeps/mach/hurd/send.c1
-rw-r--r--sysdeps/mach/hurd/setpgid.c4
-rw-r--r--sysdeps/mach/hurd/sigaction.c4
-rw-r--r--sysdeps/mach/hurd/sigsuspend.c3
-rw-r--r--sysdeps/mach/hurd/statfs.c2
-rw-r--r--sysdeps/mach/hurd/write.c7
21 files changed, 37 insertions, 50 deletions
diff --git a/sysdeps/mach/hurd/chown.c b/sysdeps/mach/hurd/chown.c
index cab26fc419..7cb2ce3b24 100644
--- a/sysdeps/mach/hurd/chown.c
+++ b/sysdeps/mach/hurd/chown.c
@@ -38,6 +38,5 @@ __chown (file, owner, group)
return __hurd_fail (err);
return 0;
}
-
-INTDEF(__chown)
+libc_hidden_def (__chown)
weak_alias (__chown, chown)
diff --git a/sysdeps/mach/hurd/close.c b/sysdeps/mach/hurd/close.c
index 7a64fa4503..6e18c08915 100644
--- a/sysdeps/mach/hurd/close.c
+++ b/sysdeps/mach/hurd/close.c
@@ -21,8 +21,6 @@
#include <hurd.h>
#include <hurd/fd.h>
-#undef __close
-
/* Close the file descriptor FD. */
int
__close (int fd)
@@ -33,6 +31,5 @@ __close (int fd)
return err ? __hurd_fail (err) : 0;
}
-
-INTDEF (__close)
+libc_hidden_def (__close)
weak_alias (__close, close)
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 55495591d8..3cdb4a3413 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -370,6 +370,7 @@ __libc_read (int fd, void *buf, size_t nbytes)
return nread;
}
+libc_hidden_weak (__libc_read)
__ssize_t weak_function
__libc_write (int fd, const void *buf, size_t nbytes)
@@ -385,6 +386,7 @@ __libc_write (int fd, const void *buf, size_t nbytes)
return nwrote;
}
+libc_hidden_weak (__libc_write)
/* This is only used for printing messages (see dl-misc.c). */
__ssize_t weak_function
diff --git a/sysdeps/mach/hurd/dup2.c b/sysdeps/mach/hurd/dup2.c
index 64d69d9af1..3abd30cfbe 100644
--- a/sysdeps/mach/hurd/dup2.c
+++ b/sysdeps/mach/hurd/dup2.c
@@ -22,9 +22,6 @@
#include <hurd.h>
#include <hurd/fd.h>
-#undef __dup2
-
-
/* Duplicate FD to FD2, closing the old FD2 and making FD2 be
open on the same file as FD is. Return FD2 or -1. */
int
@@ -133,6 +130,5 @@ __dup2 (fd, fd2)
return fd2;
}
-
-INTDEF(__dup2)
+libc_hidden_def (__dup2)
weak_alias (__dup2, dup2)
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 5c492df35d..275f6b003d 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -23,10 +23,6 @@
#include <stdarg.h>
#include <sys/file.h> /* XXX for LOCK_* */
-#undef __libc_fcntl
-#undef __fcntl
-
-
/* Perform file control operations on FD. */
int
__libc_fcntl (int fd, int cmd, ...)
@@ -200,7 +196,7 @@ __libc_fcntl (int fd, int cmd, ...)
return result;
}
-
-INTDEF2 (__libc_fcntl, __fcntl)
+libc_hidden_def (__libc_fcntl)
weak_alias (__libc_fcntl, __fcntl)
+libc_hidden_weak (__fcntl)
weak_alias (__libc_fcntl, fcntl)
diff --git a/sysdeps/mach/hurd/getpgid.c b/sysdeps/mach/hurd/getpgid.c
index 5402ef417e..167d748e53 100644
--- a/sysdeps/mach/hurd/getpgid.c
+++ b/sysdeps/mach/hurd/getpgid.c
@@ -21,8 +21,6 @@
#include <hurd.h>
#include <hurd/port.h>
-#undef __getpgid
-
/* Get the process group ID of process PID. */
int
__getpgid (pid)
@@ -42,6 +40,5 @@ __getpgid (pid)
return err ? __hurd_fail (err) : pgrp;
}
-
-INTDEF(__getpgid)
+libc_hidden_def (__getpgid)
weak_alias (__getpgid, getpgid)
diff --git a/sysdeps/mach/hurd/getpid.c b/sysdeps/mach/hurd/getpid.c
index bc299f0419..5b21ac5a99 100644
--- a/sysdeps/mach/hurd/getpid.c
+++ b/sysdeps/mach/hurd/getpid.c
@@ -20,8 +20,6 @@
#include <unistd.h>
#include <hurd.h>
-#undef __getpid
-
/* Get the process ID of the calling process. */
pid_t
__getpid ()
@@ -29,6 +27,5 @@ __getpid ()
/* Assumes atomic word fetch and store, so doesn't lock _hurd_pid_lock. */
return _hurd_pid;
}
-
-INTDEF(__getpid)
+libc_hidden_def (__getpid)
weak_alias (__getpid, getpid)
diff --git a/sysdeps/mach/hurd/open.c b/sysdeps/mach/hurd/open.c
index 3ca9a72c84..dd575a47b1 100644
--- a/sysdeps/mach/hurd/open.c
+++ b/sysdeps/mach/hurd/open.c
@@ -22,9 +22,6 @@
#include <hurd.h>
#include <hurd/fd.h>
-#undef __libc_open
-#undef __open
-
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
a third argument is the file protection. */
int
@@ -50,6 +47,7 @@ __libc_open (const char *file, int oflag, ...)
return _hurd_intern_fd (port, oflag, 1);
}
-INTDEF2(__libc_open, __open)
+libc_hidden_def (__libc_open)
weak_alias (__libc_open, __open)
+libc_hidden_weak (__open)
weak_alias (__libc_open, open)
diff --git a/sysdeps/mach/hurd/pipe.c b/sysdeps/mach/hurd/pipe.c
index 6dca3fc70f..7a5d78c29c 100644
--- a/sysdeps/mach/hurd/pipe.c
+++ b/sysdeps/mach/hurd/pipe.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 93, 94, 95, 96, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,99,2000,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
@@ -19,6 +19,7 @@
#include <errno.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <unistd.h>
/* Create a one-way communication channel (pipe).
Actually the channel is two-way on the Hurd.
@@ -46,5 +47,5 @@ __pipe (int fds[2])
return result;
}
-
+libc_hidden_def (__pipe)
weak_alias (__pipe, pipe)
diff --git a/sysdeps/mach/hurd/poll.c b/sysdeps/mach/hurd/poll.c
index f69b32e734..f6f7127efc 100644
--- a/sysdeps/mach/hurd/poll.c
+++ b/sysdeps/mach/hurd/poll.c
@@ -1,5 +1,5 @@
/* poll file descriptors. Hurd version.
- Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 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
@@ -47,4 +47,5 @@ __poll (fds, nfds, timeout)
return _hurd_select (nfds, fds, NULL, NULL, NULL, to, NULL);
}
+libc_hidden_def (__poll)
weak_alias (__poll, poll)
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 307df941dd..d212872643 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -1,5 +1,5 @@
/* Low-level statistical profiling support function. Mach/Hurd version.
- Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 2000, 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
@@ -103,6 +103,7 @@ __profile_frequency (void)
{
return profile_tick;
}
+libc_hidden_def (__profile_frequency)
int
__profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
diff --git a/sysdeps/mach/hurd/pwrite64.c b/sysdeps/mach/hurd/pwrite64.c
index 9d27ae01e6..ec29032977 100644
--- a/sysdeps/mach/hurd/pwrite64.c
+++ b/sysdeps/mach/hurd/pwrite64.c
@@ -34,6 +34,8 @@ __libc_pwrite64 (int fd, const void *buf, size_t nbytes, off64_t offset)
}
#ifndef __libc_pwrite64
+libc_hidden_def (__libc_pwrite64)
weak_alias (__libc_pwrite64, __pwrite64)
+libc_hidden_weak (__pwrite64)
weak_alias (__libc_pwrite64, pwrite64)
#endif
diff --git a/sysdeps/mach/hurd/read.c b/sysdeps/mach/hurd/read.c
index a9683fe115..d32cb85d70 100644
--- a/sysdeps/mach/hurd/read.c
+++ b/sysdeps/mach/hurd/read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,94,95,97,98,99,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,97,98,99,2001,02 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
@@ -27,6 +27,7 @@ __libc_read (int fd, void *buf, size_t nbytes)
error_t err = HURD_FD_USE (fd, _hurd_fd_read (descriptor, buf, &nbytes, -1));
return err ? __hurd_dfail (fd, err) : nbytes;
}
-
+libc_hidden_def (__libc_read)
weak_alias (__libc_read, __read)
+libc_hidden_weak (__read)
weak_alias (__libc_read, read)
diff --git a/sysdeps/mach/hurd/sbrk.c b/sysdeps/mach/hurd/sbrk.c
index 35c6e16e1c..a5ca703a4e 100644
--- a/sysdeps/mach/hurd/sbrk.c
+++ b/sysdeps/mach/hurd/sbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 94, 95, 97, 98, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,95,97,98,2000,02 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
@@ -38,5 +38,5 @@ __sbrk (intptr_t increment)
return result;
}
-
+libc_hidden_def (__sbrk)
weak_alias (__sbrk, sbrk)
diff --git a/sysdeps/mach/hurd/select.c b/sysdeps/mach/hurd/select.c
index c9ef2813eb..fb85d0cf85 100644
--- a/sysdeps/mach/hurd/select.c
+++ b/sysdeps/mach/hurd/select.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,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
@@ -46,5 +46,5 @@ __select (nfds, readfds, writefds, exceptfds, timeout)
return _hurd_select (nfds, NULL, readfds, writefds, exceptfds, to, NULL);
}
-
+libc_hidden_def (__select)
weak_alias (__select, select)
diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c
index 69cec5512e..4810cd68c3 100644
--- a/sysdeps/mach/hurd/send.c
+++ b/sysdeps/mach/hurd/send.c
@@ -40,4 +40,5 @@ __send (fd, buf, n, flags)
return err ? __hurd_dfail (fd, err) : wrote;
}
+libc_hidden_def (__send)
weak_alias (__send, send)
diff --git a/sysdeps/mach/hurd/setpgid.c b/sysdeps/mach/hurd/setpgid.c
index 804cb71b19..27b15b2281 100644
--- a/sysdeps/mach/hurd/setpgid.c
+++ b/sysdeps/mach/hurd/setpgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1994,1995,1996,1997,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
@@ -53,5 +53,5 @@ __setpgid (pid, pgid)
return 0;
}
-
+libc_hidden_def (__setpgid)
weak_alias (__setpgid, setpgid)
diff --git a/sysdeps/mach/hurd/sigaction.c b/sysdeps/mach/hurd/sigaction.c
index 80780efbec..3dc530955d 100644
--- a/sysdeps/mach/hurd/sigaction.c
+++ b/sysdeps/mach/hurd/sigaction.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,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
@@ -90,5 +90,5 @@ __sigaction (sig, act, oact)
return 0;
}
-
+libc_hidden_def (__sigaction)
weak_alias (__sigaction, sigaction)
diff --git a/sysdeps/mach/hurd/sigsuspend.c b/sysdeps/mach/hurd/sigsuspend.c
index 1bb292699d..96b3857c72 100644
--- a/sysdeps/mach/hurd/sigsuspend.c
+++ b/sysdeps/mach/hurd/sigsuspend.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,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
@@ -79,4 +79,5 @@ __sigsuspend (set)
errno = EINTR;
return -1;
}
+libc_hidden_def (__sigsuspend)
weak_alias (__sigsuspend, sigsuspend)
diff --git a/sysdeps/mach/hurd/statfs.c b/sysdeps/mach/hurd/statfs.c
index aa6b300373..65956ae664 100644
--- a/sysdeps/mach/hurd/statfs.c
+++ b/sysdeps/mach/hurd/statfs.c
@@ -28,5 +28,5 @@ __statfs (const char *file, struct statfs *buf)
struct statfs64 buf64;
return __statfs64 (file, &buf64) ?: statfs64_conv (buf, &buf64);
}
-
+libc_hidden_def (__statfs)
weak_alias (__statfs, statfs)
diff --git a/sysdeps/mach/hurd/write.c b/sysdeps/mach/hurd/write.c
index 5d6ce81436..514e460930 100644
--- a/sysdeps/mach/hurd/write.c
+++ b/sysdeps/mach/hurd/write.c
@@ -20,9 +20,6 @@
#include <unistd.h>
#include <hurd/fd.h>
-#undef __libc_write
-#undef __write
-
ssize_t
__libc_write (int fd, const void *buf, size_t nbytes)
{
@@ -30,7 +27,7 @@ __libc_write (int fd, const void *buf, size_t nbytes)
buf, &nbytes, -1));
return err ? __hurd_dfail (fd, err) : nbytes;
}
-
+libc_hidden_def (__libc_write)
weak_alias (__libc_write, __write)
-INTDEF(__write)
+libc_hidden_weak (__write)
weak_alias (__libc_write, write)