Skip to contentSkip to conversation

libnss: Enable for MIPS64 n32 platforms

PATCH Superseded Vicente Olivert Riera 2 participants 3 messages May 22, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 libnss: Enable for MIPS64 n32 platforms

After talking with upstream we concluded that MIPS64 n32 is treated as a 32-bit architecture by libnss because it has 32-bit pointers, so USE_64=1 should not be set in that case.

Upstream bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=1010730

WRT:
http://git.buildroot.net/buildroot/commit/?id=73e6ae0fe6a69f88183ae33401f2314088b5f799

---
 package/libnss/Config.in |    2 --
 package/libnss/libnss.mk |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
package/libnss/Config.in +0 -2
index 9a1668c..690f928 100644
@@ -6,7 +6,6 @@ config BR2_PACKAGE_LIBNSS
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
-	depends on !BR2_MIPS_NABI32
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server
@@ -19,4 +18,3 @@ config BR2_PACKAGE_LIBNSS
 comment "libnss needs a toolchain w/ largefile, threads"
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_MIPS_NABI32
package/libnss/libnss.mk +2 -0
index 666df74..058f9de 100644
@@ -30,8 +30,10 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		OS_TEST="$(ARCH)"
 
 ifeq ($(BR2_ARCH_IS_64),y)
+ifeq ($(BR2_MIPS_NABI32),)
 LIBNSS_BUILD_VARS += USE_64=1
 endif
+endif
 
 
 define LIBNSS_BUILD_CMDS
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 libnss: Enable for MIPS64 n32 platforms

Dear Vicente Olivert Riera,

package/libnss/libnss.mk LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \ · line 36

Quoted 5 lines · Vicente Olivert Riera

ifeq ($(BR2_ARCH_IS_64),y)

package/libnss/libnss.mk +2 -0
+ifeq ($(BR2_MIPS_NABI32),)
 LIBNSS_BUILD_VARS += USE_64=1
 endif
+endif

I'm sorry to be annoying here, but do you think we could add a comment above this to explain why BR2_MIPS_NABI32 is handled specially here?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 libnss: Enable for MIPS64 n32 platforms

Quoted 4 lines · Thomas Petazzoni

Dear Vicente Olivert Riera,

On Thu, 22 May 2014 11:18:21 +0100, Vicente Olivert Riera wrote:

Quoted 8 lines

package/libnss/libnss.mk LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \ · line 36

Quoted 5 lines
  ifeq ($(BR2_ARCH_IS_64),y)
package/libnss/libnss.mk +2 -0
+ifeq ($(BR2_MIPS_NABI32),)
  LIBNSS_BUILD_VARS += USE_64=1
  endif
+endif

I'm sorry to be annoying here, but do you think we could add a comment above this to explain why BR2_MIPS_NABI32 is handled specially here?

You don't need to say sorry, Thomas. It's a good idea, I will add a comment.

Quoted 1 line

Thanks!

Thanks to you.

Quoted 2 lines

Thomas

Signature · 1 line
Vincent