From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14928 invoked by alias); 16 Apr 2012 10:17:57 -0000 Received: (qmail 14916 invoked by uid 22791); 16 Apr 2012 10:17:55 -0000 X-SWARE-Spam-Status: No, hits=-5.4 required=5.0 tests=AWL,BAYES_00,FRT_OFFER2,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Apr 2012 10:17:43 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id D84BB89994 for ; Mon, 16 Apr 2012 12:17:41 +0200 (CEST) From: Andreas Jaeger To: libc-ports@sourceware.org Subject: Fix arm warning Date: Mon, 16 Apr 2012 10:17:00 -0000 User-Agent: KMail/1.13.7 (Linux/3.4.0-rc2-1-desktop; KDE/4.7.2; x86_64; ; ) MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Message-Id: <201204161217.41536.aj@suse.com> Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-04/txt/msg00072.txt.bz2 Building for ARM I got lots of these warnings: ../glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/ldsodefs.h:41:0: warning:=20 "MORE_ELF_HEADER_DATA" redefined [enabled by default] ../sysdeps/unix/sysv/linux/ldsodefs.h:64:0: note: this is the location of=20 the previous definition This is still in git head. Let's undef it like we undef the other=20 variables. Ok to commit? Andreas 2012-04-16 Andreas Jaeger * sysdeps/unix/sysv/linux/arm/ldsodefs.h: Undefine MORE_ELF_HEADER_DATA to avoid warnings about redefinition. diff --git a/sysdeps/unix/sysv/linux/arm/ldsodefs.h=20 b/sysdeps/unix/sysv/linux/arm/ldsodefs.h index 839dc18..6966f8a 100644 --- a/sysdeps/unix/sysv/linux/arm/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/arm/ldsodefs.h @@ -1,5 +1,5 @@ /* Run-time dynamic linker data structures for loaded ELF shared objects. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -23,6 +23,7 @@ =20 #undef VALID_ELF_HEADER #undef VALID_ELF_OSABI +#undef MORE_ELF_HEADER_DATA =20 #ifdef __ARM_EABI__ #define EXTRA_OSABI ELFOSABI_ARM_AEABI --=20 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn,Jennifer Guild,Felix Imend=F6rffer,HRB16746 (AG N=FCrnberg) GPG fingerprint =3D 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126