<div><br></div><div><br><div class="gmail_quote"><div dir="ltr">On Mon, Oct 22, 2018 at 3:06 PM Armin Kuster <<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">RISC-v support now included in this release so drop patch.<br>
and refresh patches</blockquote><div dir="auto"><br></div><div dir="auto">That’s right thanks for update </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
Signed-off-by: Armin Kuster <<a href="mailto:akuster@mvista.com" target="_blank">akuster@mvista.com</a>><br>
---<br>
.../nspr/nspr/0002-Add-nios2-support.patch | 25 ++--<br>
...e-definitions-for-the-RISC-V-architecture.patch | 150 ---------------------<br>
.../nspr/nspr/remove-rpath-from-tests.patch | 2 +-<br>
.../nspr/{<a href="http://nspr_4.19.bb" rel="noreferrer" target="_blank">nspr_4.19.bb</a> => <a href="http://nspr_4.20.bb" rel="noreferrer" target="_blank">nspr_4.20.bb</a>} | 5 +-<br>
4 files changed, 14 insertions(+), 168 deletions(-)<br>
delete mode 100644 meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch<br>
rename meta/recipes-support/nspr/{<a href="http://nspr_4.19.bb" rel="noreferrer" target="_blank">nspr_4.19.bb</a> => <a href="http://nspr_4.20.bb" rel="noreferrer" target="_blank">nspr_4.20.bb</a>} (95%)<br>
<br>
diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch<br>
index 2322806..3a04d42 100644<br>
--- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch<br>
+++ b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch<br>
@@ -12,11 +12,11 @@ Upstream-Status: Submitted [ <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=124442" rel="noreferrer" target="_blank">https://bugzilla.mozilla.org/show_bug.cgi?id=124442</a><br>
nspr/pr/include/md/_linux.h | 14 ++++++++++++++<br>
2 files changed, 59 insertions(+)<br>
<br>
-diff --git a/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg<br>
-index 8cbf0cb..150676b 100644<br>
---- a/pr/include/md/_linux.cfg<br>
-+++ b/pr/include/md/_linux.cfg<br>
-@@ -972,6 +972,51 @@<br>
+Index: nspr/pr/include/md/_linux.cfg<br>
+===================================================================<br>
+--- nspr.orig/pr/include/md/_linux.cfg<br>
++++ nspr/pr/include/md/_linux.cfg<br>
+@@ -975,6 +975,51 @@<br>
#define PR_BYTES_PER_WORD_LOG2 2<br>
#define PR_BYTES_PER_DWORD_LOG2 3<br>
<br>
@@ -68,10 +68,10 @@ index 8cbf0cb..150676b 100644<br>
#elif defined(__or1k__)<br>
<br>
#undef IS_LITTLE_ENDIAN<br>
-diff --git a/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h<br>
-index d378db5..18260be 100644<br>
---- a/pr/include/md/_linux.h<br>
-+++ b/pr/include/md/_linux.h<br>
+Index: nspr/pr/include/md/_linux.h<br>
+===================================================================<br>
+--- nspr.orig/pr/include/md/_linux.h<br>
++++ nspr/pr/include/md/_linux.h<br>
@@ -55,6 +55,8 @@<br>
#define _PR_SI_ARCHITECTURE "avr32"<br>
#elif defined(__m32r__)<br>
@@ -80,8 +80,8 @@ index d378db5..18260be 100644<br>
+#define _PR_SI_ARCHITECTURE "nios2"<br>
#elif defined(__or1k__)<br>
#define _PR_SI_ARCHITECTURE "or1k"<br>
- #else<br>
-@@ -125,6 +127,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);<br>
+ #elif defined(__riscv) && (__riscv_xlen == 32)<br>
+@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn<br>
#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet<br>
#endif<br>
<br>
@@ -100,6 +100,3 @@ index d378db5..18260be 100644<br>
#if defined(__or1k__)<br>
#if defined(__GNUC__)<br>
/* Use GCC built-in functions */<br>
--- <br>
-2.7.0.rc3<br>
-<br>
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<br>
deleted file mode 100644<br>
index 47e1475..0000000<br>
--- a/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch<br>
+++ /dev/null<br>
@@ -1,150 +0,0 @@<br>
-# HG changeset patch<br>
-# User Karsten Merker <<a href="mailto:merker@debian.org" target="_blank">merker@debian.org</a>><br>
-# Date 1523974333 -7200<br>
-# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a<br>
-# Parent 776db96f834cb86e8863052201d55f60a2da91cb<br>
-Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie<br>
-<br>
-Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@wdc.com" target="_blank">alistair.francis@wdc.com</a>><br>
-[ Changes by AF:<br>
- - Rebase on other Yocto patches<br>
-]<br>
-Upstream-Status: Backport [ <a href="https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1" rel="noreferrer" target="_blank">https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1</a> ]<br>
-<br>
-diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg<br>
---- a/pr/include/md/_linux.cfg<br>
-+++ b/pr/include/md/_linux.cfg<br>
-@@ -1015,16 +1015,108 @@<br>
- #define PR_ALIGN_OF_FLOAT 4<br>
- #define PR_ALIGN_OF_DOUBLE 4<br>
- #define PR_ALIGN_OF_POINTER 4<br>
- #define PR_ALIGN_OF_WORD 4<br>
- <br>
- #define PR_BYTES_PER_WORD_LOG2 2<br>
- #define PR_BYTES_PER_DWORD_LOG2 3<br>
- <br>
-+#elif defined(__riscv) && (__riscv_xlen == 32)<br>
-+<br>
-+#undef IS_BIG_ENDIAN<br>
-+#define IS_LITTLE_ENDIAN 1<br>
-+#undef IS_64<br>
-+<br>
-+#define PR_BYTES_PER_BYTE 1<br>
-+#define PR_BYTES_PER_SHORT 2<br>
-+#define PR_BYTES_PER_INT 4<br>
-+#define PR_BYTES_PER_INT64 8<br>
-+#define PR_BYTES_PER_LONG 4<br>
-+#define PR_BYTES_PER_FLOAT 4<br>
-+#define PR_BYTES_PER_DOUBLE 8<br>
-+#define PR_BYTES_PER_WORD 4<br>
-+#define PR_BYTES_PER_DWORD 8<br>
-+<br>
-+#define PR_BITS_PER_BYTE 8<br>
-+#define PR_BITS_PER_SHORT 16<br>
-+#define PR_BITS_PER_INT 32<br>
-+#define PR_BITS_PER_INT64 64<br>
-+#define PR_BITS_PER_LONG 32<br>
-+#define PR_BITS_PER_FLOAT 32<br>
-+#define PR_BITS_PER_DOUBLE 64<br>
-+#define PR_BITS_PER_WORD 32<br>
-+<br>
-+#define PR_BITS_PER_BYTE_LOG2 3<br>
-+#define PR_BITS_PER_SHORT_LOG2 4<br>
-+#define PR_BITS_PER_INT_LOG2 5<br>
-+#define PR_BITS_PER_INT64_LOG2 6<br>
-+#define PR_BITS_PER_LONG_LOG2 5<br>
-+#define PR_BITS_PER_FLOAT_LOG2 5<br>
-+#define PR_BITS_PER_DOUBLE_LOG2 6<br>
-+#define PR_BITS_PER_WORD_LOG2 5<br>
-+<br>
-+#define PR_ALIGN_OF_SHORT 2<br>
-+#define PR_ALIGN_OF_INT 4<br>
-+#define PR_ALIGN_OF_LONG 4<br>
-+#define PR_ALIGN_OF_INT64 8<br>
-+#define PR_ALIGN_OF_FLOAT 4<br>
-+#define PR_ALIGN_OF_DOUBLE 8<br>
-+#define PR_ALIGN_OF_POINTER 4<br>
-+#define PR_ALIGN_OF_WORD 4<br>
-+<br>
-+#define PR_BYTES_PER_WORD_LOG2 2<br>
-+#define PR_BYTES_PER_DWORD_LOG2 3<br>
-+<br>
-+#elif defined(__riscv) && (__riscv_xlen == 64)<br>
-+<br>
-+#undef IS_BIG_ENDIAN<br>
-+#define IS_LITTLE_ENDIAN 1<br>
-+#define IS_64<br>
-+<br>
-+#define PR_BYTES_PER_BYTE 1<br>
-+#define PR_BYTES_PER_SHORT 2<br>
-+#define PR_BYTES_PER_INT 4<br>
-+#define PR_BYTES_PER_INT64 8<br>
-+#define PR_BYTES_PER_LONG 8<br>
-+#define PR_BYTES_PER_FLOAT 4<br>
-+#define PR_BYTES_PER_DOUBLE 8<br>
-+#define PR_BYTES_PER_WORD 8<br>
-+#define PR_BYTES_PER_DWORD 8<br>
-+<br>
-+#define PR_BITS_PER_BYTE 8<br>
-+#define PR_BITS_PER_SHORT 16<br>
-+#define PR_BITS_PER_INT 32<br>
-+#define PR_BITS_PER_INT64 64<br>
-+#define PR_BITS_PER_LONG 64<br>
-+#define PR_BITS_PER_FLOAT 32<br>
-+#define PR_BITS_PER_DOUBLE 64<br>
-+#define PR_BITS_PER_WORD 64<br>
-+<br>
-+#define PR_BITS_PER_BYTE_LOG2 3<br>
-+#define PR_BITS_PER_SHORT_LOG2 4<br>
-+#define PR_BITS_PER_INT_LOG2 5<br>
-+#define PR_BITS_PER_INT64_LOG2 6<br>
-+#define PR_BITS_PER_LONG_LOG2 6<br>
-+#define PR_BITS_PER_FLOAT_LOG2 5<br>
-+#define PR_BITS_PER_DOUBLE_LOG2 6<br>
-+#define PR_BITS_PER_WORD_LOG2 6<br>
-+<br>
-+#define PR_ALIGN_OF_SHORT 2<br>
-+#define PR_ALIGN_OF_INT 4<br>
-+#define PR_ALIGN_OF_LONG 8<br>
-+#define PR_ALIGN_OF_INT64 8<br>
-+#define PR_ALIGN_OF_FLOAT 4<br>
-+#define PR_ALIGN_OF_DOUBLE 8<br>
-+#define PR_ALIGN_OF_POINTER 8<br>
-+#define PR_ALIGN_OF_WORD 8<br>
-+<br>
-+#define PR_BYTES_PER_WORD_LOG2 3<br>
-+#define PR_BYTES_PER_DWORD_LOG2 3<br>
-+<br>
- #else<br>
- <br>
- #error "Unknown CPU architecture"<br>
- <br>
- #endif<br>
- <br>
- #ifndef HAVE_LONG_LONG<br>
- #define HAVE_LONG_LONG<br>
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h<br>
---- a/pr/include/md/_linux.h<br>
-+++ b/pr/include/md/_linux.h<br>
-@@ -54,16 +54,20 @@<br>
- #elif defined(__avr32__)<br>
- #define _PR_SI_ARCHITECTURE "avr32"<br>
- #elif defined(__m32r__)<br>
- #define _PR_SI_ARCHITECTURE "m32r"<br>
- #elif defined(__nios2__)<br>
- #define _PR_SI_ARCHITECTURE "nios2"<br>
- #elif defined(__or1k__)<br>
- #define _PR_SI_ARCHITECTURE "or1k"<br>
-+#elif defined(__riscv) && (__riscv_xlen == 32)<br>
-+#define _PR_SI_ARCHITECTURE "riscv32"<br>
-+#elif defined(__riscv) && (__riscv_xlen == 64)<br>
-+#define _PR_SI_ARCHITECTURE "riscv64"<br>
- #else<br>
- #error "Unknown CPU architecture"<br>
- #endif<br>
- #define PR_DLL_SUFFIX ".so"<br>
- <br>
- #define _PR_VMBASE 0x30000000<br>
- #define _PR_STACK_VMBASE 0x50000000<br>
- #define _MD_DEFAULT_STACK_SIZE 65536L<br>
-<br>
diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch<br>
index ecc6d31..7ba59ed 100644<br>
--- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch<br>
+++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch<br>
@@ -15,7 +15,7 @@ Index: nspr/pr/tests/Makefile.in<br>
===================================================================<br>
--- nspr.orig/pr/tests/Makefile.in<br>
+++ nspr/pr/tests/Makefile.in<br>
-@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS)<br>
+@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)<br>
endif # SunOS<br>
<br>
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))<br>
diff --git a/meta/recipes-support/nspr/<a href="http://nspr_4.19.bb" rel="noreferrer" target="_blank">nspr_4.19.bb</a> b/meta/recipes-support/nspr/<a href="http://nspr_4.20.bb" rel="noreferrer" target="_blank">nspr_4.20.bb</a><br>
similarity index 95%<br>
rename from meta/recipes-support/nspr/<a href="http://nspr_4.19.bb" rel="noreferrer" target="_blank">nspr_4.19.bb</a><br>
rename to meta/recipes-support/nspr/<a href="http://nspr_4.20.bb" rel="noreferrer" target="_blank">nspr_4.20.bb</a><br>
index 0212be7..fe3b4bd 100644<br>
--- a/meta/recipes-support/nspr/<a href="http://nspr_4.19.bb" rel="noreferrer" target="_blank">nspr_4.19.bb</a><br>
+++ b/meta/recipes-support/nspr/<a href="http://nspr_4.20.bb" rel="noreferrer" target="_blank">nspr_4.20.bb</a><br>
@@ -11,7 +11,6 @@ SRC_URI = "<a href="http://ftp.mozilla.org/pub/nspr/releases/v$%7BPV%7D/src/nspr-$%7BPV%7D.tar.gz" rel="noreferrer" target="_blank">http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz</a><br>
file://remove-srcdir-from-configure-in.patch \<br>
file://0002-Add-nios2-support.patch \<br>
file://0001-md-Fix-build-with-musl.patch \<br>
- file://0003-Add-type-definitions-for-the-RISC-V-architecture.patch \<br>
file://0004-Add-ARC-support.patch \<br>
file://<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a> \<br>
"<br>
@@ -24,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE<br>
UPSTREAM_CHECK_URI = "<a href="http://ftp.mozilla.org/pub/nspr/releases/" rel="noreferrer" target="_blank">http://ftp.mozilla.org/pub/nspr/releases/</a>"<br>
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"<br>
<br>
-SRC_URI[md5sum] = "e1d27282ad6286b69d6b9fd07201d3dd"<br>
-SRC_URI[sha256sum] = "2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729"<br>
+SRC_URI[md5sum] = "1c198c7e73f6b0e2bb9153a644ba246b"<br>
+SRC_URI[sha256sum] = "2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e"<br>
<br>
CVE_PRODUCT = "netscape_portable_runtime"<br>
<br>
-- <br>
2.7.4<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>