Skip to content

Commit 79add12

Browse files
Merge pull request #238 from ricardoquesada/spidermonkey_arm64_android
github issue #15566
2 parents 046a2a7 + 5496cc2 commit 79add12

File tree

4 files changed

+111
-53
lines changed

4 files changed

+111
-53
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
2+
* vim: set ts=8 sw=4 et tw=78:
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7+
8+
#ifndef js_config_h
9+
#define js_config_h
10+
11+
/* Definitions set at build time that affect SpiderMonkey's public API.
12+
This header file is generated by the SpiderMonkey configure script,
13+
and installed along with jsapi.h. */
14+
15+
/* Define to 1 if SpiderMonkey is in debug mode. */
16+
/* #undef JS_DEBUG */
17+
18+
/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
19+
/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
20+
21+
/* Define to 1 if SpiderMonkey should support multi-threaded clients. */
22+
/* #undef JS_THREADSAFE */
23+
24+
/* Define to 1 if SpiderMonkey should include ctypes support. */
25+
/* #undef JS_HAS_CTYPES */
26+
27+
/* Define to 1 if SpiderMonkey should support the ability to perform
28+
entirely too much GC. */
29+
/* #undef JS_GC_ZEAL */
30+
31+
/* Define to 1 if the <endian.h> header is present and
32+
useable. See jscpucfg.h. */
33+
#define JS_HAVE_ENDIAN_H 1
34+
35+
/* Define to 1 if the <machine/endian.h> header is present and
36+
useable. See jscpucfg.h. */
37+
#define JS_HAVE_MACHINE_ENDIAN_H 1
38+
39+
/* Define to 1 if the <sys/isa_defs.h> header is present and
40+
useable. See jscpucfg.h. */
41+
/* #undef JS_HAVE_SYS_ISA_DEFS_H */
42+
43+
/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
44+
#define JS_NUNBOX32 1
45+
46+
/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
47+
/* #undef JS_PUNBOX64 */
48+
49+
/* MOZILLA JSAPI version number components */
50+
#define MOZJS_MAJOR_VERSION 33
51+
#define MOZJS_MINOR_VERSION 1
52+
53+
#endif /* js_config_h */
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
2+
* vim: set ts=8 sw=4 et tw=78:
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7+
8+
#ifndef js_config_h
9+
#define js_config_h
10+
11+
/* Definitions set at build time that affect SpiderMonkey's public API.
12+
This header file is generated by the SpiderMonkey configure script,
13+
and installed along with jsapi.h. */
14+
15+
/* Define to 1 if SpiderMonkey is in debug mode. */
16+
/* #undef JS_DEBUG */
17+
18+
/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
19+
/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
20+
21+
/* Define to 1 if SpiderMonkey should support multi-threaded clients. */
22+
/* #undef JS_THREADSAFE */
23+
24+
/* Define to 1 if SpiderMonkey should include ctypes support. */
25+
/* #undef JS_HAS_CTYPES */
26+
27+
/* Define to 1 if SpiderMonkey should support the ability to perform
28+
entirely too much GC. */
29+
/* #undef JS_GC_ZEAL */
30+
31+
/* Define to 1 if the <endian.h> header is present and
32+
useable. See jscpucfg.h. */
33+
#define JS_HAVE_ENDIAN_H 1
34+
35+
/* Define to 1 if the <machine/endian.h> header is present and
36+
useable. See jscpucfg.h. */
37+
#define JS_HAVE_MACHINE_ENDIAN_H 1
38+
39+
/* Define to 1 if the <sys/isa_defs.h> header is present and
40+
useable. See jscpucfg.h. */
41+
/* #undef JS_HAVE_SYS_ISA_DEFS_H */
42+
43+
/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
44+
/* #undef JS_NUNBOX32 */
45+
46+
/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
47+
#define JS_PUNBOX64 1
48+
49+
/* MOZILLA JSAPI version number components */
50+
#define MOZJS_MAJOR_VERSION 33
51+
#define MOZJS_MINOR_VERSION 1
52+
53+
#endif /* js_config_h */
+5-53
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,5 @@
1-
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
2-
* vim: set ts=8 sw=4 et tw=78:
3-
*
4-
* This Source Code Form is subject to the terms of the Mozilla Public
5-
* License, v. 2.0. If a copy of the MPL was not distributed with this
6-
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7-
8-
#ifndef js_config_h
9-
#define js_config_h
10-
11-
/* Definitions set at build time that affect SpiderMonkey's public API.
12-
This header file is generated by the SpiderMonkey configure script,
13-
and installed along with jsapi.h. */
14-
15-
/* Define to 1 if SpiderMonkey is in debug mode. */
16-
/* #undef JS_DEBUG */
17-
18-
/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
19-
/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
20-
21-
/* Define to 1 if SpiderMonkey should support multi-threaded clients. */
22-
/* #undef JS_THREADSAFE */
23-
24-
/* Define to 1 if SpiderMonkey should include ctypes support. */
25-
/* #undef JS_HAS_CTYPES */
26-
27-
/* Define to 1 if SpiderMonkey should support the ability to perform
28-
entirely too much GC. */
29-
/* #undef JS_GC_ZEAL */
30-
31-
/* Define to 1 if the <endian.h> header is present and
32-
useable. See jscpucfg.h. */
33-
#define JS_HAVE_ENDIAN_H 1
34-
35-
/* Define to 1 if the <machine/endian.h> header is present and
36-
useable. See jscpucfg.h. */
37-
#define JS_HAVE_MACHINE_ENDIAN_H 1
38-
39-
/* Define to 1 if the <sys/isa_defs.h> header is present and
40-
useable. See jscpucfg.h. */
41-
/* #undef JS_HAVE_SYS_ISA_DEFS_H */
42-
43-
/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
44-
#define JS_NUNBOX32 1
45-
46-
/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
47-
/* #undef JS_PUNBOX64 */
48-
49-
/* MOZILLA JSAPI version number components */
50-
#define MOZJS_MAJOR_VERSION 33
51-
#define MOZJS_MINOR_VERSION 1
52-
53-
#endif /* js_config_h */
1+
#if defined(__LP64__) && __LP64__
2+
#include"js-config-64.h"
3+
#else
4+
#include"js-config-32.h"
5+
#endif
Binary file not shown.

0 commit comments

Comments
 (0)