Gentoo Archives: gentoo-commits

From: "Jory Pratt (anarchy)" <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/nspr/files: nspr-4.9.1-x32_v0.2.patch nspr-4.9.1-x32_v0.1.patch
Date: Wed, 01 Aug 2012 00:49:37
Message-Id: 20120801004927.9FF0F2004C@flycatcher.gentoo.org
1 anarchy 12/08/01 00:49:27
2
3 Added: nspr-4.9.1-x32_v0.2.patch
4 Removed: nspr-4.9.1-x32_v0.1.patch
5 Log:
6 Version bump, remove stale x32 build
7
8 (Portage version: 2.1.11.9/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch?rev=1.1&content-type=text/plain
15
16 Index: nspr-4.9.1-x32_v0.2.patch
17 ===================================================================
18 # HG changeset patch
19 # Parent 6b1ef31834235cde5153f91a7443b29398b541d9
20 # User Jory A. Pratt <anarchy@g.o>
21 Add initial support for x32 abi
22
23 diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
24 --- a/mozilla/nsprpub/pr/include/md/_linux.cfg
25 +++ b/mozilla/nsprpub/pr/include/md/_linux.cfg
26 @@ -207,16 +207,63 @@
27 #define PR_ALIGN_OF_POINTER 8
28 #define PR_ALIGN_OF_WORD 8
29
30 #define PR_BYTES_PER_WORD_LOG2 3
31 #define PR_BYTES_PER_DWORD_LOG2 3
32
33 #elif defined(__x86_64__)
34
35 +#ifdef __ILP32__
36 +
37 +#define IS_LITTLE_ENDIAN 1
38 +#undef IS_BIG_ENDIAN
39 +
40 +#define PR_BYTES_PER_BYTE 1
41 +#define PR_BYTES_PER_SHORT 2
42 +#define PR_BYTES_PER_INT 4
43 +#define PR_BYTES_PER_INT64 8
44 +#define PR_BYTES_PER_LONG 4
45 +#define PR_BYTES_PER_FLOAT 4
46 +#define PR_BYTES_PER_DOUBLE 8
47 +#define PR_BYTES_PER_WORD 4
48 +#define PR_BYTES_PER_DWORD 8
49 +
50 +#define PR_BITS_PER_BYTE 8
51 +#define PR_BITS_PER_SHORT 16
52 +#define PR_BITS_PER_INT 32
53 +#define PR_BITS_PER_INT64 64
54 +#define PR_BITS_PER_LONG 32
55 +#define PR_BITS_PER_FLOAT 32
56 +#define PR_BITS_PER_DOUBLE 64
57 +#define PR_BITS_PER_WORD 32
58 +
59 +#define PR_BITS_PER_BYTE_LOG2 3
60 +#define PR_BITS_PER_SHORT_LOG2 4
61 +#define PR_BITS_PER_INT_LOG2 5
62 +#define PR_BITS_PER_INT64_LOG2 6
63 +#define PR_BITS_PER_LONG_LOG2 5
64 +#define PR_BITS_PER_FLOAT_LOG2 5
65 +#define PR_BITS_PER_DOUBLE_LOG2 6
66 +#define PR_BITS_PER_WORD_LOG2 5
67 +
68 +#define PR_ALIGN_OF_SHORT 2
69 +#define PR_ALIGN_OF_INT 4
70 +#define PR_ALIGN_OF_LONG 4
71 +#define PR_ALIGN_OF_INT64 4
72 +#define PR_ALIGN_OF_FLOAT 4
73 +#define PR_ALIGN_OF_DOUBLE 4
74 +#define PR_ALIGN_OF_POINTER 4
75 +#define PR_ALIGN_OF_WORD 4
76 +
77 +#define PR_BYTES_PER_WORD_LOG2 2
78 +#define PR_BYTES_PER_DWORD_LOG2 3
79 +
80 +#else
81 +
82 #define IS_LITTLE_ENDIAN 1
83 #undef IS_BIG_ENDIAN
84 #define IS_64
85
86 #define PR_BYTES_PER_BYTE 1
87 #define PR_BYTES_PER_SHORT 2
88 #define PR_BYTES_PER_INT 4
89 #define PR_BYTES_PER_INT64 8
90 @@ -251,16 +298,18 @@
91 #define PR_ALIGN_OF_FLOAT 4
92 #define PR_ALIGN_OF_DOUBLE 8
93 #define PR_ALIGN_OF_POINTER 8
94 #define PR_ALIGN_OF_WORD 8
95
96 #define PR_BYTES_PER_WORD_LOG2 3
97 #define PR_BYTES_PER_DWORD_LOG2 3
98
99 +#endif
100 +
101 #elif defined(__mc68000__)
102
103 #undef IS_LITTLE_ENDIAN
104 #define IS_BIG_ENDIAN 1
105
106 #define PR_BYTES_PER_BYTE 1
107 #define PR_BYTES_PER_SHORT 2
108 #define PR_BYTES_PER_INT 4