5 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index 626b0914bc..591bd56f7e 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -1122,7 +1122,7 @@ prefix_array (dirname, array, n)
 
 
 /* We must not compile this function twice.  */
-#if !defined _LIBC || !defined glob
+#if !defined _LIBC || !defined NO_GLOB_PATTERN_P
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
 int
diff --git a/sysdeps/unix/sysv/linux/alpha/glob.c b/sysdeps/unix/sysv/linux/alpha/glob.c
index 311a923026..0ce8d535be 100644
--- a/sysdeps/unix/sysv/linux/alpha/glob.c
+++ b/sysdeps/unix/sysv/linux/alpha/glob.c
@@ -37,6 +37,8 @@ extern void __new_globfree (glob_t *__pglob);
 
 #undef glob
 #undef globfree
+#undef glob64
+#undef globfree64
 
 default_symbol_version(__new_glob, glob, GLIBC_2.1);
 default_symbol_version(__new_globfree, globfree, GLIBC_2.1);
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index ef14984cc2..9f002b2ad1 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -45,10 +45,10 @@ getsockopt	-	getsockopt	5	__getsockopt	getsockopt
 listen		-	listen		2	__listen	listen
 recv		-	recv		4	__libc_recv	__recv recv
 recvfrom	-	recvfrom	6	__libc_recvfrom	__recvfrom recvfrom
-__recvmsg	-	recvmsg		3	__syscall_recvmsg
+recvmsg		-	recvmsg		3	__libc_recvmsg	recvmsg
 ptrace		-	ptrace		4	__ptrace	ptrace
 send		-	send		4	__libc_send	__send send
-__sendmsg	-	sendmsg		3	__syscall_sendmsg
+sendmsg		-	sendmsg		3	__libc_sendmsg	sendmsg
 sendto		-	sendto		6	__libc_sendto	__sendto sendto
 setsockopt	-	setsockopt	5	__setsockopt	setsockopt
 shutdown	-	shutdown	2	__shutdown	shutdown
diff --git a/sysdeps/unix/sysv/linux/glob64.c b/sysdeps/unix/sysv/linux/glob64.c
index 022ae54848..e5c506b435 100644
--- a/sysdeps/unix/sysv/linux/glob64.c
+++ b/sysdeps/unix/sysv/linux/glob64.c
@@ -15,4 +15,6 @@
 #undef __stat
 #define __stat(file, buf) stat64 (file, buf)
 
+#define NO_GLOB_PATTERN_P 1
+
 #include <sysdeps/generic/glob.c>
diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
index c0a4940855..04d48df8d2 100644
--- a/sysdeps/unix/sysv/linux/paths.h
+++ b/sysdeps/unix/sysv/linux/paths.h
@@ -51,7 +51,7 @@
 #define	_PATH_KLOG	"/proc/kmsg"
 #define	_PATH_KMEM	"/dev/kmem"
 #define	_PATH_LASTLOG	"/var/log/lastlog"
-#define	_PATH_MAILDIR	"/var/spool/mail"
+#define	_PATH_MAILDIR	"/var/mail"
 #define	_PATH_MAN	"/usr/man"
 #define	_PATH_MEM	"/dev/mem"
 #define	_PATH_MNTTAB	"/etc/fstab"