From: Andreas Jaeger Date: Tue, 17 Apr 2012 05:59:37 +0000 (+0200) Subject: Avoid warnings about redefinition X-Git-Tag: upstream/2.20~3636^2~194 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c325f0f22675e987c60a2e1c6419ffad3ed6c6ec;p=platform%2Fupstream%2Flinaro-glibc.git Avoid warnings about redefinition * sysdeps/unix/sysv/linux/arm/ldsodefs.h: Undefine MORE_ELF_HEADER_DATA to avoid warnings about redefinition. --- diff --git a/ChangeLog.arm b/ChangeLog.arm index 491cc92..f16e691 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,8 @@ +2012-04-16 Andreas Jaeger + + * sysdeps/unix/sysv/linux/arm/ldsodefs.h: Undefine + MORE_ELF_HEADER_DATA to avoid warnings about redefinition. + 2012-03-28 Joseph Myers * sysdeps/unix/sysv/linux/arm/bits/mman.h (MAP_STACK): Define. diff --git a/sysdeps/unix/sysv/linux/arm/ldsodefs.h 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. The GNU C Library is free software; you can redistribute it and/or @@ -23,6 +23,7 @@ #undef VALID_ELF_HEADER #undef VALID_ELF_OSABI +#undef MORE_ELF_HEADER_DATA #ifdef __ARM_EABI__ #define EXTRA_OSABI ELFOSABI_ARM_AEABI