[Glibc-bsd-commits] r5039 - in trunk/glibc-ports/kfreebsd: . i386 x86_64
Petr Salinger
ps-guest at alioth.debian.org
Sat Oct 12 17:02:48 UTC 2013
Author: ps-guest
Date: 2013-10-12 17:02:48 +0000 (Sat, 12 Oct 2013)
New Revision: 5039
Modified:
trunk/glibc-ports/kfreebsd/fxstat.c
trunk/glibc-ports/kfreebsd/fxstat64.c
trunk/glibc-ports/kfreebsd/fxstatat.c
trunk/glibc-ports/kfreebsd/fxstatat64.c
trunk/glibc-ports/kfreebsd/getcwd.c
trunk/glibc-ports/kfreebsd/i386/start.S
trunk/glibc-ports/kfreebsd/i386/sysdep.h
trunk/glibc-ports/kfreebsd/lxstat.c
trunk/glibc-ports/kfreebsd/lxstat64.c
trunk/glibc-ports/kfreebsd/readv.c
trunk/glibc-ports/kfreebsd/stat16conv.c
trunk/glibc-ports/kfreebsd/writev.c
trunk/glibc-ports/kfreebsd/x86_64/start.S
trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
trunk/glibc-ports/kfreebsd/xstat.c
trunk/glibc-ports/kfreebsd/xstat64.c
Log:
remove bounded pointer support
Modified: trunk/glibc-ports/kfreebsd/fxstat.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fxstat.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/fxstat.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -36,7 +35,7 @@
return result;
}
else if (__builtin_expect (vers == _STAT_VER_stat, 1))
- return __syscall_fstat (fd, CHECK_1 ((struct stat16 *) buf));
+ return __syscall_fstat (fd, (struct stat16 *) buf);
else
{
__set_errno (EINVAL);
Modified: trunk/glibc-ports/kfreebsd/fxstat64.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fxstat64.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/fxstat64.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
Modified: trunk/glibc-ports/kfreebsd/fxstatat.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fxstatat.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/fxstatat.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -28,7 +28,6 @@
#include <sys/sysctl.h>
#include <sys/user.h>
#include <kernel-features.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -46,7 +45,7 @@
{
struct stat16 buf16;
result =
- INLINE_SYSCALL (fstatat, 4, fd, CHECK_STRING (file),
+ INLINE_SYSCALL (fstatat, 4, fd, file,
__ptrvalue (&buf16), flag);
if (result == 0)
stat16_to_stat (&buf16, st);
@@ -54,8 +53,8 @@
else if (__builtin_expect (vers == _STAT_VER_stat, 1))
{
result =
- INLINE_SYSCALL (fstatat, 4, fd, CHECK_STRING (file),
- CHECK_1 ((struct stat16 *) st), flag);
+ INLINE_SYSCALL (fstatat, 4, fd, file,
+ (struct stat16 *) st, flag);
}
else
{
Modified: trunk/glibc-ports/kfreebsd/fxstatat64.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fxstatat64.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/fxstatat64.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -28,7 +28,6 @@
#include <sys/sysctl.h>
#include <sys/user.h>
#include <kernel-features.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -46,7 +45,7 @@
{
struct stat16 buf16;
result =
- INLINE_SYSCALL (fstatat, 4, fd, CHECK_STRING (file),
+ INLINE_SYSCALL (fstatat, 4, fd, file,
__ptrvalue (&buf16), flag);
if (result == 0)
stat16_to_stat64 (&buf16, st);
Modified: trunk/glibc-ports/kfreebsd/getcwd.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getcwd.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/getcwd.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -25,7 +25,6 @@
#include <unistd.h>
#include <sysdep.h>
-#include <bp-checks.h>
/* If we compile the file for use in ld.so we don't need the feature
that getcwd() allocates the buffers itself. */
@@ -35,7 +34,7 @@
/* 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);
+extern int __syscall_getcwd (char *buf, unsigned int size);
libc_hidden_proto (__syscall_getcwd)
static char *generic_getcwd (char *buf, size_t size) internal_function;
Modified: trunk/glibc-ports/kfreebsd/i386/start.S
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/start.S 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/i386/start.S 2013-10-12 17:02:48 UTC (rev 5039)
@@ -52,7 +52,6 @@
NULL
*/
-#include "bp-sym.h"
#include <libc-symbols.h>
weak_extern (_end)
@@ -100,11 +99,11 @@
pushl %ecx /* Push second argument: argv. */
pushl %esi /* Push first argument: argc. */
- pushl BP_SYM (main)@GOT(%ebx)
+ pushl main at GOT(%ebx)
/* Call the user's main function, and exit with its value.
But let the libc call main. */
- call BP_SYM (__libc_start_main)@PLT
+ call __libc_start_main at PLT
#else
/* Push address of our own entry points to .fini and .init. */
pushl $__libc_csu_fini
@@ -113,11 +112,11 @@
pushl %ecx /* Push second argument: argv. */
pushl %esi /* Push first argument: argc. */
- pushl $BP_SYM (main)
+ pushl $main
/* Call the user's main function, and exit with its value.
But let the libc call main. */
- call BP_SYM (__libc_start_main)
+ call __libc_start_main
#endif
hlt /* Crash if somehow `exit' does return. */
Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h 2013-10-12 17:02:48 UTC (rev 5039)
@@ -23,8 +23,6 @@
/* There is some commonality. */
#include <sysdeps/unix/i386/sysdep.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
/* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
#include <dl-sysdep.h>
#include <tls.h>
Modified: trunk/glibc-ports/kfreebsd/lxstat.c
===================================================================
--- trunk/glibc-ports/kfreebsd/lxstat.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/lxstat.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -30,14 +29,13 @@
if (__builtin_expect (vers == _STAT_VER, 1))
{
struct stat16 buf16;
- int result = __syscall_lstat (CHECK_STRING (file), __ptrvalue (&buf16));
+ int result = __syscall_lstat (file, __ptrvalue (&buf16));
if (result == 0)
stat16_to_stat (&buf16, buf);
return result;
}
else if (__builtin_expect (vers == _STAT_VER_stat, 1))
- return __syscall_lstat (CHECK_STRING (file),
- CHECK_1 ((struct stat16 *) buf));
+ return __syscall_lstat (file, (struct stat16 *) buf);
else
{
__set_errno (EINVAL);
Modified: trunk/glibc-ports/kfreebsd/lxstat64.c
===================================================================
--- trunk/glibc-ports/kfreebsd/lxstat64.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/lxstat64.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -30,7 +29,7 @@
if (__builtin_expect (vers == _STAT_VER, 1))
{
struct stat16 buf16;
- int result = __syscall_lstat (CHECK_STRING (file), __ptrvalue (&buf16));
+ int result = __syscall_lstat (file, __ptrvalue (&buf16));
if (result == 0)
stat16_to_stat64 (&buf16, buf);
return result;
Modified: trunk/glibc-ports/kfreebsd/readv.c
===================================================================
--- trunk/glibc-ports/kfreebsd/readv.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/readv.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -24,10 +24,9 @@
#include <sysdep.h>
#include <sys/syscall.h>
-#include <bp-checks.h>
#include <sysdep-cancel.h>
-extern ssize_t __syscall_readv (int, __const struct iovec *__unbounded, int);
+extern ssize_t __syscall_readv (int, __const struct iovec *, int);
libc_hidden_proto(__syscall_readv)
static ssize_t __atomic_readv_replacement (int, __const struct iovec *,
@@ -39,10 +38,10 @@
if (count <= UIO_MAXIOV)
{
if (SINGLE_THREAD_P)
- return INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count);
+ return INLINE_SYSCALL (readv, 3, fd, vector, count);
int oldtype = LIBC_CANCEL_ASYNC ();
- ssize_t result = INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count);
+ ssize_t result = INLINE_SYSCALL (readv, 3, fd, vector, count);
LIBC_CANCEL_RESET (oldtype);
return result;
Modified: trunk/glibc-ports/kfreebsd/stat16conv.c
===================================================================
--- trunk/glibc-ports/kfreebsd/stat16conv.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/stat16conv.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -23,9 +23,9 @@
#include <bits/stat16.h>
extern int __syscall_fhstat (const fhandle_t *fhp, struct stat16 *buf);
-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);
+extern int __syscall_fstat (int, struct stat16 *);
+extern int __syscall_lstat (const char *, struct stat16 *);
+extern int __syscall_stat (const char *, struct stat16 *);
libc_hidden_proto (__syscall_fhstat)
libc_hidden_proto (__syscall_fstat)
libc_hidden_proto (__syscall_lstat)
Modified: trunk/glibc-ports/kfreebsd/writev.c
===================================================================
--- trunk/glibc-ports/kfreebsd/writev.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/writev.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -24,10 +24,9 @@
#include <sysdep.h>
#include <sys/syscall.h>
-#include <bp-checks.h>
#include <sysdep-cancel.h>
-extern ssize_t __syscall_writev (int, const struct iovec *__unbounded, int);
+extern ssize_t __syscall_writev (int, const struct iovec *, int);
static ssize_t __atomic_writev_replacement (int, const struct iovec *,
int) internal_function;
@@ -38,10 +37,10 @@
if (count <= UIO_MAXIOV)
{
if (SINGLE_THREAD_P)
- return INLINE_SYSCALL (writev, 3, fd, CHECK_N (vector, count), count);
+ return INLINE_SYSCALL (writev, 3, fd, vector, count);
int oldtype = LIBC_CANCEL_ASYNC ();
- ssize_t result = INLINE_SYSCALL (writev, 3, fd, CHECK_N (vector, count), count);
+ ssize_t result = INLINE_SYSCALL (writev, 3, fd, vector, count);
LIBC_CANCEL_RESET (oldtype);
return result;
Modified: trunk/glibc-ports/kfreebsd/x86_64/start.S
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/start.S 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/x86_64/start.S 2013-10-12 17:02:48 UTC (rev 5039)
@@ -74,7 +74,6 @@
#include <sysdep.h>
#include <libc-symbols.h>
-#include "bp-sym.h"
weak_extern (_end)
@@ -121,21 +120,21 @@
movq __libc_csu_fini at GOTPCREL(%rip), %r8
movq __libc_csu_init at GOTPCREL(%rip), %rcx
- movq BP_SYM (main)@GOTPCREL(%rip), %rdi
+ movq main at GOTPCREL(%rip), %rdi
/* Call the user's main function, and exit with its value.
But let the libc call main. */
- call BP_SYM (__libc_start_main)@PLT
+ call __libc_start_main at PLT
#else
/* Pass address of our own entry points to .fini and .init. */
movq $__libc_csu_fini, %r8
movq $__libc_csu_init, %rcx
- movq $BP_SYM (main), %rdi
+ movq $main, %rdi
/* Call the user's main function, and exit with its value.
But let the libc call main. */
- call BP_SYM (__libc_start_main)
+ call __libc_start_main
#endif
hlt /* Crash if somehow `exit' does return. */
Modified: trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sysdep.h 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/x86_64/sysdep.h 2013-10-12 17:02:48 UTC (rev 5039)
@@ -22,8 +22,6 @@
/* There is some commonality. */
#include <sysdeps/unix/x86_64/sysdep.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
#include <tls.h>
#ifdef IS_IN_rtld
Modified: trunk/glibc-ports/kfreebsd/xstat.c
===================================================================
--- trunk/glibc-ports/kfreebsd/xstat.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/xstat.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -30,14 +29,13 @@
if (__builtin_expect (vers == _STAT_VER, 1))
{
struct stat16 buf16;
- int result = __syscall_stat (CHECK_STRING (file), __ptrvalue (&buf16));
+ int result = __syscall_stat (file, __ptrvalue (&buf16));
if (result == 0)
stat16_to_stat (&buf16, buf);
return result;
}
else if (__builtin_expect (vers == _STAT_VER_stat, 1))
- return __syscall_stat (CHECK_STRING (file),
- CHECK_1 ((struct stat16 *) buf));
+ return __syscall_stat (file, (struct stat16 *) buf);
else
{
__set_errno (EINVAL);
Modified: trunk/glibc-ports/kfreebsd/xstat64.c
===================================================================
--- trunk/glibc-ports/kfreebsd/xstat64.c 2013-10-11 23:38:18 UTC (rev 5038)
+++ trunk/glibc-ports/kfreebsd/xstat64.c 2013-10-12 17:02:48 UTC (rev 5039)
@@ -20,7 +20,6 @@
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
-#include <bp-checks.h>
#include "stat16conv.c"
@@ -30,7 +29,7 @@
if (__builtin_expect (vers == _STAT_VER, 1))
{
struct stat16 buf16;
- int result = __syscall_stat (CHECK_STRING (file), __ptrvalue (&buf16));
+ int result = __syscall_stat (file, __ptrvalue (&buf16));
if (result == 0)
stat16_to_stat64 (&buf16, buf);
return result;
More information about the Glibc-bsd-commits
mailing list