mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
2001-04-10 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * elf/elf.h (AT_DCACHEBSIZE, AT_ICACHEBSIZE, AT_UCACHEBSIZE, AT_IGNOREPPC): New defines. * sysdeps/generic/dl-sysdep.c (_dl_show_auxv): Print them. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_STD_AUXV): Define for newer powerpc kernels. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Use the standard DL_FIND_ARG_COMPONENTS if __ASSUME_STD_AUXV is defined.
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/* Operating system support for run-time dynamic linker. Linux/PPC version.
|
||||
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
|
||||
Copyright (C) 1997, 1998, 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
|
||||
@ -18,33 +18,38 @@
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
|
||||
#include "config.h"
|
||||
#include "kernel-features.h"
|
||||
|
||||
#ifndef __ASSUME_STD_AUXV
|
||||
|
||||
/* The PowerPC's auxiliary argument block gets aligned to a 16-byte
|
||||
boundary. This is history and impossible to change compatibly. */
|
||||
|
||||
#define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
|
||||
do { \
|
||||
char **_tmp; \
|
||||
size_t _test; \
|
||||
(argc) = *(long *) cookie; \
|
||||
(argv) = (char **) cookie + 1; \
|
||||
(envp) = (argv) + (argc) + 1; \
|
||||
for (_tmp = (envp); *_tmp; ++_tmp) \
|
||||
continue; \
|
||||
/* The following '++' is important! */ \
|
||||
++_tmp; \
|
||||
\
|
||||
_test = (size_t)_tmp; \
|
||||
_test = (_test + 0xf) & ~0xf; \
|
||||
/* Under some circumstances, MkLinux (up to at least DR3a5) \
|
||||
omits the padding. To work around this, we make a \
|
||||
basic sanity check of the argument vector. Of \
|
||||
course, this means that in future, the argument \
|
||||
vector will have to be laid out to allow for this \
|
||||
test :-(. */ \
|
||||
if (((ElfW(auxv_t) *)_test)->a_type <= 0x10) \
|
||||
_tmp = (char **)_test; \
|
||||
(auxp) = (ElfW(auxv_t) *) _tmp; \
|
||||
#define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
|
||||
do { \
|
||||
char **_tmp; \
|
||||
size_t _test; \
|
||||
(argc) = *(long int *) cookie; \
|
||||
(argv) = (char **) cookie + 1; \
|
||||
(envp) = (argv) + (argc) + 1; \
|
||||
for (_tmp = (envp); *_tmp; ++_tmp) \
|
||||
continue; \
|
||||
/* The following '++' is important! */ \
|
||||
++_tmp; \
|
||||
\
|
||||
_test = (size_t)_tmp; \
|
||||
_test = (_test + 0xf) & ~0xf; \
|
||||
/* Under some circumstances, MkLinux (up to at least DR3a5) \
|
||||
omits the padding. To work around this, we make a \
|
||||
basic sanity check of the argument vector. Of \
|
||||
course, this means that in future, the argument \
|
||||
vector will have to be laid out to allow for this \
|
||||
test :-(. */ \
|
||||
if (((ElfW(auxv_t) *)_test)->a_type <= 0x10) \
|
||||
_tmp = (char **)_test; \
|
||||
(auxp) = (ElfW(auxv_t) *) _tmp; \
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/dl-sysdep.c>
|
||||
|
Reference in New Issue
Block a user