[Glibc-bsd-commits] r2027 - in trunk/glibc-ports/kfreebsd: . i386 x86_64

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Thu Nov 15 20:03:22 UTC 2007


Author: ps-guest
Date: 2007-11-15 20:03:21 +0000 (Thu, 15 Nov 2007)
New Revision: 2027

Modified:
   trunk/glibc-ports/kfreebsd/bind.c
   trunk/glibc-ports/kfreebsd/brk.c
   trunk/glibc-ports/kfreebsd/clock_getres.c
   trunk/glibc-ports/kfreebsd/clock_gettime.c
   trunk/glibc-ports/kfreebsd/clock_settime.c
   trunk/glibc-ports/kfreebsd/connect.c
   trunk/glibc-ports/kfreebsd/ftruncate.c
   trunk/glibc-ports/kfreebsd/getcwd.c
   trunk/glibc-ports/kfreebsd/getdents.c
   trunk/glibc-ports/kfreebsd/getlogin.c
   trunk/glibc-ports/kfreebsd/getlogin_r.c
   trunk/glibc-ports/kfreebsd/i386/sys_fork.S
   trunk/glibc-ports/kfreebsd/i386/sys_lseek.S
   trunk/glibc-ports/kfreebsd/i386/syscall.S
   trunk/glibc-ports/kfreebsd/lseek.c
   trunk/glibc-ports/kfreebsd/mmap.c
   trunk/glibc-ports/kfreebsd/munmap.c
   trunk/glibc-ports/kfreebsd/pread.c
   trunk/glibc-ports/kfreebsd/pwrite.c
   trunk/glibc-ports/kfreebsd/readv.c
   trunk/glibc-ports/kfreebsd/recv.c
   trunk/glibc-ports/kfreebsd/send.c
   trunk/glibc-ports/kfreebsd/sendto.c
   trunk/glibc-ports/kfreebsd/sigaction.c
   trunk/glibc-ports/kfreebsd/stat16conv.c
   trunk/glibc-ports/kfreebsd/syscalls-inline.h
   trunk/glibc-ports/kfreebsd/truncate.c
   trunk/glibc-ports/kfreebsd/usleep.c
   trunk/glibc-ports/kfreebsd/x86_64/sys_fork.S
   trunk/glibc-ports/kfreebsd/x86_64/syscall.S
Log:
* lower number of excessive plt entries, showed by elf/check-localplt



Modified: trunk/glibc-ports/kfreebsd/bind.c
===================================================================
--- trunk/glibc-ports/kfreebsd/bind.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/bind.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -30,6 +30,7 @@
 
 extern int __syscall_bind (int fd, __CONST_SOCKADDR_ARG addr, 
 			   socklen_t addrlen) __THROW;
+libc_hidden_proto (__syscall_bind)
 
 /* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
    For connectionless socket types, just set the default address to send to

Modified: trunk/glibc-ports/kfreebsd/brk.c
===================================================================
--- trunk/glibc-ports/kfreebsd/brk.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/brk.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -39,7 +39,7 @@
   if (addr < &_end)
     return 0;
 
-  if (syscall (SYS_break, addr) == -1)
+  if (__syscall (SYS_break, addr) == -1)
     {
       __set_errno (ENOMEM);
       return -1;

Modified: trunk/glibc-ports/kfreebsd/clock_getres.c
===================================================================
--- trunk/glibc-ports/kfreebsd/clock_getres.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/clock_getres.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 
 int __syscall_clock_getres(clockid_t clock_id, struct timespec *tp);
+libc_hidden_proto (__syscall_clock_getres)
 
 # define SYSDEP_GETRES \
   case CLOCK_REALTIME:							      \

Modified: trunk/glibc-ports/kfreebsd/clock_gettime.c
===================================================================
--- trunk/glibc-ports/kfreebsd/clock_gettime.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/clock_gettime.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -20,6 +20,7 @@
 #include "kernel-posix-cpu-timers.h"
 
 int __syscall_clock_gettime(clockid_t clock_id, struct timespec *tp);
+libc_hidden_proto (__syscall_clock_gettime)
 
 # define SYSDEP_GETTIME \
   case CLOCK_REALTIME:							      \

Modified: trunk/glibc-ports/kfreebsd/clock_settime.c
===================================================================
--- trunk/glibc-ports/kfreebsd/clock_settime.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/clock_settime.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -20,6 +20,7 @@
 #include "kernel-posix-cpu-timers.h"
 
 int __syscall_clock_settime(clockid_t clock_id, const struct timespec *tp);
+libc_hidden_proto (__syscall_clock_settime)
 
 # define SYSDEP_SETTIME \
   case CLOCK_REALTIME:							      \

Modified: trunk/glibc-ports/kfreebsd/connect.c
===================================================================
--- trunk/glibc-ports/kfreebsd/connect.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/connect.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -31,6 +31,7 @@
 
 extern int __syscall_connect (int fd, __CONST_SOCKADDR_ARG addr, 
 			      socklen_t addrlen);
+libc_hidden_proto (__syscall_connect)
 
 /* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
    For connectionless socket types, just set the default address to send to

Modified: trunk/glibc-ports/kfreebsd/ftruncate.c
===================================================================
--- trunk/glibc-ports/kfreebsd/ftruncate.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/ftruncate.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -25,6 +25,7 @@
    argument.  */
 extern int __syscall_ftruncate (int __fd, int __unused1,
 				__off_t __length) __THROW;
