From patchwork Tue Jul 6 04:56:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Breeds X-Patchwork-Id: 57979 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id E59EA100835 for ; Tue, 6 Jul 2010 14:56:25 +1000 (EST) Received: by ozlabs.org (Postfix, from userid 1026) id 7967AB6F04; Tue, 6 Jul 2010 14:56:19 +1000 (EST) To: , Dave Kleikamp Message-Id: From: Tony Breeds Subject: [PATCH] powerpc: Fix bad include of stdint.h in ptrace.h when -D__ASSEMBLY__ Date: Tue, 6 Jul 2010 14:56:19 +1000 (EST) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org 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. --- ../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' --- Signed-off-by: Tony Breeds --- arch/powerpc/include/asm/ptrace.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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 #else +#ifndef __ASSEMBLY__ #include +#endif /* __ASSEMBLY__ */ #endif #ifndef __ASSEMBLY__