From ee63ca212c7a153b51c32182eb226f0bde04cc82 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Tue, 27 Jun 2000 01:52:26 +0000 Subject: [PATCH] * sysdeps/i386/bp-asm.h (POP_ERRNO_LOCATION_RETURN): Fold insns. * sysdeps/unix/i386/sysdep.S (syscall_error): Push & pop space for BP return value & push implicit struct-return pointer to __errno_location. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. (SYSCALL_ERROR_HANDLER): Likewise. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h (SYSCALL_ERROR_HANDLER): Likewise. * sysdeps/i386/bp-asm.h (POP_ERRNO_LOCATION_RETURN): Fold insns. * sysdeps/unix/i386/sysdep.S (syscall_error): Push & pop space for BP return value & push implicit struct-return pointer to __errno_location. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. (SYSCALL_ERROR_HANDLER): Likewise. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h (SYSCALL_ERROR_HANDLER): Likewise. * Makeconfig (CPPFLAGS-.ob): Pass -fbounded-pointers for all files *.[cS]. --- ChangeLog | 13 +++++++++++-- sysdeps/unix/i386/sysdep.S | 24 +++++++++++++++--------- sysdeps/unix/sysv/linux/i386/i686/sysdep.h | 6 +++++- sysdeps/unix/sysv/linux/i386/sysdep.h | 8 ++++++-- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ce877f..1ce0773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2000-06-26 Greg McGary + * sysdeps/i386/bp-asm.h (POP_ERRNO_LOCATION_RETURN): Fold insns. + * sysdeps/unix/i386/sysdep.S (syscall_error): Push & pop space + for BP return value & push implicit struct-return pointer to + __errno_location. + * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. + (SYSCALL_ERROR_HANDLER): Likewise. + * sysdeps/unix/sysv/linux/i386/i686/sysdep.h + (SYSCALL_ERROR_HANDLER): Likewise. + * Makeconfig: Add missing comment. * csu/Makefile (extra-objs, omit-deps, install-lib): Add BP-flavored startup object. @@ -828,8 +837,8 @@ 2000-06-07 Greg McGary - * Makeconfig (CPPFLAGS-.ob): Pass -fbounded-pointers for all files - *.[cS]. + * Makeconfig (CPPFLAGS-.ob): Pass -fbounded-pointers + for all files *.[cS]. (CFLAGS-.ob): Don't optimize sibling calls. (bppfx): New variable. * Makerules (elide-bp-thunks): New variable. diff --git a/sysdeps/unix/i386/sysdep.S b/sysdeps/unix/i386/sysdep.S index ff1fc0f..4c13618 100644 --- a/sysdeps/unix/i386/sysdep.S +++ b/sysdeps/unix/i386/sysdep.S @@ -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, 2000 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,8 @@ #include #define _ERRNO_H #include +#include +#include .globl C_SYMBOL_NAME(errno) .globl syscall_error @@ -39,31 +41,35 @@ syscall_error: notb: #endif #ifndef PIC -#ifndef _LIBC_REENTRANT +# ifndef _LIBC_REENTRANT movl %eax, C_SYMBOL_NAME(errno) -#else +# else pushl %eax - call __errno_location + PUSH_ERRNO_LOCATION_RETURN + call BP_SYM (__errno_location) + POP_ERRNO_LOCATION_RETURN popl %ecx movl %ecx, (%eax) -#endif +# endif #else /* The caller has pushed %ebx and then set it up to point to the GOT before calling us through the PLT. */ -#ifndef _LIBC_REENTRANT +# ifndef _LIBC_REENTRANT movl C_SYMBOL_NAME(errno@GOT)(%ebx), %ecx /* Pop %ebx value saved before jumping here. */ popl %ebx movl %eax, (%ecx) -#else +# else pushl %eax - call C_SYMBOL_NAME(__errno_location@PLT) + PUSH_ERRNO_LOCATION_RETURN + call C_SYMBOL_NAME (BP_SYM (__errno_location)@PLT) + POP_ERRNO_LOCATION_RETURN popl %ecx /* Pop %ebx value saved before jumping here. */ popl %ebx movl %ecx, (%eax) -#endif +# endif #endif movl $-1, %eax ret diff --git a/sysdeps/unix/sysv/linux/i386/i686/sysdep.h b/sysdeps/unix/sysv/linux/i386/i686/sysdep.h index 5a45d47..25efe9c 100644 --- a/sysdeps/unix/sysv/linux/i386/i686/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/i686/sysdep.h @@ -22,6 +22,8 @@ /* There is some commonality. */ #include +#include +#include /* We define special versions of the error handler code to match the i686's deep branch prediction mechanism. */ @@ -39,7 +41,9 @@ xorl %edx, %edx; \ subl %eax, %edx; \ pushl %edx; \ - call __errno_location@PLT; \ + PUSH_ERRNO_LOCATION_RETURN; \ + call BP_SYM (__errno_location)@PLT; \ + POP_ERRNO_LOCATION_RETURN; \ popl %ecx; \ popl %ebx; \ movl %ecx, (%eax); \ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 8b758fa..10eba34 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 95, 96, 97, 98, 99, 00 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, , August 1995. @@ -22,6 +22,8 @@ /* There is some commonality. */ #include +#include +#include /* For Linux we can use the system call table in the header file /usr/include/asm/unistd.h @@ -82,7 +84,9 @@ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx; \ subl %eax, %edx; \ pushl %edx; \ - call __errno_location@PLT; \ + PUSH_ERRNO_LOCATION_RETURN; \ + call BP_SYM (__errno_location)@PLT; \ + POP_ERRNO_LOCATION_RETURN; \ popl %ecx; \ popl %ebx; \ movl %ecx, (%eax); \ -- 2.7.4