From 7ad9abc031bf09eb5e9f463c3595547ff13edf47 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 16 Sep 2000 23:00:38 +0000 Subject: [PATCH] Update. 2000-09-16 Jakub Jelinek * sysdeps/ia64/Implies: Reorder ieee754 implies so that ldbl-* comes first. * sysdeps/m68k/Implies: Likewise. * sysdeps/sparc/sparc64/Implies: Likewise. 2000-09-16 Jakub Jelinek * elf/readlib.c (process_file): Don't error for stale .so links either. * elf/dl-load.c (_dl_map_object_from_fd): Add one more __builtin_expect. --- ChangeLog | 14 ++++++++++++++ elf/dl-load.c | 3 ++- elf/readlib.c | 2 +- sysdeps/ia64/Implies | 4 ++-- sysdeps/m68k/Implies | 4 ++-- sysdeps/sparc/sparc64/Implies | 4 ++-- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7626de1..eee0100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ +2000-09-16 Jakub Jelinek + + * sysdeps/ia64/Implies: Reorder ieee754 implies so that ldbl-* comes + first. + * sysdeps/m68k/Implies: Likewise. + * sysdeps/sparc/sparc64/Implies: Likewise. + +2000-09-16 Jakub Jelinek + + * elf/readlib.c (process_file): Don't error for stale .so links either. + 2000-09-16 Ulrich Drepper + * elf/dl-load.c (_dl_map_object_from_fd): Add one more + __builtin_expect. + * include/bits/xopen_lim.h (LONG_BIT): Use LONG_MAX, not INT_MAX. Patch by Thorsten Kukuk . diff --git a/elf/dl-load.c b/elf/dl-load.c index 2911e07..81ac233 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1176,7 +1176,8 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname, /* If this object has DT_SYMBOLIC set modify now its scope. We don't have to do this for the main map. */ - if (l->l_info[DT_SYMBOLIC] && &l->l_searchlist != l->l_scope[0]) + if (__builtin_expect (l->l_info[DT_SYMBOLIC] != NULL, 0) + && &l->l_searchlist != l->l_scope[0]) { /* Create an appropriate searchlist. It contains only this map. diff --git a/elf/readlib.c b/elf/readlib.c index 8e2b91c..5ec5a54 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -87,7 +87,7 @@ process_file (const char *file_name, const char *lib, int *flag, if (file == NULL) { /* No error for stale symlink. */ - if (is_link && strstr (file_name, ".so.") != NULL) + if (is_link && strstr (file_name, ".so") != NULL) return 1; error (0, 0, _("Input file %s not found.\n"), file_name); return 1; diff --git a/sysdeps/ia64/Implies b/sysdeps/ia64/Implies index 972a559..8524257 100644 --- a/sysdeps/ia64/Implies +++ b/sysdeps/ia64/Implies @@ -1,5 +1,5 @@ wordsize-64 # ia64 uses IEEE 754 floating point. -ieee754/flt-32 -ieee754/dbl-64 ieee754/ldbl-96 +ieee754/dbl-64 +ieee754/flt-32 diff --git a/sysdeps/m68k/Implies b/sysdeps/m68k/Implies index b64e753..5c778d4 100644 --- a/sysdeps/m68k/Implies +++ b/sysdeps/m68k/Implies @@ -1,5 +1,5 @@ wordsize-32 # 68k uses IEEE 754 floating point. -ieee754/flt-32 -ieee754/dbl-64 ieee754/ldbl-96 +ieee754/dbl-64 +ieee754/flt-32 diff --git a/sysdeps/sparc/sparc64/Implies b/sysdeps/sparc/sparc64/Implies index 987905b..01bf14e 100644 --- a/sysdeps/sparc/sparc64/Implies +++ b/sysdeps/sparc/sparc64/Implies @@ -1,6 +1,6 @@ wordsize-64 # SPARC uses IEEE 754 floating point. -ieee754/flt-32 -ieee754/dbl-64 ieee754/ldbl-128 +ieee754/dbl-64 +ieee754/flt-32 sparc/sparc64/soft-fp -- 2.7.4