From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-5218-listarch-libc-hacker=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 28421 invoked by alias); 28 May 2002 19:30:45 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 28374 invoked from network); 28 May 2002 19:30:38 -0000
Received: from unknown (HELO Cantor.suse.de) (213.95.15.193)
  by sources.redhat.com with SMTP; 28 May 2002 19:30:38 -0000
Received: from Hermes.suse.de (Charybdis.suse.de [213.95.15.201])
	by Cantor.suse.de (Postfix) with ESMTP id BC80C14AB9
	for <libc-hacker@sources.redhat.com>; Tue, 28 May 2002 21:30:37 +0200 (MEST)
X-Authentication-Warning: sykes.suse.de: schwab set sender to schwab@suse.de using -f
To: libc-hacker@sources.redhat.com
Subject: ldconfig broken message
X-Yow: I HAVE to buy a new ``DODGE MISER'' and two dozen JORDACHE
 JEANS because my viewscreen is ``USER-FRIENDLY''!!
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 28 May 2002 12:30:00 -0000
Message-ID: <jeu1os134z.fsf@sykes.suse.de>
User-Agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.2.50 (ia64-suse-linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-SW-Source: 2002-05/txt/msg00039.txt.bz2

This fixes the message from ldconfig when finding an object of the wrong
class.

2002-05-28  Andreas Schwab  <schwab@suse.de>

	* sysdeps/generic/readelflib.c (process_elf_file): Give correct
	message when finding object of wrong class.

--- sysdeps/generic/readelflib.c.~1.5.~	2001-07-16 10:44:09.000000000 +0200
+++ sysdeps/generic/readelflib.c	2002-05-28 13:52:05.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999 and
 		  Jakub Jelinek <jakub@redhat.com>, 1999.
@@ -63,9 +63,9 @@ process_elf_file (const char *file_name,
     {
       if (opt_verbose)
 	{
-	  if (ElfW (CLASS) == ELFCLASS32)
+	  if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
 	    error (0, 0, _("%s is a 32 bit ELF file.\n"), file_name);
-	  else if (ElfW (CLASS) == ELFCLASS64)
+	  else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
 	    error (0, 0, _("%s is a 64 bit ELF file.\n"), file_name);
 	  else
 	    error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."