aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-04-24 18:46:47 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-04-24 18:46:47 +0000
commit90e037bdc3049fca87787b18147f9cff51f32b91 (patch)
tree084c129a00aea0a54d3849757b4e03c465f58391
parent3a533ca370725b68b516e6b74adf4727d17ed28a (diff)
downloadglibc-90e037bdc3049fca87787b18147f9cff51f32b91.tar
glibc-90e037bdc3049fca87787b18147f9cff51f32b91.tar.gz
glibc-90e037bdc3049fca87787b18147f9cff51f32b91.tar.bz2
glibc-90e037bdc3049fca87787b18147f9cff51f32b91.zip
Merge sysdeps/unix/mman into sysdeps/unix.
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/unix/bsd/bsd4.4/Implies2
-rw-r--r--sysdeps/unix/mman/syscalls.list11
-rw-r--r--sysdeps/unix/syscalls.list5
-rw-r--r--sysdeps/unix/sysv/linux/Implies5
5 files changed, 15 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index ca5dd2e31d..282d0a1df5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-04-24 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/syscalls.list (madvise): Add syscall from
+ sysdeps/unix/mman/syscalls.list.
+ (mmap): Likewise.
+ (mprotect): Likewise.
+ (msync): Likewise.
+ (munmap): Likewise.
+ * sysdeps/unix/bsd/bsd4.4/Implies: Remove.
+ * sysdeps/unix/mman/syscalls.list: Remove.
+ * sysdeps/unix/sysv/linux/Implies: Don't include unix/mman.
+
* configure.in (libc_cv_libgcc_s_suffix): Remove test.
(libc_cv_as_needed): Don't use $libc_cv_libgcc_s_suffix.
* configure: Regenerated.
diff --git a/sysdeps/unix/bsd/bsd4.4/Implies b/sysdeps/unix/bsd/bsd4.4/Implies
deleted file mode 100644
index 3bdab54448..0000000000
--- a/sysdeps/unix/bsd/bsd4.4/Implies
+++ /dev/null
@@ -1,2 +0,0 @@
-# 4.4 BSD has the canonical set of <sys/mman.h> system calls.
-unix/mman
diff --git a/sysdeps/unix/mman/syscalls.list b/sysdeps/unix/mman/syscalls.list
deleted file mode 100644
index 7db8eb7729..0000000000
--- a/sysdeps/unix/mman/syscalls.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# This interface desciption corresponds to the POSIX.1 description. The
-# 4.4BSD interface is slightly different since the `msync' function takes
-# only 2 arguments.
-
-# File name Caller Syscall name # args Strong name Weak names
-
-madvise - madvise i:pii madvise
-mmap - mmap b:aniiii __mmap mmap
-mprotect - mprotect i:aii __mprotect mprotect
-msync - msync Ci:aii __libc_msync msync
-munmap - munmap i:ai __munmap munmap
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 4512a4b4b6..6f423bf447 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -26,7 +26,12 @@ ioctl - ioctl i:iiI __ioctl ioctl
kill - kill i:ii __kill kill
link - link i:ss __link link
lseek - lseek i:iii __libc_lseek __lseek lseek
+madvise - madvise i:pii madvise
mkdir - mkdir i:si __mkdir mkdir
+mmap - mmap b:aniiii __mmap mmap
+mprotect - mprotect i:aii __mprotect mprotect
+msync - msync Ci:aii __libc_msync msync
+munmap - munmap i:ai __munmap munmap
open - open Ci:siv __libc_open __open open
profil - profil i:piii __profil profil
ptrace - ptrace i:iiii ptrace
diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies
index 4deb1c6245..ab04990add 100644
--- a/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/unix/sysv/linux/Implies
@@ -5,10 +5,5 @@ gnu
# Linux shares most of the syscalls which are also common to BSD and SVR4.
unix/common
-# Linux as of version 1.3.29 has all functions of the mmap family
-# which are described in POSIX.4. Missing is only madvise() so
-# we define a stub here.
-unix/mman
-
# Linux has network support in the kernel.
unix/inet