Patchwork powerpc: Fix bad include of stdint.h in ptrace.h when -D__ASSEMBLY__

login
register
mail settings
Submitter Tony Breeds
Date July 6, 2010, 4:56 a.m.
Message ID <f1cea220d59687dcea67ef98b4bf5e774efcded5.1278392169.git.tony@bakeyournoodle.com>
Download mbox | patch
Permalink /patch/57979/
State Superseded
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Tony Breeds - July 6, 2010, 4:56 a.m.
In commit 3162d92dfb79a0b5fc03380b8819fa5f870ebf1e (powerpc: Extended
ptrace interface) we #included stdint.h even if __ASSEMBLY__ is defined.
This broke building of libc with modern kernel headers.

---
<snip>
../sysdeps/generic/stdint.h: Assembler messages:
../sysdeps/generic/stdint.h:37: Error: Unrecognized opcode: `typedef'
../sysdeps/generic/stdint.h:38: Error: Unrecognized opcode: `typedef'
../sysdeps/generic/stdint.h:39: Error: Unrecognized opcode: `typedef'
<snip>
---

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---
 arch/powerpc/include/asm/ptrace.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Patch

diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 9e2d84c..441179a 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -27,7 +27,9 @@ 
 #ifdef __KERNEL__
 #include <linux/types.h>
 #else
+#ifndef __ASSEMBLY__
 #include <stdint.h>
+#endif /* __ASSEMBLY__ */
 #endif
 
 #ifndef __ASSEMBLY__