From 8cbdd648bdb05a3f275265664fe5b89c6b88fc41 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 12 Mar 2001 09:41:17 +0000 Subject: Update. * sysdeps/unix/sysv/linux/s390/sysdep.h (_LINUX_S390_SYSDEP_H): Fix typo. Patch by Martin Schwidefsky . --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/i386/readelflib.c | 6 +++--- sysdeps/unix/sysv/linux/s390/sysdep.h | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91087a5e04..964320481d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-03-12 Andreas Jaeger + * sysdeps/unix/sysv/linux/s390/sysdep.h (_LINUX_S390_SYSDEP_H): + Fix typo. Patch by Martin Schwidefsky . + * sysdeps/s390/bits/string.h: Protect __STRING_INLINE against redefinition. diff --git a/sysdeps/unix/sysv/linux/i386/readelflib.c b/sysdeps/unix/sysv/linux/i386/readelflib.c index 53a6908e81..f8868bb083 100644 --- a/sysdeps/unix/sysv/linux/i386/readelflib.c +++ b/sysdeps/unix/sysv/linux/i386/readelflib.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger , 1999 and Jakub Jelinek , 2000. @@ -42,7 +42,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag, switch (elf_header->e_machine) { case EM_IA_64: - case EM_X8664: + case EM_X86_64: break; default: error (0, 0, _("%s is for unknown machine %d.\n"), @@ -59,7 +59,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag, case EM_IA_64: *flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6; break; - case EM_X8664: + case EM_X86_64: *flag = FLAG_X8664_LIB64|FLAG_ELF_LIBC6; break; } diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h index be58e7f94d..099ce3d176 100644 --- a/sysdeps/unix/sysv/linux/s390/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _LINUX_S390_SYSDEP_H -#define _LINUX_S390_SYSEDP_H +#define _LINUX_S390_SYSDEP_H #include #include -- cgit 1.4.1