+libc_hidden_proto (__syscall_ftruncate)
 
 int
 __ftruncate (int fd, __off_t length)

Modified: trunk/glibc-ports/kfreebsd/getcwd.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getcwd.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/getcwd.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -30,6 +30,8 @@
 /* The system calls only makes a lookup in the VFS cache, which can easily
    fail.  Therefore we use the generic version as a fallback.  */
 extern int __syscall_getcwd (char *__unbounded buf, unsigned int size);
+libc_hidden_proto (__syscall_getcwd)
+
 static char *generic_getcwd (char *buf, size_t size) internal_function;
 
 char *

Modified: trunk/glibc-ports/kfreebsd/getdents.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getdents.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/getdents.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -28,6 +28,7 @@
 /* Use the 3-argument system call.  */
 
 extern int __syscall_getdents (int fd, char *buf, size_t nbytes);
+libc_hidden_proto (__syscall_getdents)
 
 /* Read directory entries from FD into BUF, reading at most NBYTES.
    Returns the number of bytes read; zero when at end of directory; or

Modified: trunk/glibc-ports/kfreebsd/getlogin.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getlogin.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/getlogin.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -29,6 +29,7 @@
 extern char __getlogin_cache_room[MAXLOGNAME];
 
 extern int __syscall_getlogin (char *__name, size_t __name_len);
+libc_hidden_proto (__syscall_getlogin)
 
 /* Return the login name of the user, or NULL if it can't be determined.
    The returned pointer, if not NULL, is good only until the next call.  */

Modified: trunk/glibc-ports/kfreebsd/getlogin_r.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getlogin_r.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/getlogin_r.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -32,6 +32,7 @@
 char __getlogin_cache_room[MAXLOGNAME];
 
 extern int __syscall_getlogin (char *__name, size_t __name_len);
+libc_hidden_proto (__syscall_getlogin)
 
 /* Return at most NAME_LEN characters of the login name of the user in NAME.
    If it cannot be determined or some other error occurred, return the error

Modified: trunk/glibc-ports/kfreebsd/i386/sys_fork.S
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sys_fork.S	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/i386/sys_fork.S	2007-11-15 20:03:21 UTC (rev 2027)
@@ -31,3 +31,4 @@
 L(pseudo_end):
 	ret
 PSEUDO_END (__syscall_fork)
+libc_hidden_def (__syscall_fork)

Modified: trunk/glibc-ports/kfreebsd/i386/sys_lseek.S
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sys_lseek.S	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/i386/sys_lseek.S	2007-11-15 20:03:21 UTC (rev 2027)
@@ -29,3 +29,4 @@
 L(no_error):
 	ret
 PSEUDO_END(__syscall_lseek)
+libc_hidden_def (__syscall_lseek)

Modified: trunk/glibc-ports/kfreebsd/i386/syscall.S
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/syscall.S	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/i386/syscall.S	2007-11-15 20:03:21 UTC (rev 2027)
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 
 	  .text;
-ENTRY (syscall)
+ENTRY (__syscall)
 	popl %ecx		/* Pop return address into %ecx.  */
 	cfi_adjust_cfa_offset (-4)
 	movl 0(%esp), %eax	/* Load syscall number into %eax. */
@@ -30,4 +30,5 @@
 
 L(pseudo_end):
 	ret			/* Return to caller.  */
-PSEUDO_END (syscall)
+PSEUDO_END (__syscall)
+weak_alias (__syscall, syscall)

Modified: trunk/glibc-ports/kfreebsd/lseek.c
===================================================================
--- trunk/glibc-ports/kfreebsd/lseek.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/lseek.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -26,6 +26,7 @@
    argument.  */
 extern __off_t __syscall_lseek (int __fd, int __unused1, __off_t __offset,
 				int __whence) __THROW;
