From 9b5e78fe899018a31302094de8f57433b26de963 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 4 Apr 2006 06:59:03 +0000 Subject: * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H]. --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/powerpc/sys/procfs.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b12f5581ef..bd599a1045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-03 Andreas Schwab + + * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for + with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H]. + 2006-04-03 Roland McGrath [BZ #2507] diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h index d2d5972411..577689f18d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h +++ b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h @@ -35,7 +35,7 @@ __BEGIN_DECLS /* These definitions are normally provided by ucontext.h via asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define them here. */ -#ifndef __PPC64_ELF_H +#if !defined __PPC64_ELF_H && !defined _ASM_POWERPC_ELF_H #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ #define ELF_NFPREG 33 /* includes fpscr */ #if __WORDSIZE == 32 -- cgit v1.2.3