[Buildroot] [PATCH 1/1] package/binutils: fix build error due to architecture name is incomplete

[Buildroot] [PATCH 1/1] package/binutils: fix build error due to architecture name is incomplete

[Nylon Chen]

Fixes
  http://autobuild.buildroot.net/results/128/12803a705586e82fdfb49013da2eb3b9879ccd45/

Signed-off-by: Che-Wei Chuang <cnoize@andestech.com>
Signed-off-by: Greentime Hu <greentime@andestech.com>
Signed-off-by: Nylon Chen <nylon7@andestech.com>
---
 Makefile                   | 1 +
 arch/Config.in.nds32       | 2 +-
 package/binutils/Config.in | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 522c0b0606..86e444da98 100644
--- a/Makefile
+++ b/Makefile
@@ -439,6 +439,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/arceb/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64.*/arm64/ \
+	-e s/nds32.*/nds32/ \
 	-e s/or1k/openrisc/ \
 	-e s/parisc64/parisc/ \
 	-e s/powerpc64.*/powerpc/ \
diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32
index 9c5db20e6f..f268883662 100644
--- a/arch/Config.in.nds32
+++ b/arch/Config.in.nds32
@@ -1,5 +1,5 @@
 config BR2_ARCH
-	default "nds32"
+	default "nds32le"
 
 config BR2_GCC_TARGET_ARCH
 	default "v3"
diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index 2bf7929ac8..e17a8ec65a 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_BINUTILS
 	bool "binutils"
-	depends on !BR2_nios2 && !BR2_nds32
+	depends on !BR2_nios2
 	depends on BR2_USE_WCHAR
 	help
 	  Install binutils on the target
@@ -21,5 +21,5 @@ config BR2_PACKAGE_BINUTILS_TARGET
 endif
 
 comment "binutils needs a toolchain w/ wchar"
-	depends on !BR2_nios2 && !BR2_nds32
+	depends on !BR2_nios2
 	depends on !BR2_USE_WCHAR
-- 
2.18.0

[Buildroot] [PATCH 1/1] package/libnspr:add nds32 support patches

[Nylon Chen]

libnspr 4.20 didn't support nds32 architecture lead to build error

Fixes:
  http://autobuild.buildroot.net/results/9380435440c977eeaf98a1ffa80f411f07f62482/
Signed-off-by: Nylon Chen <nylon7@andestech.com>
---
 package/libnspr/0003-nds32.patch | 75 ++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 package/libnspr/0003-nds32.patch

diff --git a/package/libnspr/0003-nds32.patch b/package/libnspr/0003-nds32.patch
new file mode 100644
index 0000000000..dbcfa24e25
--- /dev/null
+++ b/package/libnspr/0003-nds32.patch
@@ -0,0 +1,75 @@
+Add nds32 support
+
+[Nylon: update for nspr 4.20]
+Signed-off-by:Nylon Chen <nylon7@andestech.com>
+
+Index: b/nspr/pr/include/md/_linux.cfg
+===================================================================
+--- a/nspr/pr/include/md/_linux.cfg
++++ b/nspr/pr/include/md/_linux.cfg
+@@ -1207,6 +1207,51 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+
++#elif defined(__nds32__)
++
++#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"
+
+Index: b/nspr/pr/include/md/_linux.h
+===================================================================
+--- a/nspr/pr/include/md/_linux.h
++++ b/nspr/pr/include/md/_linux.h
+@@ -65,6 +65,8 @@
+ #define _PR_SI_ARCHITECTURE "microblaze"
+ #elif defined(__nios2__)
+ #define _PR_SI_ARCHITECTURE "nios2"
++#elif defined(__nds32__)
++#define _PR_SI_ARCHITECTURE "nds32"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
-- 
2.18.0

[Buildroot] [PATCH 1/1] package/binutils: fix build error due to architecture name is incomplete

[Thomas Petazzoni]

On Wed, 24 Apr 2019 18:44:01 +0800
Nylon Chen <nylon7@andestech.com> wrote:

> Fixes
>   http://autobuild.buildroot.net/results/128/12803a705586e82fdfb49013da2eb3b9879ccd45/
> 
> Signed-off-by: Che-Wei Chuang <cnoize@andestech.com>
> Signed-off-by: Greentime Hu <greentime@andestech.com>
> Signed-off-by: Nylon Chen <nylon7@andestech.com>

Thanks, but the exact same patch was already merged:

  https://git.buildroot.org/buildroot/commit/arch?id=b58a6bf774baf56c3a73a838acb8a5472594ce82

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/libnspr:add nds32 support patches

[Thomas Petazzoni]

On Wed, 24 Apr 2019 18:44:02 +0800
Nylon Chen <nylon7@andestech.com> wrote:

> libnspr 4.20 didn't support nds32 architecture lead to build error
> 
> Fixes:
>   http://autobuild.buildroot.net/results/9380435440c977eeaf98a1ffa80f411f07f62482/
> Signed-off-by: Nylon Chen <nylon7@andestech.com>
> ---
>  package/libnspr/0003-nds32.patch | 75 ++++++++++++++++++++++++++++++++
>  1 file changed, 75 insertions(+)
>  create mode 100644 package/libnspr/0003-nds32.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com