aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-03-19 22:08:34 +0000
committerUlrich Drepper <drepper@redhat.com>2001-03-19 22:08:34 +0000
commit96c0d65dc3644467a0521cc4084274be073fb5e0 (patch)
tree9c63d1083995f555605dc8b8139c0f12aae9ca9a
parent3c504879d9411bb9c57cc69774e1bc0c15a3ea7f (diff)
downloadglibc-96c0d65dc3644467a0521cc4084274be073fb5e0.zip
glibc-96c0d65dc3644467a0521cc4084274be073fb5e0.tar.gz
glibc-96c0d65dc3644467a0521cc4084274be073fb5e0.tar.bz2
Update.
* elf/cache.c: Mark and have translated a few more messages. 2001-03-19 Martin Schwidefsky <schwidefsky@de.ibm.com> * elf/cache.c: Add case for FLAG_S390_LIB64. * sysdeps/generic/ldconfig.h: Add define for FLAG_S390_LIB64. * sysdeps/unix/sysv/linux/s390/ldconfig.h: New file. * sysdeps/unix/sysv/linux/s390/readelflib.c: New file. 2001-03-19 Ulrich Drepper <drepper@redhat.com>
-rw-r--r--ChangeLog11
-rw-r--r--elf/cache.c12
-rw-r--r--sysdeps/generic/ldconfig.h1
-rw-r--r--sysdeps/unix/sysv/linux/s390/ldconfig.h26
-rw-r--r--sysdeps/unix/sysv/linux/s390/readelflib.c60
5 files changed, 106 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 935e710..18e8725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2001-03-19 Ulrich Drepper <drepper@redhat.com>
+ * elf/cache.c: Mark and have translated a few more messages.
+
+2001-03-19 Martin Schwidefsky <schwidefsky@de.ibm.com>
+
+ * elf/cache.c: Add case for FLAG_S390_LIB64.
+ * sysdeps/generic/ldconfig.h: Add define for FLAG_S390_LIB64.
+ * sysdeps/unix/sysv/linux/s390/ldconfig.h: New file.
+ * sysdeps/unix/sysv/linux/s390/readelflib.c: New file.
+
+2001-03-19 Ulrich Drepper <drepper@redhat.com>
+
* string/Makefile (tests): Add tst-strxfrm.
* string/tst-strxfrm.c: New file. Based on a test case by Paul Eggert.
* string/Depend: New file.
diff --git a/elf/cache.c b/elf/cache.c
index 19237bb..d95f93c 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -66,7 +66,7 @@ print_entry (const char *lib, int flag, unsigned int osversion,
fputs (flag_descr[flag & FLAG_TYPE_MASK], stdout);
break;
default:
- fputs ("unknown", stdout);
+ fputs (_("unknown"), stdout);
break;
}
switch (flag & FLAG_REQUIRED_MASK)
@@ -79,6 +79,10 @@ print_entry (const char *lib, int flag, unsigned int osversion,
case FLAG_IA64_LIB64:
fputs (",IA-64", stdout);
#endif
+#if defined __s390__ || defined __s390x__
+ case FLAG_S390_LIB64:
+ fputs(",64bit", stdout);
+#endif
case 0:
break;
default:
@@ -94,12 +98,12 @@ print_entry (const char *lib, int flag, unsigned int osversion,
[0] = "Linux",
[1] = "Hurd",
[2] = "Solaris",
- [3] = "Unknown OS"
+ [3] = N_("Unknown OS")
};
unsigned int os = osversion >> 24;
- printf (", OS ABI: %s %d.%d.%d",
- abi_tag_os[os > 3 ? 3 : os],
+ printf (_(", OS ABI: %s %d.%d.%d"),
+ _(abi_tag_os[os > 3 ? 3 : os]),
(osversion >> 16) & 0xff,
(osversion >> 8) & 0xff,
osversion & 0xff);
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index 0575f48..2787251 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -30,6 +30,7 @@
#define FLAG_SPARC_LIB64 0x0100
#define FLAG_IA64_LIB64 0x0200
#define FLAG_X8664_LIB64 0x0300
+#define FLAG_S390_LIB64 0x0400
/* Declared in cache.c. */
extern void print_cache (const char *cache_name);
diff --git a/sysdeps/unix/sysv/linux/s390/ldconfig.h b/sysdeps/unix/sysv/linux/s390/ldconfig.h
new file mode 100644
index 0000000..4a9b64d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/ldconfig.h
@@ -0,0 +1,26 @@
+/* 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. */
+
+#include <sysdeps/generic/ldconfig.h>
+
+#define SYSDEP_KNOWN_INTERPRETER_NAMES \
+ { "/lib/ld.so.1", FLAG_ELF_LIBC6 },
+ { "/lib/ld64.so.1", FLAG_ELF_LIBC6 },
+#define SYSDEP_KNOWN_LIBRARY_NAMES \
+ { "libc.so.6", FLAG_ELF_LIBC6 }, \
+ { "libm.so.6", FLAG_ELF_LIBC6 },
diff --git a/sysdeps/unix/sysv/linux/s390/readelflib.c b/sysdeps/unix/sysv/linux/s390/readelflib.c
new file mode 100644
index 0000000..4661aaa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/readelflib.c
@@ -0,0 +1,60 @@
+/* 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. */
+
+
+int process_elf32_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname,
+ void *file_contents, size_t file_length);
+int process_elf64_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname,
+ void *file_contents, size_t file_length);
+
+/* Returns 0 if everything is ok, != 0 in case of error. */
+int
+process_elf_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname, void *file_contents,
+ size_t file_length)
+{
+ ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
+ int ret;
+
+ if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
+ return process_elf32_file (file_name, lib, flag, osversion, soname,
+ file_contents, file_length);
+ else
+ {
+ ret = process_elf64_file (file_name, lib, flag, osversion, soname,
+ file_contents, file_length);
+ /* S/390 64bit libraries are always libc.so.6+. */
+ if (!ret)
+ *flag = FLAG_S390_LIB64|FLAG_ELF_LIBC6;
+ return ret;
+ }
+}
+
+#undef __ELF_NATIVE_CLASS
+#undef process_elf_file
+#define process_elf_file process_elf32_file
+#define __ELF_NATIVE_CLASS 32
+#include "sysdeps/generic/readelflib.c"
+
+#undef __ELF_NATIVE_CLASS
+#undef process_elf_file
+#define process_elf_file process_elf64_file
+#define __ELF_NATIVE_CLASS 64
+#include "sysdeps/generic/readelflib.c"