+libc_hidden_proto (__syscall_lseek)
 
 __off_t
 __libc_lseek (int fd, __off_t offset, int whence)

Modified: trunk/glibc-ports/kfreebsd/mmap.c
===================================================================
--- trunk/glibc-ports/kfreebsd/mmap.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/mmap.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -28,9 +28,12 @@
 extern void *__syscall_mmap (void *__addr, size_t __len, int __prot,
 			     int __flags, int __fd, int __unused1,
 			     __off_t __offset) __THROW;
+libc_hidden_proto (__syscall_mmap)
+			     
 extern ssize_t __syscall_pread (int __fd, void *__buf, size_t __nbytes,
                                 int __unused1, __off_t __offset) __THROW;
 
+libc_hidden_proto (__syscall_pread)
 void *
 __mmap (void *addr, size_t len, int prot, int flags, int fd, __off_t offset)
 {

Modified: trunk/glibc-ports/kfreebsd/munmap.c
===================================================================
--- trunk/glibc-ports/kfreebsd/munmap.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/munmap.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -24,6 +24,7 @@
 #include <sysdep.h>
 
 extern int __syscall_munmap (void *__addr, size_t __len) __THROW;
+libc_hidden_proto (__syscall_munmap)
 
 int
 __munmap (void *addr, size_t len)

Modified: trunk/glibc-ports/kfreebsd/pread.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pread.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/pread.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -26,6 +26,7 @@
    argument.  */
 extern ssize_t __syscall_pread (int __fd, void *__buf, size_t __nbytes,
 				int __unused1, __off_t __offset) __THROW;
+libc_hidden_proto(__syscall_pread)
 
 ssize_t
 __libc_pread (int fd, void *buf, size_t nbytes, __off_t offset)

Modified: trunk/glibc-ports/kfreebsd/pwrite.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pwrite.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/pwrite.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -26,6 +26,7 @@
    argument.  */
 extern ssize_t __syscall_pwrite (int __fd, const void *__buf, size_t __nbytes,
 				 int __unused1, __off_t __offset) __THROW;
+libc_hidden_proto(__syscall_pwrite)
 
 ssize_t
 __libc_pwrite (int fd, const void *buf, size_t nbytes, __off_t offset)

Modified: trunk/glibc-ports/kfreebsd/readv.c
===================================================================
--- trunk/glibc-ports/kfreebsd/readv.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/readv.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -28,6 +28,7 @@
 #include <sysdep-cancel.h>
 
 extern ssize_t __syscall_readv (int, __const struct iovec *__unbounded, int);
+libc_hidden_proto(__syscall_readv)
 
 static ssize_t __atomic_readv_replacement (int, __const struct iovec *,
 					   int) internal_function;

Modified: trunk/glibc-ports/kfreebsd/recv.c
===================================================================
--- trunk/glibc-ports/kfreebsd/recv.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/recv.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -22,6 +22,9 @@
 
 /* The real syscall's name.  See sysdeps/unix/inet/syscalls.list.  */
 #define __syscall_recvfrom __libc_recvfrom
+ssize_t __libc_recvfrom(int s, void *buf, size_t len, int flags,
+                        struct sockaddr *from, socklen_t *fromlen);
+libc_hidden_proto (__libc_recvfrom)                          
 
 /* Read N bytes into BUF from socket FD.
    Return the number of bytes read or -1 for error.  */

Modified: trunk/glibc-ports/kfreebsd/send.c
===================================================================
--- trunk/glibc-ports/kfreebsd/send.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/send.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -24,6 +24,7 @@
 		                 size_t n, int flags, 
 				 __CONST_SOCKADDR_ARG addr, 
 				 socklen_t addrlen);
+libc_hidden_proto (__syscall_sendto)
 
 /* Send N bytes of BUF to socket FD.
    Return the number of bytes sent or -1.  */

Modified: trunk/glibc-ports/kfreebsd/sendto.c
===================================================================
--- trunk/glibc-ports/kfreebsd/sendto.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/sendto.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -33,6 +33,7 @@
 		                 size_t n, int flags, 
 				 __CONST_SOCKADDR_ARG addr, 
 				 socklen_t addrlen);
+libc_hidden_proto (__syscall_sendto)
 
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
  *    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */

Modified: trunk/glibc-ports/kfreebsd/sigaction.c
===================================================================
--- trunk/glibc-ports/kfreebsd/sigaction.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/sigaction.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -22,6 +22,7 @@
 #include <signal.h>
 
 extern int __syscall_sigaction (int __sig,  const struct sigaction *__act, struct sigaction *__oact) __THROW;
