Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/3.4: 00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch
Date: Tue, 10 Jul 2012 08:02:24
Message-Id: 20120710080215.2919620063@flycatcher.gentoo.org
1 vapier 12/07/10 08:02:15
2
3 Added:
4 00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch
5 Log:
6 fix alpha fpu.h #417441
7
8 Revision Changes Path
9 1.1 src/patchsets/gentoo-headers/3.4/00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.4/00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.4/00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch?rev=1.1&content-type=text/plain
13
14 Index: 00_all_0009-alpha-fix-fpu.h-usage-in-userspace.patch
15 ===================================================================
16 https://bugs.gentoo.org/417441
17
18 From 8d6969cd0eda561cc880d44d6e728c2e0bd91965 Mon Sep 17 00:00:00 2001
19 From: Mike Frysinger <vapier@g.o>
20 Date: Fri, 25 May 2012 01:37:11 -0400
21 Subject: [PATCH] alpha: fix fpu.h usage in userspace
22
23 After commit ec2212088c42ff7d1362629ec26dda4f3e8bdad3, the fpu.h header
24 which we install for userland started depending on special_insns.h which
25 is not installed. However, fpu.h only uses that for __KERNEL__ code, so
26 protect the inclusion the same way to avoid build breakage in glibc:
27 /usr/include/asm/fpu.h:4:31: fatal error: asm/special_insns.h: No such file or directory
28
29 Cc: stable@×××××××××××.org
30 Reported-by: Matt Turner <mattst88@g.o>
31 Signed-off-by: Mike Frysinger <vapier@g.o>
32 ---
33 arch/alpha/include/asm/fpu.h | 2 ++
34 1 file changed, 2 insertions(+)
35
36 diff --git a/arch/alpha/include/asm/fpu.h b/arch/alpha/include/asm/fpu.h
37 index db00f78..e477bcd 100644
38 --- a/arch/alpha/include/asm/fpu.h
39 +++ b/arch/alpha/include/asm/fpu.h
40 @@ -1,7 +1,9 @@
41 #ifndef __ASM_ALPHA_FPU_H
42 #define __ASM_ALPHA_FPU_H
43
44 +#ifdef __KERNEL__
45 #include <asm/special_insns.h>
46 +#endif
47
48 /*
49 * Alpha floating-point control register defines:
50 --
51 1.7.9.7