linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
To: Andrey Volkov <avolkov@varma-el.com>
Cc: linuxppc-dev list <Linuxppc-dev@ozlabs.org>,
	LKML <linux-kernel@vger.kernel.org>,
	David Gibson <dwg@au1.ibm.com>
Subject: Re: Fix [e]glibc build process
Date: Sat, 08 May 2010 22:21:09 -0500	[thread overview]
Message-ID: <1273375269.5312.4.camel@norville.austin.ibm.com> (raw)
In-Reply-To: <4BE5C203.6060509@varma-el.com>

On Sat, 2010-05-08 at 23:56 +0400, Andrey Volkov wrote:
> This patch fix [e]glibc build process destruction (more precisely _assembler_
> is die when try to compile getcontext.S since stdint.h coldn't be assembled)
> intruduced by patch:
> 
> commit: 162d92dfb79a0b5fc03380b8819fa5f870ebf1e
> Date: Mon, 8 Feb 2010 11:51:05 +0000 (11:51 +0000)
> from: Dave Kleikamp
> 
> Signed-off-by: Andrey Volkov <avolkov@varma-el.com>
> 
> ---
> 
>  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..025912b 100644
> --- a/arch/powerpc/include/asm/ptrace.h
> +++ b/arch/powerpc/include/asm/ptrace.h
> @@ -27,8 +27,10 @@
>  #ifdef __KERNEL__
>  #include <linux/types.h>
>  #else
> +#ifndef __ASSEMBLY__
>  #include <stdint.h>
>  #endif
> +#endif
> 
>  #ifndef __ASSEMBLY__

Assembly code won't need to pull in linux/types.h either, so this would
be simpler:

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>

diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 9e2d84c..0ed710e 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -24,14 +24,14 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#ifndef __ASSEMBLY__
+
 #ifdef __KERNEL__
 #include <linux/types.h>
 #else
 #include <stdint.h>
 #endif
 
-#ifndef __ASSEMBLY__
-
 struct pt_regs {
 	unsigned long gpr[32];
 	unsigned long nip;

-- 
Dave Kleikamp
IBM Linux Technology Center

  reply	other threads:[~2010-05-09  3:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-08 19:56 Fix [e]glibc build process Andrey Volkov
2010-05-09  3:21 ` Dave Kleikamp [this message]
2010-05-09  6:59   ` [PATCH] powerpc: fix userspace build of ptrace.h Sam Ravnborg
2010-05-09  7:27     ` Benjamin Herrenschmidt
2010-05-10 14:10       ` Dave Kleikamp
2010-05-09 13:37   ` Fix [e]glibc build process Andrey Volkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1273375269.5312.4.camel@norville.austin.ibm.com \
    --to=shaggy@linux.vnet.ibm.com \
    --cc=Linuxppc-dev@ozlabs.org \
    --cc=avolkov@varma-el.com \
    --cc=dwg@au1.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).