aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-04-04 06:59:03 +0000
committerRoland McGrath <roland@gnu.org>2006-04-04 06:59:03 +0000
commit9b5e78fe899018a31302094de8f57433b26de963 (patch)
tree2ede81a50c9f65e81bb37d4e9a4936a19f45e780
parentec92fb39c2fad144454af5fa0d43250e1249fc49 (diff)
downloadglibc-9b5e78fe899018a31302094de8f57433b26de963.tar
glibc-9b5e78fe899018a31302094de8f57433b26de963.tar.gz
glibc-9b5e78fe899018a31302094de8f57433b26de963.tar.bz2
glibc-9b5e78fe899018a31302094de8f57433b26de963.zip
* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for <asm/elf.h>
with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H].
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sys/procfs.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b12f5581ef..bd599a1045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03 Andreas Schwab <schwab@suse.de>
+
+ * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for <asm/elf.h>
+ with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H].
+
2006-04-03 Roland McGrath <roland@frob.com>
[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