|
 |
8d84ca |
From 5b2bfe99c7ef70ea75731c88b43d9036be11d236 Mon Sep 17 00:00:00 2001
|
|
|
8d84ca |
From: Colin Walters <walters@verbum.org>
|
|
|
8d84ca |
Date: Tue, 18 Mar 2014 11:46:05 -0400
|
|
|
8d84ca |
Subject: [PATCH] Move JS_BYTES_PER_WORD out of config.h
|
|
|
8d84ca |
|
|
|
8d84ca |
Instead define it in terms of the already extant GNU C extension
|
|
|
8d84ca |
__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64
|
|
|
8d84ca |
bit packages of js are co-installed.
|
|
|
8d84ca |
---
|
|
|
8d84ca |
js/src/configure.in | 9 ---------
|
|
|
8d84ca |
js/src/js-config.h.in | 1 -
|
|
|
8d84ca |
js/src/jstypes.h | 12 ++++++++++++
|
|
|
8d84ca |
3 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
8d84ca |
|
|
|
8d84ca |
diff --git a/js/src/configure.in b/js/src/configure.in
|
|
|
8d84ca |
index 19fd704..0673aca 100644
|
|
|
8d84ca |
--- a/js/src/configure.in
|
|
|
8d84ca |
+++ b/js/src/configure.in
|
|
|
8d84ca |
@@ -2349,15 +2349,6 @@ else
|
|
|
8d84ca |
AC_MSG_RESULT(no)
|
|
|
8d84ca |
fi
|
|
|
8d84ca |
|
|
|
8d84ca |
-MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8)
|
|
|
8d84ca |
-if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then
|
|
|
8d84ca |
- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5)
|
|
|
8d84ca |
-elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then
|
|
|
8d84ca |
- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6)
|
|
|
8d84ca |
-else
|
|
|
8d84ca |
- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD])
|
|
|
8d84ca |
-fi
|
|
|
8d84ca |
-
|
|
|
8d84ca |
MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16)
|
|
|
8d84ca |
MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14)
|
|
|
8d84ca |
|
|
|
8d84ca |
diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
|
|
|
8d84ca |
index 6889e00..4775420 100644
|
|
|
8d84ca |
--- a/js/src/js-config.h.in
|
|
|
8d84ca |
+++ b/js/src/js-config.h.in
|
|
|
8d84ca |
@@ -56,7 +56,6 @@
|
|
|
8d84ca |
#undef JS_INT32_TYPE
|
|
|
8d84ca |
#undef JS_INT64_TYPE
|
|
|
8d84ca |
#undef JS_INTPTR_TYPE
|
|
|
8d84ca |
-#undef JS_BYTES_PER_WORD
|
|
|
8d84ca |
|
|
|
8d84ca |
/* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being
|
|
|
8d84ca |
correct. */
|
|
|
8d84ca |
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
|
|
|
8d84ca |
index d0cf183..3e7928f 100644
|
|
|
8d84ca |
--- a/js/src/jstypes.h
|
|
|
8d84ca |
+++ b/js/src/jstypes.h
|
|
|
8d84ca |
@@ -24,6 +24,18 @@
|
|
|
8d84ca |
#include "mozilla/Util.h"
|
|
|
8d84ca |
|
|
|
8d84ca |
#include "js-config.h"
|
|
|
8d84ca |
+#ifndef JS_BYTES_PER_WORD
|
|
|
8d84ca |
+#define JS_BYTES_PER_WORD __SIZEOF_POINTER__
|
|
|
8d84ca |
+#endif
|
|
|
8d84ca |
+#ifndef JS_BITS_PER_WORD_LOG2
|
|
|
8d84ca |
+#if JS_BYTES_PER_WORD == 8
|
|
|
8d84ca |
+#define JS_BITS_PER_WORD_LOG2 6
|
|
|
8d84ca |
+#elif JS_BYTES_PER_WORD == 4
|
|
|
8d84ca |
+#define JS_BITS_PER_WORD_LOG2 5
|
|
|
8d84ca |
+#else
|
|
|
8d84ca |
+#error Unhandled JS_BYTES_PER_WORD
|
|
|
8d84ca |
+#endif
|
|
|
8d84ca |
+#endif
|
|
|
8d84ca |
|
|
|
8d84ca |
/***********************************************************************
|
|
|
8d84ca |
** MACROS: JS_EXTERN_API
|
|
|
8d84ca |
--
|
|
|
8d84ca |
1.8.3.1
|
|
|
8d84ca |
|