mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-16 18:10:11 +00:00
update from main archive 970218
This commit is contained in:
parent
4ead5e7163
commit
d6abe77e92
@ -325,7 +325,7 @@ static inline void
|
||||
elf_machine_rela (struct link_map *map,
|
||||
const Elf64_Rela *reloc,
|
||||
const Elf64_Sym *sym,
|
||||
const hash_name_pair *version)
|
||||
const struct r_found_version *version)
|
||||
{
|
||||
Elf64_Addr * const reloc_addr = (void *)(map->l_addr + reloc->r_offset);
|
||||
unsigned long const r_info = ELF64_R_TYPE (reloc->r_info);
|
||||
|
@ -200,7 +200,7 @@ _dl_start_user:
|
||||
|
||||
static inline void
|
||||
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
||||
const Elf32_Sym *sym, const hash_name_pair *version)
|
||||
const Elf32_Sym *sym, const struct r_found_version *version)
|
||||
{
|
||||
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
||||
Elf32_Addr loadbase;
|
||||
|
@ -423,7 +423,7 @@ _dl_start_user:\n\
|
||||
|
||||
static inline void
|
||||
elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
|
||||
const ElfW(Sym) *sym, const hash_name_pair *version)
|
||||
const ElfW(Sym) *sym, const struct r_found_version *version)
|
||||
{
|
||||
ElfW(Addr) *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
||||
ElfW(Addr) loadbase, undo;
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Bit values for resource limits. SunOS 4 version.
|
||||
Copyright (C) 1994, 1996 Free Software Foundation, Inc.
|
||||
Copyright (C) 1994, 1996, 1997 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
|
||||
@ -49,8 +49,8 @@ enum __rlimit_resource
|
||||
/* Number of open files. */
|
||||
RLIMIT_NOFILE,
|
||||
RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */
|
||||
#defin RLIMIT_NOFILE RLIMIT_NOFILE
|
||||
#defin RLIMIT_OFILE RLIMIT_OFILE
|
||||
#define RLIMIT_NOFILE RLIMIT_NOFILE
|
||||
#define RLIMIT_OFILE RLIMIT_OFILE
|
||||
|
||||
RLIM_NLIMITS,
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user