+libc_hidden_proto (__syscall_sigaction)
 
 int
 __libc_sigaction (sig, act, oact)

Modified: trunk/glibc-ports/kfreebsd/stat16conv.c
===================================================================
--- trunk/glibc-ports/kfreebsd/stat16conv.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/stat16conv.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -26,8 +26,11 @@
 extern int __syscall_fstat (int, struct stat16 *__unbounded);
 extern int __syscall_lstat (const char *__unbounded, struct stat16 *__unbounded);
 extern int __syscall_stat (const char *__unbounded, struct stat16 *__unbounded);
+libc_hidden_proto (__syscall_fhstat)
+libc_hidden_proto (__syscall_fstat)
+libc_hidden_proto (__syscall_lstat)
+libc_hidden_proto (__syscall_stat)
 
-
 /* Convert a 'struct stat16' to 'struct stat'.  */
 static inline void
 stat16_to_stat (const struct stat16 *p16, struct stat *q)

Modified: trunk/glibc-ports/kfreebsd/syscalls-inline.h
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls-inline.h	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/syscalls-inline.h	2007-11-15 20:03:21 UTC (rev 2027)
@@ -30,15 +30,25 @@
 
 int __syscall_open(const char *path, int flags, ...);
 int __syscall_close(int fd);
+libc_hidden_proto (__syscall_open)
+libc_hidden_proto (__syscall_close)
 
 ssize_t __syscall_read(int fd, void *buf, size_t nbyte);
 ssize_t __syscall_write(int fd, const void *buf, size_t nbyte);
 ssize_t __syscall_writev(int fd, const struct iovec *iovp, int iovcnt); 
+libc_hidden_proto (__syscall_read)
+libc_hidden_proto (__syscall_write)
+libc_hidden_proto (__syscall_writev)
 
 int __syscall_fcntl(int fd, int cmd, ...);
 int __syscall_fork(void);
 int __syscall_wait4(int pid, int *status, int options, struct rusage *rusage);
 int __syscall_sigsuspend (const sigset_t *set);
 int __syscall_nanosleep (const struct timespec *requested_time, struct timespec *remaining);
+libc_hidden_proto (__syscall_fcntl)
+libc_hidden_proto (__syscall_fork)
+libc_hidden_proto (__syscall_wait4)
+libc_hidden_proto (__syscall_sigsuspend)
+libc_hidden_proto (__syscall_nanosleep)
 
 #endif

Modified: trunk/glibc-ports/kfreebsd/truncate.c
===================================================================
--- trunk/glibc-ports/kfreebsd/truncate.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/truncate.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -25,6 +25,7 @@
    argument.  */
 extern int __syscall_truncate (const char *__file, int __unused1,
 			       __off_t __length) __THROW;
+libc_hidden_proto (__syscall_truncate)
 
 int
 __truncate (const char *file, __off_t length)

Modified: trunk/glibc-ports/kfreebsd/usleep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/usleep.c	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/usleep.c	2007-11-15 20:03:21 UTC (rev 2027)
@@ -20,9 +20,6 @@
 #include <time.h>
 #include <unistd.h>
 
-extern int __nanosleep (const struct timespec *requested_time,
-			     struct timespec *remaining);
-
 int
 usleep (useconds_t useconds)
 {

Modified: trunk/glibc-ports/kfreebsd/x86_64/sys_fork.S
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sys_fork.S	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/x86_64/sys_fork.S	2007-11-15 20:03:21 UTC (rev 2027)
@@ -33,3 +33,4 @@
 L(pseudo_end):
 	ret
 PSEUDO_END (__syscall_fork)
+libc_hidden_def (__syscall_fork)

Modified: trunk/glibc-ports/kfreebsd/x86_64/syscall.S
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/syscall.S	2007-11-15 14:50:04 UTC (rev 2026)
+++ trunk/glibc-ports/kfreebsd/x86_64/syscall.S	2007-11-15 20:03:21 UTC (rev 2027)
@@ -20,11 +20,12 @@
 #include <sysdep.h>
 
 	.text
-ENTRY (syscall)
+ENTRY (__syscall)
 	movq %rcx, %r10
 	movl $SYS_ify (syscall), %eax
 	syscall
 	jb SYSCALL_ERROR_LABEL
 L(pseudo_end):
 	ret
-PSEUDO_END (syscall)
+PSEUDO_END (__syscall)
+weak_alias (__syscall, syscall)




More information about the Glibc-bsd-commits mailing list