diff options
| author | Kubilay Kocak <koobs@FreeBSD.org> | 2013-06-08 17:13:09 +0000 |
|---|---|---|
| committer | Kubilay Kocak <koobs@FreeBSD.org> | 2013-06-08 17:13:09 +0000 |
| commit | 59a275ca574a48cd9c1382654805471b5af8808d (patch) | |
| tree | 12dfb82a9c6ac7f14bf2edfc5e9257154678b03a /lang/spidermonkey185/files/patch-jsstr.cpp | |
| parent | Chase relocation of upstream source, and remove BROKEN=Does not fetch. (diff) | |
lang/spidermonkey185: Fix clang build, cherrypick upstream clang fixes
- patch: -fvisibility=hidden to fix clang build
- patch: Remove shell workers [1]
- patch: Silence clang alignment warnings jsscript.h [2]
- patch: Silence clang alignment warnings in jsstr.cpp [3]
- Fix pkg-plist - remove pkgconfig dirrm entry
- Tweak regression-test: target
[1] https://bugzilla.mozilla.org/show_bug.cgi?id=771281
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=662962
[3] https://bugzilla.mozilla.org/show_bug.cgi?id=662961
Thanks to Guido Falsi (madpilot) for the visibility patch, kwm and miwi
for additional testing and the constant reminders.
Notes
Notes:
svn path=/head/; revision=320274
Diffstat (limited to 'lang/spidermonkey185/files/patch-jsstr.cpp')
| -rw-r--r-- | lang/spidermonkey185/files/patch-jsstr.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/lang/spidermonkey185/files/patch-jsstr.cpp b/lang/spidermonkey185/files/patch-jsstr.cpp new file mode 100644 index 000000000000..13ab1ee9f3d4 --- /dev/null +++ b/lang/spidermonkey185/files/patch-jsstr.cpp @@ -0,0 +1,36 @@ +# HG changeset patch +# User Ehsan Akhgari <ehsan@mozilla.com> +# Date 1308517488 14400 +# Node ID 284ebc48b2cb8e35dc04482ede700e717d8d214f +# Parent cecc5adfc44068fb6f11b9baa78cb5fddc100b27 +Bug 662961 - Silence the clang warnings issued because of alignment requirements increase when compiling jsstr.cpp; r=Waldo + +--- ./jsstr.cpp.orig 2013-05-26 00:44:33.383765764 +1000 ++++ ./jsstr.cpp 2013-05-26 00:46:35.842211859 +1000 +@@ -3147,7 +3147,7 @@ + */ + #define R(c) { \ + BUILD_LENGTH_AND_FLAGS(1, JSString::FLAT | JSString::ATOMIZED), \ +- { (jschar *)(((char *)(unitStringTable + (c))) + \ ++ { (jschar *)(uintptr_t(unitStringTable + (c)) + \ + offsetof(JSString, inlineStorage)) }, \ + { {(c), 0x00} } } + +@@ -3207,7 +3207,7 @@ + */ + #define R(c) { \ + BUILD_LENGTH_AND_FLAGS(2, JSString::FLAT | JSString::ATOMIZED), \ +- { (jschar *)(((char *)(length2StringTable + (c))) + \ ++ { (jschar *)(uintptr_t(length2StringTable + (c)) + \ + offsetof(JSString, inlineStorage)) }, \ + { {FROM_SMALL_CHAR((c) >> 6), FROM_SMALL_CHAR((c) & 0x3F), 0x00} } } + +@@ -3240,7 +3240,7 @@ + */ + #define R(c) { \ + BUILD_LENGTH_AND_FLAGS(3, JSString::FLAT | JSString::ATOMIZED), \ +- { (jschar *)(((char *)(hundredStringTable + ((c) - 100))) + \ ++ { (jschar *)(uintptr_t(hundredStringTable + ((c) - 100)) + \ + offsetof(JSString, inlineStorage)) }, \ + { {((c) / 100) + '0', ((c) / 10 % 10) + '0', ((c) % 10) + '0', 0x00} } } + |