linux-kernel - Re: Fix [e]glibc build process

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sat, 08 May 2010 22:21:09 -0500
From:	Dave Kleikamp <shaggy@...ux.vnet.ibm.com>
To:	Andrey Volkov <avolkov@...ma-el.com>
Cc:	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	LKML <linux-kernel@...r.kernel.org>,
	David Gibson <dwg@....ibm.com>,
	linuxppc-dev list <Linuxppc-dev@...abs.org>
Subject: Re: Fix [e]glibc build process

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@...ma-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@...ux.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/