* Fix [e]glibc build process @ 2010-05-08 19:56 Andrey Volkov 2010-05-09 3:21 ` Dave Kleikamp 0 siblings, 1 reply; 6+ messages in thread From: Andrey Volkov @ 2010-05-08 19:56 UTC (permalink / raw) To: Dave Kleikamp, Benjamin Herrenschmidt Cc: linuxppc-dev list, LKML, David Gibson 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__ ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: Fix [e]glibc build process 2010-05-08 19:56 Fix [e]glibc build process Andrey Volkov @ 2010-05-09 3:21 ` Dave Kleikamp 2010-05-09 6:59 ` [PATCH] powerpc: fix userspace build of ptrace.h Sam Ravnborg 2010-05-09 13:37 ` Fix [e]glibc build process Andrey Volkov 0 siblings, 2 replies; 6+ messages in thread From: Dave Kleikamp @ 2010-05-09 3:21 UTC (permalink / raw) To: Andrey Volkov; +Cc: linuxppc-dev list, LKML, David Gibson 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] powerpc: fix userspace build of ptrace.h 2010-05-09 3:21 ` Dave Kleikamp @ 2010-05-09 6:59 ` Sam Ravnborg 2010-05-09 7:27 ` Benjamin Herrenschmidt 2010-05-09 13:37 ` Fix [e]glibc build process Andrey Volkov 1 sibling, 1 reply; 6+ messages in thread From: Sam Ravnborg @ 2010-05-09 6:59 UTC (permalink / raw) To: Dave Kleikamp; +Cc: linuxppc-dev list, Andrey Volkov, LKML, David Gibson >From ff056c080d2b0b93bac07ad71125fee701919f5e Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam@ravnborg.org> Date: Sun, 9 May 2010 08:52:31 +0200 Subject: [PATCH] powerpc: fix userspace build of ptrace.h Build of ptrace.h failed for assembly because it pulls in stdint.h. Use exportable types (__u32, __u64) to avoid the dependency on stdint.h. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Andrey Volkov <avolkov@varma-el.com> Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- A better fix is to remove the use of stdint like the following patch does. Note - I have not even build tested this patch! Sam arch/powerpc/include/asm/ptrace.h | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index 9e2d84c..77bbc68 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -24,11 +24,7 @@ * 2 of the License, or (at your option) any later version. */ -#ifdef __KERNEL__ #include <linux/types.h> -#else -#include <stdint.h> -#endif #ifndef __ASSEMBLY__ @@ -300,13 +296,13 @@ do { \ #ifndef __ASSEMBLY__ struct ppc_debug_info { - uint32_t version; /* Only version 1 exists to date */ - uint32_t num_instruction_bps; - uint32_t num_data_bps; - uint32_t num_condition_regs; - uint32_t data_bp_alignment; - uint32_t sizeof_condition; /* size of the DVC register */ - uint64_t features; + __u32 version; /* Only version 1 exists to date */ + __u32 num_instruction_bps; + __u32 num_data_bps; + __u32 num_condition_regs; + __u32 data_bp_alignment; + __u32 sizeof_condition; /* size of the DVC register */ + __u64 features; }; #endif /* __ASSEMBLY__ */ @@ -322,13 +318,13 @@ struct ppc_debug_info { #ifndef __ASSEMBLY__ struct ppc_hw_breakpoint { - uint32_t version; /* currently, version must be 1 */ - uint32_t trigger_type; /* only some combinations allowed */ - uint32_t addr_mode; /* address match mode */ - uint32_t condition_mode; /* break/watchpoint condition flags */ - uint64_t addr; /* break/watchpoint address */ - uint64_t addr2; /* range end or mask */ - uint64_t condition_value; /* contents of the DVC register */ + __u32 version; /* currently, version must be 1 */ + __u32 trigger_type; /* only some combinations allowed */ + __u32 addr_mode; /* address match mode */ + __u32 condition_mode; /* break/watchpoint condition flags */ + __u64 addr; /* break/watchpoint address */ + __u64 addr2; /* range end or mask */ + __u64 condition_value; /* contents of the DVC register */ }; #endif /* __ASSEMBLY__ */ -- 1.6.0.6 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc: fix userspace build of ptrace.h 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 0 siblings, 1 reply; 6+ messages in thread From: Benjamin Herrenschmidt @ 2010-05-09 7:27 UTC (permalink / raw) To: Sam Ravnborg Cc: linuxppc-dev list, Andrey Volkov, Dave Kleikamp, LKML, David Gibson On Sun, 2010-05-09 at 08:59 +0200, Sam Ravnborg wrote: > >From ff056c080d2b0b93bac07ad71125fee701919f5e Mon Sep 17 00:00:00 2001 > From: Sam Ravnborg <sam@ravnborg.org> > Date: Sun, 9 May 2010 08:52:31 +0200 > Subject: [PATCH] powerpc: fix userspace build of ptrace.h > > Build of ptrace.h failed for assembly because it > pulls in stdint.h. > Use exportable types (__u32, __u64) to avoid the dependency > on stdint.h. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Andrey Volkov <avolkov@varma-el.com> > Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > > A better fix is to remove the use of stdint like the following patch does. > Note - I have not even build tested this patch! Ack, thanks, I'll test and apply. Cheers, Ben. > Sam > > arch/powerpc/include/asm/ptrace.h | 32 ++++++++++++++------------------ > 1 files changed, 14 insertions(+), 18 deletions(-) > > diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h > index 9e2d84c..77bbc68 100644 > --- a/arch/powerpc/include/asm/ptrace.h > +++ b/arch/powerpc/include/asm/ptrace.h > @@ -24,11 +24,7 @@ > * 2 of the License, or (at your option) any later version. > */ > > -#ifdef __KERNEL__ > #include <linux/types.h> > -#else > -#include <stdint.h> > -#endif > > #ifndef __ASSEMBLY__ > > @@ -300,13 +296,13 @@ do { \ > #ifndef __ASSEMBLY__ > > struct ppc_debug_info { > - uint32_t version; /* Only version 1 exists to date */ > - uint32_t num_instruction_bps; > - uint32_t num_data_bps; > - uint32_t num_condition_regs; > - uint32_t data_bp_alignment; > - uint32_t sizeof_condition; /* size of the DVC register */ > - uint64_t features; > + __u32 version; /* Only version 1 exists to date */ > + __u32 num_instruction_bps; > + __u32 num_data_bps; > + __u32 num_condition_regs; > + __u32 data_bp_alignment; > + __u32 sizeof_condition; /* size of the DVC register */ > + __u64 features; > }; > > #endif /* __ASSEMBLY__ */ > @@ -322,13 +318,13 @@ struct ppc_debug_info { > #ifndef __ASSEMBLY__ > > struct ppc_hw_breakpoint { > - uint32_t version; /* currently, version must be 1 */ > - uint32_t trigger_type; /* only some combinations allowed */ > - uint32_t addr_mode; /* address match mode */ > - uint32_t condition_mode; /* break/watchpoint condition flags */ > - uint64_t addr; /* break/watchpoint address */ > - uint64_t addr2; /* range end or mask */ > - uint64_t condition_value; /* contents of the DVC register */ > + __u32 version; /* currently, version must be 1 */ > + __u32 trigger_type; /* only some combinations allowed */ > + __u32 addr_mode; /* address match mode */ > + __u32 condition_mode; /* break/watchpoint condition flags */ > + __u64 addr; /* break/watchpoint address */ > + __u64 addr2; /* range end or mask */ > + __u64 condition_value; /* contents of the DVC register */ > }; > > #endif /* __ASSEMBLY__ */ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc: fix userspace build of ptrace.h 2010-05-09 7:27 ` Benjamin Herrenschmidt @ 2010-05-10 14:10 ` Dave Kleikamp 0 siblings, 0 replies; 6+ messages in thread From: Dave Kleikamp @ 2010-05-10 14:10 UTC (permalink / raw) To: Benjamin Herrenschmidt Cc: linuxppc-dev list, Andrey Volkov, Sam Ravnborg, LKML, David Gibson On Sun, 2010-05-09 at 17:27 +1000, Benjamin Herrenschmidt wrote: > On Sun, 2010-05-09 at 08:59 +0200, Sam Ravnborg wrote: > > >From ff056c080d2b0b93bac07ad71125fee701919f5e Mon Sep 17 00:00:00 2001 > > From: Sam Ravnborg <sam@ravnborg.org> > > Date: Sun, 9 May 2010 08:52:31 +0200 > > Subject: [PATCH] powerpc: fix userspace build of ptrace.h > > > > Build of ptrace.h failed for assembly because it > > pulls in stdint.h. > > Use exportable types (__u32, __u64) to avoid the dependency > > on stdint.h. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Andrey Volkov <avolkov@varma-el.com> > > Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com> > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > --- > > > > A better fix is to remove the use of stdint like the following patch does. > > Note - I have not even build tested this patch! > > Ack, thanks, I'll test and apply. Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> -- Dave Kleikamp IBM Linux Technology Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Fix [e]glibc build process 2010-05-09 3:21 ` Dave Kleikamp 2010-05-09 6:59 ` [PATCH] powerpc: fix userspace build of ptrace.h Sam Ravnborg @ 2010-05-09 13:37 ` Andrey Volkov 1 sibling, 0 replies; 6+ messages in thread From: Andrey Volkov @ 2010-05-09 13:37 UTC (permalink / raw) To: Dave Kleikamp; +Cc: linuxppc-dev list, Sam Ravnborg, LKML, David Gibson Dave Kleikamp wrote: > 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: > Questionable assertion. "linux/types.h" contain (indirectly) not only types definitions, but some useful, for assembly, defines too. So patch, which Sam Ravnborg offered, is better for me (if it will work certainly ;)). -- Andrey Volkov > 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; > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-10 14:10 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-05-08 19:56 Fix [e]glibc build process Andrey Volkov 2010-05-09 3:21 ` Dave Kleikamp 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
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).