summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-10-20 15:07:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:38 +0000
commit050d0d8297c9677c803461ddbeef553cdcb00644 (patch)
tree127ee1b84cad823160a08c0e2948433237bc72e6 /meta
parenteddff2b361928e88e3628ebc22a1a0ebb119e01b (diff)
downloadpoky-050d0d8297c9677c803461ddbeef553cdcb00644.tar.gz
nspr: Update to 4.20
RISC-v support now included in this release so drop patch. and refresh patches (From OE-Core rev: 800f4bd6f9fa18ed68f14f5e6e12be3499fb8038) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch25
-rw-r--r--meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch150
-rw-r--r--meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch2
-rw-r--r--meta/recipes-support/nspr/nspr_4.20.bb (renamed from meta/recipes-support/nspr/nspr_4.19.bb)5
4 files changed, 14 insertions, 168 deletions
diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
index 23228067ec..3a04d426a8 100644
--- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
+++ b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
@@ -12,11 +12,11 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
12 nspr/pr/include/md/_linux.h | 14 ++++++++++++++ 12 nspr/pr/include/md/_linux.h | 14 ++++++++++++++
13 2 files changed, 59 insertions(+) 13 2 files changed, 59 insertions(+)
14 14
15diff --git a/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg 15Index: nspr/pr/include/md/_linux.cfg
16index 8cbf0cb..150676b 100644 16===================================================================
17--- a/pr/include/md/_linux.cfg 17--- nspr.orig/pr/include/md/_linux.cfg
18+++ b/pr/include/md/_linux.cfg 18+++ nspr/pr/include/md/_linux.cfg
19@@ -972,6 +972,51 @@ 19@@ -975,6 +975,51 @@
20 #define PR_BYTES_PER_WORD_LOG2 2 20 #define PR_BYTES_PER_WORD_LOG2 2
21 #define PR_BYTES_PER_DWORD_LOG2 3 21 #define PR_BYTES_PER_DWORD_LOG2 3
22 22
@@ -68,10 +68,10 @@ index 8cbf0cb..150676b 100644
68 #elif defined(__or1k__) 68 #elif defined(__or1k__)
69 69
70 #undef IS_LITTLE_ENDIAN 70 #undef IS_LITTLE_ENDIAN
71diff --git a/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h 71Index: nspr/pr/include/md/_linux.h
72index d378db5..18260be 100644 72===================================================================
73--- a/pr/include/md/_linux.h 73--- nspr.orig/pr/include/md/_linux.h
74+++ b/pr/include/md/_linux.h 74+++ nspr/pr/include/md/_linux.h
75@@ -55,6 +55,8 @@ 75@@ -55,6 +55,8 @@
76 #define _PR_SI_ARCHITECTURE "avr32" 76 #define _PR_SI_ARCHITECTURE "avr32"
77 #elif defined(__m32r__) 77 #elif defined(__m32r__)
@@ -80,8 +80,8 @@ index d378db5..18260be 100644
80+#define _PR_SI_ARCHITECTURE "nios2" 80+#define _PR_SI_ARCHITECTURE "nios2"
81 #elif defined(__or1k__) 81 #elif defined(__or1k__)
82 #define _PR_SI_ARCHITECTURE "or1k" 82 #define _PR_SI_ARCHITECTURE "or1k"
83 #else 83 #elif defined(__riscv) && (__riscv_xlen == 32)
84@@ -125,6 +127,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); 84@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
85 #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet 85 #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
86 #endif 86 #endif
87 87
@@ -100,6 +100,3 @@ index d378db5..18260be 100644
100 #if defined(__or1k__) 100 #if defined(__or1k__)
101 #if defined(__GNUC__) 101 #if defined(__GNUC__)
102 /* Use GCC built-in functions */ 102 /* Use GCC built-in functions */
103--
1042.7.0.rc3
105
diff --git a/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch b/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch
deleted file mode 100644
index 47e1475e0e..0000000000
--- a/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch
+++ /dev/null
@@ -1,150 +0,0 @@
1# HG changeset patch
2# User Karsten Merker <merker@debian.org>
3# Date 1523974333 -7200
4# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a
5# Parent 776db96f834cb86e8863052201d55f60a2da91cb
6Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie
7
8Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
9[ Changes by AF:
10 - Rebase on other Yocto patches
11]
12Upstream-Status: Backport [ https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1 ]
13
14diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
15--- a/pr/include/md/_linux.cfg
16+++ b/pr/include/md/_linux.cfg
17@@ -1015,16 +1015,108 @@
18 #define PR_ALIGN_OF_FLOAT 4
19 #define PR_ALIGN_OF_DOUBLE 4
20 #define PR_ALIGN_OF_POINTER 4
21 #define PR_ALIGN_OF_WORD 4
22
23 #define PR_BYTES_PER_WORD_LOG2 2
24 #define PR_BYTES_PER_DWORD_LOG2 3
25
26+#elif defined(__riscv) && (__riscv_xlen == 32)
27+
28+#undef IS_BIG_ENDIAN
29+#define IS_LITTLE_ENDIAN 1
30+#undef IS_64
31+
32+#define PR_BYTES_PER_BYTE 1
33+#define PR_BYTES_PER_SHORT 2
34+#define PR_BYTES_PER_INT 4
35+#define PR_BYTES_PER_INT64 8
36+#define PR_BYTES_PER_LONG 4
37+#define PR_BYTES_PER_FLOAT 4
38+#define PR_BYTES_PER_DOUBLE 8
39+#define PR_BYTES_PER_WORD 4
40+#define PR_BYTES_PER_DWORD 8
41+
42+#define PR_BITS_PER_BYTE 8
43+#define PR_BITS_PER_SHORT 16
44+#define PR_BITS_PER_INT 32
45+#define PR_BITS_PER_INT64 64
46+#define PR_BITS_PER_LONG 32
47+#define PR_BITS_PER_FLOAT 32
48+#define PR_BITS_PER_DOUBLE 64
49+#define PR_BITS_PER_WORD 32
50+
51+#define PR_BITS_PER_BYTE_LOG2 3
52+#define PR_BITS_PER_SHORT_LOG2 4
53+#define PR_BITS_PER_INT_LOG2 5
54+#define PR_BITS_PER_INT64_LOG2 6
55+#define PR_BITS_PER_LONG_LOG2 5
56+#define PR_BITS_PER_FLOAT_LOG2 5
57+#define PR_BITS_PER_DOUBLE_LOG2 6
58+#define PR_BITS_PER_WORD_LOG2 5
59+
60+#define PR_ALIGN_OF_SHORT 2
61+#define PR_ALIGN_OF_INT 4
62+#define PR_ALIGN_OF_LONG 4
63+#define PR_ALIGN_OF_INT64 8
64+#define PR_ALIGN_OF_FLOAT 4
65+#define PR_ALIGN_OF_DOUBLE 8
66+#define PR_ALIGN_OF_POINTER 4
67+#define PR_ALIGN_OF_WORD 4
68+
69+#define PR_BYTES_PER_WORD_LOG2 2
70+#define PR_BYTES_PER_DWORD_LOG2 3
71+
72+#elif defined(__riscv) && (__riscv_xlen == 64)
73+
74+#undef IS_BIG_ENDIAN
75+#define IS_LITTLE_ENDIAN 1
76+#define IS_64
77+
78+#define PR_BYTES_PER_BYTE 1
79+#define PR_BYTES_PER_SHORT 2
80+#define PR_BYTES_PER_INT 4
81+#define PR_BYTES_PER_INT64 8
82+#define PR_BYTES_PER_LONG 8
83+#define PR_BYTES_PER_FLOAT 4
84+#define PR_BYTES_PER_DOUBLE 8
85+#define PR_BYTES_PER_WORD 8
86+#define PR_BYTES_PER_DWORD 8
87+
88+#define PR_BITS_PER_BYTE 8
89+#define PR_BITS_PER_SHORT 16
90+#define PR_BITS_PER_INT 32
91+#define PR_BITS_PER_INT64 64
92+#define PR_BITS_PER_LONG 64
93+#define PR_BITS_PER_FLOAT 32
94+#define PR_BITS_PER_DOUBLE 64
95+#define PR_BITS_PER_WORD 64
96+
97+#define PR_BITS_PER_BYTE_LOG2 3
98+#define PR_BITS_PER_SHORT_LOG2 4
99+#define PR_BITS_PER_INT_LOG2 5
100+#define PR_BITS_PER_INT64_LOG2 6
101+#define PR_BITS_PER_LONG_LOG2 6
102+#define PR_BITS_PER_FLOAT_LOG2 5
103+#define PR_BITS_PER_DOUBLE_LOG2 6
104+#define PR_BITS_PER_WORD_LOG2 6
105+
106+#define PR_ALIGN_OF_SHORT 2
107+#define PR_ALIGN_OF_INT 4
108+#define PR_ALIGN_OF_LONG 8
109+#define PR_ALIGN_OF_INT64 8
110+#define PR_ALIGN_OF_FLOAT 4
111+#define PR_ALIGN_OF_DOUBLE 8
112+#define PR_ALIGN_OF_POINTER 8
113+#define PR_ALIGN_OF_WORD 8
114+
115+#define PR_BYTES_PER_WORD_LOG2 3
116+#define PR_BYTES_PER_DWORD_LOG2 3
117+
118 #else
119
120 #error "Unknown CPU architecture"
121
122 #endif
123
124 #ifndef HAVE_LONG_LONG
125 #define HAVE_LONG_LONG
126diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
127--- a/pr/include/md/_linux.h
128+++ b/pr/include/md/_linux.h
129@@ -54,16 +54,20 @@
130 #elif defined(__avr32__)
131 #define _PR_SI_ARCHITECTURE "avr32"
132 #elif defined(__m32r__)
133 #define _PR_SI_ARCHITECTURE "m32r"
134 #elif defined(__nios2__)
135 #define _PR_SI_ARCHITECTURE "nios2"
136 #elif defined(__or1k__)
137 #define _PR_SI_ARCHITECTURE "or1k"
138+#elif defined(__riscv) && (__riscv_xlen == 32)
139+#define _PR_SI_ARCHITECTURE "riscv32"
140+#elif defined(__riscv) && (__riscv_xlen == 64)
141+#define _PR_SI_ARCHITECTURE "riscv64"
142 #else
143 #error "Unknown CPU architecture"
144 #endif
145 #define PR_DLL_SUFFIX ".so"
146
147 #define _PR_VMBASE 0x30000000
148 #define _PR_STACK_VMBASE 0x50000000
149 #define _MD_DEFAULT_STACK_SIZE 65536L
150
diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
index ecc6d31874..7ba59ed644 100644
--- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
+++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
@@ -15,7 +15,7 @@ Index: nspr/pr/tests/Makefile.in
15=================================================================== 15===================================================================
16--- nspr.orig/pr/tests/Makefile.in 16--- nspr.orig/pr/tests/Makefile.in
17+++ nspr/pr/tests/Makefile.in 17+++ nspr/pr/tests/Makefile.in
18@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) 18@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
19 endif # SunOS 19 endif # SunOS
20 20
21 ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) 21 ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
diff --git a/meta/recipes-support/nspr/nspr_4.19.bb b/meta/recipes-support/nspr/nspr_4.20.bb
index 0212be7f40..fe3b4bd2ed 100644
--- a/meta/recipes-support/nspr/nspr_4.19.bb
+++ b/meta/recipes-support/nspr/nspr_4.20.bb
@@ -11,7 +11,6 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
11 file://remove-srcdir-from-configure-in.patch \ 11 file://remove-srcdir-from-configure-in.patch \
12 file://0002-Add-nios2-support.patch \ 12 file://0002-Add-nios2-support.patch \
13 file://0001-md-Fix-build-with-musl.patch \ 13 file://0001-md-Fix-build-with-musl.patch \
14 file://0003-Add-type-definitions-for-the-RISC-V-architecture.patch \
15 file://0004-Add-ARC-support.patch \ 14 file://0004-Add-ARC-support.patch \
16 file://nspr.pc.in \ 15 file://nspr.pc.in \
17" 16"
@@ -24,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
24UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" 23UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
25UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" 24UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
26 25
27SRC_URI[md5sum] = "e1d27282ad6286b69d6b9fd07201d3dd" 26SRC_URI[md5sum] = "1c198c7e73f6b0e2bb9153a644ba246b"
28SRC_URI[sha256sum] = "2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729" 27SRC_URI[sha256sum] = "2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e"
29 28
30CVE_PRODUCT = "netscape_portable_runtime" 29CVE_PRODUCT = "netscape_portable_runtime"
31 30