Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/boost/files: boost-1.55.0-context-x32.patch
Date: Sat, 30 Nov 2013 20:32:30
Message-Id: 20131130203219.999F92004B@flycatcher.gentoo.org
1 vapier 13/11/30 20:32:19
2
3 Added: boost-1.55.0-context-x32.patch
4 Log:
5 Fix x32 builds.
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
8
9 Revision Changes Path
10 1.1 dev-libs/boost/files/boost-1.55.0-context-x32.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/files/boost-1.55.0-context-x32.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/files/boost-1.55.0-context-x32.patch?rev=1.1&content-type=text/plain
14
15 Index: boost-1.55.0-context-x32.patch
16 ===================================================================
17 https://svn.boost.org/trac/boost/ticket/9445
18
19 hack to fix x32 builds
20
21 --- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
22 +++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
23 @@ -31,6 +31,10 @@
24 * *
25 * *****************************************************************/
26
27 +#ifdef __x86_64__
28 +#include "jump_x86_64_sysv_elf_gas.S"
29 +#else
30 +
31 .text
32 .globl jump_fcontext
33 .align 2
34 @@ -73,3 +77,5 @@ jump_fcontext:
35
36 /* Mark that we don't need executable stack. */
37 .section .note.GNU-stack,"",%progbits
38 +
39 +#endif
40 --- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
41 +++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
42 @@ -31,6 +31,10 @@
43 * *
44 * *****************************************************************/
45
46 +#ifdef __x86_64__
47 +#include "make_x86_64_sysv_elf_gas.S"
48 +#else
49 +
50 .text
51 .globl make_fcontext
52 .align 2
53 @@ -78,3 +82,5 @@ finish:
54
55 /* Mark that we don't need executable stack. */
56 .section .note.GNU-stack,"",%progbits
57 +
58 +#endif