summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nspr
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-02-10 01:04:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:49 +0000
commitfd7dd07e66a16e26b6b01af38c5be26244103d2c (patch)
tree1854b85b951088545716ca615394a85055636cc6 /meta/recipes-support/nspr
parent954dc4524dda2241feadaddd0831f25c82b15f76 (diff)
downloadpoky-fd7dd07e66a16e26b6b01af38c5be26244103d2c.tar.gz
nspr: Add nios2 support
Add small patch to support nios2 in NSPR. (From OE-Core rev: 4d05f82844782a0fb053b9d2c7ad53e85efdf163) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nspr')
-rw-r--r--meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch105
-rw-r--r--meta/recipes-support/nspr/nspr_4.11.bb1
2 files changed, 106 insertions, 0 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
new file mode 100644
index 0000000000..23228067ec
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
@@ -0,0 +1,105 @@
1From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Sat, 30 Jan 2016 07:18:02 +0100
4Subject: [PATCH] Add nios2 support
5
6Add support for the nios2 CPU.
7
8Signed-off-by: Marek Vasut <marex@denx.de>
9Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
10---
11 nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++
12 nspr/pr/include/md/_linux.h | 14 ++++++++++++++
13 2 files changed, 59 insertions(+)
14
15diff --git a/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg
16index 8cbf0cb..150676b 100644
17--- a/pr/include/md/_linux.cfg
18+++ b/pr/include/md/_linux.cfg
19@@ -972,6 +972,51 @@
20 #define PR_BYTES_PER_WORD_LOG2 2
21 #define PR_BYTES_PER_DWORD_LOG2 3
22
23+#elif defined(__nios2__)
24+
25+#define IS_LITTLE_ENDIAN 1
26+#undef IS_BIG_ENDIAN
27+
28+#define PR_BYTES_PER_BYTE 1
29+#define PR_BYTES_PER_SHORT 2
30+#define PR_BYTES_PER_INT 4
31+#define PR_BYTES_PER_INT64 8
32+#define PR_BYTES_PER_LONG 4
33+#define PR_BYTES_PER_FLOAT 4
34+#define PR_BYTES_PER_DOUBLE 8
35+#define PR_BYTES_PER_WORD 4
36+#define PR_BYTES_PER_DWORD 8
37+
38+#define PR_BITS_PER_BYTE 8
39+#define PR_BITS_PER_SHORT 16
40+#define PR_BITS_PER_INT 32
41+#define PR_BITS_PER_INT64 64
42+#define PR_BITS_PER_LONG 32
43+#define PR_BITS_PER_FLOAT 32
44+#define PR_BITS_PER_DOUBLE 64
45+#define PR_BITS_PER_WORD 32
46+
47+#define PR_BITS_PER_BYTE_LOG2 3
48+#define PR_BITS_PER_SHORT_LOG2 4
49+#define PR_BITS_PER_INT_LOG2 5
50+#define PR_BITS_PER_INT64_LOG2 6
51+#define PR_BITS_PER_LONG_LOG2 5
52+#define PR_BITS_PER_FLOAT_LOG2 5
53+#define PR_BITS_PER_DOUBLE_LOG2 6
54+#define PR_BITS_PER_WORD_LOG2 5
55+
56+#define PR_ALIGN_OF_SHORT 2
57+#define PR_ALIGN_OF_INT 4
58+#define PR_ALIGN_OF_LONG 4
59+#define PR_ALIGN_OF_INT64 4
60+#define PR_ALIGN_OF_FLOAT 4
61+#define PR_ALIGN_OF_DOUBLE 4
62+#define PR_ALIGN_OF_POINTER 4
63+#define PR_ALIGN_OF_WORD 4
64+
65+#define PR_BYTES_PER_WORD_LOG2 2
66+#define PR_BYTES_PER_DWORD_LOG2 3
67+
68 #elif defined(__or1k__)
69
70 #undef IS_LITTLE_ENDIAN
71diff --git a/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h
72index d378db5..18260be 100644
73--- a/pr/include/md/_linux.h
74+++ b/pr/include/md/_linux.h
75@@ -55,6 +55,8 @@
76 #define _PR_SI_ARCHITECTURE "avr32"
77 #elif defined(__m32r__)
78 #define _PR_SI_ARCHITECTURE "m32r"
79+#elif defined(__nios2__)
80+#define _PR_SI_ARCHITECTURE "nios2"
81 #elif defined(__or1k__)
82 #define _PR_SI_ARCHITECTURE "or1k"
83 #else
84@@ -125,6 +127,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
85 #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
86 #endif
87
88+#if defined(__nios2__)
89+#if defined(__GNUC__)
90+/* Use GCC built-in functions */
91+#define _PR_HAVE_ATOMIC_OPS
92+#define _MD_INIT_ATOMIC()
93+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
94+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
95+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
96+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
97+#endif
98+#endif
99+
100 #if defined(__or1k__)
101 #if defined(__GNUC__)
102 /* Use GCC built-in functions */
103--
1042.7.0.rc3
105
diff --git a/meta/recipes-support/nspr/nspr_4.11.bb b/meta/recipes-support/nspr/nspr_4.11.bb
index 3dabcb6345..a38e20cb2c 100644
--- a/meta/recipes-support/nspr/nspr_4.11.bb
+++ b/meta/recipes-support/nspr/nspr_4.11.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
9 file://remove-rpath-from-tests.patch \ 9 file://remove-rpath-from-tests.patch \
10 file://fix-build-on-x86_64.patch \ 10 file://fix-build-on-x86_64.patch \
11 file://remove-srcdir-from-configure-in.patch \ 11 file://remove-srcdir-from-configure-in.patch \
12 file://0002-Add-nios2-support.patch \
12 " 13 "
13 14
14SRC_URI += "file://nspr.pc.in" 15SRC_URI += "file://nspr.pc.in"