Import of pkgsrc-2015Q3

This commit is contained in:
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions

View File

@@ -1,12 +1,12 @@
$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.5 2015/05/12 22:48:54 ryoon Exp $
$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.6 2015/09/23 06:44:42 ryoon Exp $
--- js/src/jit/arm/Architecture-arm.cpp.orig 2015-05-04 00:43:27.000000000 +0000
--- js/src/jit/arm/Architecture-arm.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/arm/Architecture-arm.cpp
@@ -16,7 +16,7 @@
#include "jit/arm/Assembler-arm.h"
#include "jit/RegisterSets.h"
-#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR)
-#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM)
+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__)
// The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
// defined when building the simulator, so inline the header defines we need.