From 42d2676e7ccdad60b91f1f90855db164c833ca9f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 23 Nov 1995 04:53:06 +0000 Subject: Wed Nov 22 12:37:39 1995 Roland McGrath * sysdeps/unix/sysv/linux/i386/sysdep.S (_errno): Define as alias for errno. * stdio-common/vfprintf.c [USE_IN_LIBIO] (vfprintf): Define as alias for _IO_vfprintf. * sysdeps/unix/sysv/linux/sockaddrcom.h: File removed. * sysdeps/unix/sysv/linux/i386/init-first.c (init): Use __fpu_control instead of ___fpu_control. * sysdeps/unix/sysv/linux/i386/ieee_fpu.c (___fpu_control): Renamed to __fpu_control. * sysdeps/unix/sysv/linux/i386/fpu_control.h: Likewise. * sysdeps/unix/sysv/linux/i386/fpu_control.c: Likewise. * elf/dl-minimal.c: New file. * elf/Makefile (rtld-routines): Add dl-minimal. * elf/rtld.c (__dgettext, __assert_fail, __assert_perror_fail): Functions moved to dl-minimal.c. * sysdeps/mach/hurd/dl-sysdep.c (malloc, free, realloc, sigjmp_save, longjmp): Likewise. * sysdeps/unix/sysv/linux/i386/brk.S (__curbrk): Always initialize to &_end, regardless of PIC. * stdio-common/vfscanf.c (__vfscanf): Fix arg name in defn. --- sysdeps/mach/hurd/dl-sysdep.c | 56 ------------------------------ sysdeps/unix/sysv/linux/i386/brk.S | 8 ----- sysdeps/unix/sysv/linux/i386/fpu_control.c | 2 +- sysdeps/unix/sysv/linux/i386/fpu_control.h | 10 +++--- sysdeps/unix/sysv/linux/i386/ieee_fpu.c | 2 +- sysdeps/unix/sysv/linux/i386/init-first.c | 2 +- sysdeps/unix/sysv/linux/i386/sysdep.S | 1 + sysdeps/unix/sysv/linux/sockaddrcom.h | 37 -------------------- 8 files changed, 9 insertions(+), 109 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/sockaddrcom.h (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index f8997fe025..a2ffcd2e8c 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -535,62 +535,6 @@ weak_symbol (open) weak_symbol (close) weak_symbol (mmap) -/* Minimal `malloc' allocator for use while loading shared libraries. - Only small blocks are allocated, and none are ever freed. */ - -void * -malloc (size_t n) -{ - static vm_address_t ptr, end; - void *block; - - if (end == 0) - { - /* Consume any unused space in the last page of our data segment. */ - extern char _end; - ptr = (vm_address_t) &_end; - end = round_page (ptr); - } - - /* Make sure the allocation pointer is ideally aligned. */ - ptr += sizeof (double) - 1; - ptr &= ~(sizeof (double) - 1); - - if (ptr + n >= end) - { - /* Insufficient space left; allocate another page. */ - vm_address_t page; - assert (n <= __vm_page_size); - __vm_allocate (__mach_task_self (), &page, __vm_page_size, 1); - if (page != end) - ptr = page; - end = page + __vm_page_size; - } - - block = (void *) ptr; - ptr += n; - return block; -} -weak_symbol (malloc) - -/* This should never be called. */ -void *realloc (void *ptr, size_t n) { ptr += n; abort (); } -weak_symbol (realloc) - -/* This will rarely be called. */ -void free (void *ptr) { ptr = ptr; } -weak_symbol (free) - -/* Avoid signal frobnication in setjmp/longjmp. */ - -int __sigjmp_save (sigjmp_buf env, int savemask) -{ env[0].__mask_was_saved = savemask; return 0; } -weak_symbol (__sigjmp_save) - -void -longjmp (jmp_buf env, int val) { __longjmp (env[0].__jmpbuf, val); } -weak_symbol (longjmp) - /* This function is called by interruptible RPC stubs. For initial dynamic linking, just use the normal mach_msg. Since this defn is diff --git a/sysdeps/unix/sysv/linux/i386/brk.S b/sysdeps/unix/sysv/linux/i386/brk.S index 754ec5ef09..e54e311f23 100644 --- a/sysdeps/unix/sysv/linux/i386/brk.S +++ b/sysdeps/unix/sysv/linux/i386/brk.S @@ -21,15 +21,7 @@ Cambridge, MA 02139, USA. */ .data .globl C_SYMBOL_NAME(__curbrk) C_LABEL(__curbrk) -#ifdef PIC - .long 0 -#else -# ifdef HAVE_GNU_LD .long C_SYMBOL_NAME(_end) -# else - .long C_SYMBOL_NAME(end) -# endif -#endif .text diff --git a/sysdeps/unix/sysv/linux/i386/fpu_control.c b/sysdeps/unix/sysv/linux/i386/fpu_control.c index 79933b90eb..b6840d0b17 100644 --- a/sysdeps/unix/sysv/linux/i386/fpu_control.c +++ b/sysdeps/unix/sysv/linux/i386/fpu_control.c @@ -17,4 +17,4 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -unsigned short ___fpu_control = 0; +unsigned short __fpu_control = 0; diff --git a/sysdeps/unix/sysv/linux/i386/fpu_control.h b/sysdeps/unix/sysv/linux/i386/fpu_control.h index 470e960853..8cf4292643 100644 --- a/sysdeps/unix/sysv/linux/i386/fpu_control.h +++ b/sysdeps/unix/sysv/linux/i386/fpu_control.h @@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA. */ #define _FPU_CONTROL_H /* Here is the dirty part. Settup up your 387 through the control word - * (cw) register. + * (cw) register. * * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM @@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */ * OM: Overflow mask * UM: Underflow mask * PM: Precision (inexact result) mask - * + * * Mask bit is 1 means no interrupt. * * PC: Precision control @@ -55,7 +55,7 @@ Boston, MA 02111-1307, USA. */ #include /* masking of interrupts */ -#define _FPU_MASK_IM 0x01 +#define _FPU_MASK_IM 0x01 #define _FPU_MASK_DM 0x02 #define _FPU_MASK_ZM 0x04 #define _FPU_MASK_OM 0x08 @@ -82,13 +82,13 @@ Boston, MA 02111-1307, USA. */ - extended precision - rounding to nearest - exceptions on overflow, zero divide and NaN */ -#define _FPU_DEFAULT 0x1372 +#define _FPU_DEFAULT 0x1372 /* IEEE: same as above, but exceptions */ #define _FPU_IEEE 0x137f /* private namespace. It should only be used in init-first.o. */ -extern unsigned short ___fpu_control; +extern unsigned short __fpu_control; __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/i386/ieee_fpu.c b/sysdeps/unix/sysv/linux/i386/ieee_fpu.c index 4a0bf31e7c..41511547b2 100644 --- a/sysdeps/unix/sysv/linux/i386/ieee_fpu.c +++ b/sysdeps/unix/sysv/linux/i386/ieee_fpu.c @@ -19,4 +19,4 @@ Boston, MA 02111-1307, USA. */ #include -unsigned short ___fpu_control = _FPU_IEEE; +unsigned short __fpu_control = _FPU_IEEE; diff --git a/sysdeps/unix/sysv/linux/i386/init-first.c b/sysdeps/unix/sysv/linux/i386/init-first.c index 84b5ff9f2c..9ee3f77ef5 100644 --- a/sysdeps/unix/sysv/linux/i386/init-first.c +++ b/sysdeps/unix/sysv/linux/i386/init-first.c @@ -44,7 +44,7 @@ init (int *data) : : "a" (SYS_ify (personality))); /* Set the FPU control word to the proper default value. */ - __setfpucw (___fpu_control); + __setfpucw (__fpu_control); __environ = envp; __libc_init (argc, argv, envp); diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index 0f05c84808..42f4854797 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -24,6 +24,7 @@ Cambridge, MA 02139, USA. */ ...and this place is here. */ .comm errno,4,4 +_errno = errno /* This name is expected by hj libc.so.5 startup code. */ /* The following code is not used at all in the shared library. The PIC system call stubs set errno themselves. */ diff --git a/sysdeps/unix/sysv/linux/sockaddrcom.h b/sysdeps/unix/sysv/linux/sockaddrcom.h deleted file mode 100644 index 768d05be35..0000000000 --- a/sysdeps/unix/sysv/linux/sockaddrcom.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version. -Copyright (C) 1995 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#ifndef _SOCKADDRCOM_H -#define _SOCKADDRCOM_H 1 - -/* This prevents including the file . */ -#define _LINUX_SOCKET_H -#define _LINUX_TYPES_H - -/* This macro is used to declare the initial common members - of the data types used for socket addresses, `struct sockaddr', - `struct sockaddr_in', `struct sockaddr_un', etc. */ - -#define __SOCKADDR_COMMON(sa_prefix) \ - unsigned short int sa_prefix##family - -#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int)) - - -#endif /* sockaddrcom.h */ -- cgit v1.2.3