head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.0.22
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.18
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.16
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.14
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.12
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.10
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.8
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.6
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.4
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.2
	pkgsrc-2015Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2017.10.27.13.52.05;	author ryoon;	state dead;
branches;
next	1.1;
commitid	1t9uUNgNKBgpbHcA;

1.1
date	2015.04.28.12.06.34;	author joerg;	state Exp;
branches;
next	;
commitid	wcTlBqHz2QSFWljy;


desc
@@


1.2
log
@Remove firefox31
@
text
@$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.1 2015/04/28 12:06:34 joerg Exp $

--- js/src/jit/arm/Architecture-arm.cpp.orig	2015-04-10 17:17:56.000000000 +0000
+++ js/src/jit/arm/Architecture-arm.cpp
@@@@ -17,7 +17,7 @@@@
 
 #define HWCAP_USE_HARDFP_ABI (1 << 28)
 
-#if !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR)
+#if defined(__linux__) && !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR)
 #define HWCAP_ARMv7 (1 << 29)
 #include <asm/hwcap.h>
 #else
@@@@ -212,6 +212,9 @@@@ uint32_t GetARMFlags()
 
     isSet = true;
     return flags;
+#elif defined(__NetBSD__)
+    /* XXX */
+    return 0;
 #endif
 
     return 0;
@


1.1
log
@Allow building Firefox 31 with Clang and on NetBSD/ARM.
@
text
@d1 1
a1 1
$NetBSD$
@