diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-03-31 17:23:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-03-31 17:23:57 +0000 |
| commit | eae077f1c3de8572b3616b29cd53e72ca054b280 (patch) | |
| tree | 9bf840af92e910b83914716b4172f41291670871 /sysdeps/powerpc/powerpc32/dl-machine.c | |
| parent | 6ce38a95a4c8318df75cf91fbd90101601b3fa7f (diff) | |
Updated to fedora-glibc-20070331T1609cvs/fedora-glibc-2_5_90-20
Diffstat (limited to 'sysdeps/powerpc/powerpc32/dl-machine.c')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c index fc460993b1..fc2ce7c1d9 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/sysdeps/powerpc/powerpc32/dl-machine.c @@ -26,10 +26,9 @@ #include <dl-machine.h> #include <stdio-common/_itoa.h> -/* The value __cache_line_size is defined in memset.S and is initialised +/* The value __cache_line_size is defined in dl-sysdep.c and is initialised by _dl_sysdep_start via DL_PLATFORM_INIT. */ -extern int __cache_line_size; -weak_extern (__cache_line_size) +extern int __cache_line_size attribute_hidden; /* Because ld.so is now versioned, these functions can be in their own file; no relocations need to be done to call them. @@ -318,15 +317,9 @@ __elf_machine_runtime_setup (struct link_map *map, int lazy, int profile) /* Default minimum 4 words per cache line. */ int line_size_words = 4; - /* Don't try this until ld.so has relocated itself! */ - int *line_size_ptr = &__cache_line_size; - if (lazy && line_size_ptr != NULL) - { - /* Verify that __cache_line_size is defined and set. */ - if (*line_size_ptr != 0) - /* Convert bytes to words. */ - line_size_words = *line_size_ptr / 4; - } + if (lazy && __cache_line_size != 0) + /* Convert bytes to words. */ + line_size_words = __cache_line_size / 4; size_modified = lazy ? rel_offset_words : 6; for (i = 0; i < size_modified; i += line_size_words) |