lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Update.

Browse Source 
* elf/dl-support.c (non_dynamic_init): Don't define DL_FIND_AUXV
	if it is not available.  Instead use it only if it is available.
	* sysdeps/unix/sysv/linux/ldsodefs.h: New file.
This commit is contained in:
Ulrich Drepper
2001-01-05 16:27:04 +00:00
parent c4f6641346
commit 155fd00c74
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-01-05 Ulrich Drepper <drepper@redhat.com> 2001-01-05 Ulrich Drepper <drepper@redhat.com>
* elf/dl-support.c (non_dynamic_init): Don't define DL_FIND_AUXV
if it is not available. Instead use it only if it is available.
* sysdeps/unix/sysv/linux/ldsodefs.h: New file.
* iconv/gconv_simple.c (internal_ics4_loop): Correct test for * iconv/gconv_simple.c (internal_ics4_loop): Correct test for
overflowing output buffer. overflowing output buffer.
(internal_ucs4_loop_unaligned): Likewise. (internal_ucs4_loop_unaligned): Likewise.

11
elf/dl-support.c
View File

@ -107,15 +107,6 @@ int _dl_starting_up = 1;
At this time it is not anymore a problem to modify the tables. */ At this time it is not anymore a problem to modify the tables. */
__libc_lock_define_initialized_recursive (, _dl_load_lock) __libc_lock_define_initialized_recursive (, _dl_load_lock)
#ifndef DL_FIND_AUXV
# define DL_FIND_AUXV(auxp, envp) \
do { \
void **_tmp; \
for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
continue; \
(auxp) = (void *) ++_tmp; \
} while (0)
#endif
extern int _dl_clktck; extern int _dl_clktck;
@ -125,6 +116,7 @@ static void non_dynamic_init (int argc, char **argv, char **envp)
static void static void
non_dynamic_init (int argc, char **argv, char **envp) non_dynamic_init (int argc, char **argv, char **envp)
{ {
#ifdef DL_FIND_AUXV
ElfW(auxv_t) *av; ElfW(auxv_t) *av;
DL_FIND_AUXV (av, envp); DL_FIND_AUXV (av, envp);
@ -142,6 +134,7 @@ non_dynamic_init (int argc, char **argv, char **envp)
_dl_clktck = av->a_un.a_val; _dl_clktck = av->a_un.a_val;
break; break;
} }
#endif
if (!_dl_pagesize) if (!_dl_pagesize)
_dl_pagesize = __getpagesize (); _dl_pagesize = __getpagesize ();

38
sysdeps/unix/sysv/linux/ldsodefs.h Normal file
View File

@ -0,0 +1,38 @@
/* Run-time dynamic linker data structures for loaded ELF shared objects.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#ifndef _LDSODEFS_H
/* Get the real definitions. */
#include_next <ldsodefs.h>
/* Now define our stuff. */
/* Locating the auxiliary vector. */
#ifndef DL_FIND_AUXV
# define DL_FIND_AUXV(auxp, envp) \
do { \
void **_tmp; \
for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
continue; \
(auxp) = (void *) ++_tmp; \
} while (0)
#endif
#endif /* ldsodefs.h */