diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-04-04 01:07:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-04-04 01:07:05 +0000 |
| commit | 1e084487ab208baf7ba690536bedaec0eafd44d4 (patch) | |
| tree | 6532565fbfd42000650ab69b1e9537197461b94a /sysdeps/powerpc | |
| parent | abca9f7f5893adee7d0eac2ca8962b9c5321e0fe (diff) | |
Update.
* sysdeps/powerpc/elf/libc-start.c: no need for a separate
function for __aux_init_cache.
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/elf/libc-start.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/sysdeps/powerpc/elf/libc-start.c b/sysdeps/powerpc/elf/libc-start.c index 1e1d68297e..eed3e06c8a 100644 --- a/sysdeps/powerpc/elf/libc-start.c +++ b/sysdeps/powerpc/elf/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998,2000,2001,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1998,2000,2001,2002,2003,2004 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 @@ -25,28 +25,6 @@ extern int __cache_line_size; weak_extern (__cache_line_size) -/* Scan the Aux Vector for the "Data Cache Block Size" entry. If found - verify that the static extern __cache_line_size is defined by checking - for not NULL. If it is defined then assign the cache block size - value to __cache_line_size. */ -static inline void -__aux_init_cache (ElfW(auxv_t) *av) -{ - for (; av->a_type != AT_NULL; ++av) - switch (av->a_type) - { - case AT_DCACHEBSIZE: - { - int *cls = & __cache_line_size; - if (cls != NULL) - *cls = av->a_un.a_val; - } - break; - } -} -/* This is used in sysdeps/generic/libc-start.c. */ -#define AUX_VECTOR_INIT __aux_init_cache - /* The main work is done in the generic function. */ #define LIBC_START_MAIN generic_start_main #define LIBC_START_DISABLE_INLINE @@ -104,7 +82,17 @@ BP_SYM (__libc_start_main) (int argc, char *__unbounded *__unbounded ubp_av, } /* Initialize the __cache_line_size variable from the aux vector. */ - __aux_init_cache (auxvec); + for (ElfW(auxv_t) *av = auxvec; av->a_type != AT_NULL; ++av) + switch (av->a_type) + { + case AT_DCACHEBSIZE: + { + int *cls = & __cache_line_size; + if (cls != NULL) + *cls = av->a_un.a_val; + } + break; + } return generic_start_main (stinfo->main, argc, ubp_av, auxvec, stinfo->init, stinfo->fini, rtld_fini, |