From f8c2ed0f17f6c63dac9e562aff10c46093f8a102 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 4 Dec 2019 12:25:46 +0100 Subject: package/libnspr: bump to version 4.24 All patches have been upstreamed so remove them. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnspr/0001-nios2.patch | 76 ---------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 package/libnspr/0001-nios2.patch (limited to 'package/libnspr/0001-nios2.patch') diff --git a/package/libnspr/0001-nios2.patch b/package/libnspr/0001-nios2.patch deleted file mode 100644 index 52fbbfdddd..0000000000 --- a/package/libnspr/0001-nios2.patch +++ /dev/null @@ -1,76 +0,0 @@ -Bug 1578360 - Add Nios-II support - -[Gustavo: update for nspr 4.10.9] -Signed-off-by: Ezequiel Garcia -[Fabrice: update for nspr 4.20] -Signed-off-by: Fabrice Fontaine -[Giulio: update for nspr 4.22] -Signed-off-by: Giulio Benetti - -diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.cfg ---- a/nspr/pr/include/md/_linux.cfg Mon Aug 19 16:17:52 2019 +0200 -+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:25:11 2019 +0200 -@@ -1157,6 +1157,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.h ---- a/nspr/pr/include/md/_linux.h Mon Aug 19 16:17:52 2019 +0200 -+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:25:11 2019 +0200 -@@ -63,6 +63,8 @@ - #define _PR_SI_ARCHITECTURE "riscv64" - #elif defined(__arc__) - #define _PR_SI_ARCHITECTURE "arc" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #else - #error "Unknown CPU architecture" - #endif -- cgit v1.2.1