diff options
author | flo <flo@FreeBSD.org> | 2013-04-23 04:39:15 +0800 |
---|---|---|
committer | flo <flo@FreeBSD.org> | 2013-04-23 04:39:15 +0800 |
commit | 26d7a3d2a348bbc8a53e9749e1ff7f50fc145bb4 (patch) | |
tree | 7bf222775d852b1b60fbab7bdedf651cb1de43b7 | |
parent | e1f064e1c4c03dbacd5e8ed253ae269b46b9c235 (diff) | |
download | freebsd-ports-gnome-26d7a3d2a348bbc8a53e9749e1ff7f50fc145bb4.tar.gz freebsd-ports-gnome-26d7a3d2a348bbc8a53e9749e1ff7f50fc145bb4.tar.zst freebsd-ports-gnome-26d7a3d2a348bbc8a53e9749e1ff7f50fc145bb4.zip |
Fix build with clang 3.3
Submitted by: Jan Beich <jbeich@tormail.org>
-rw-r--r-- | mail/thunderbird/files/patch-bug854936 | 22 | ||||
-rw-r--r-- | mail/thunderbird/files/patch-clang33 | 25 | ||||
-rw-r--r-- | www/firefox-esr/files/patch-bug854936 | 22 | ||||
-rw-r--r-- | www/firefox-esr/files/patch-clang33 | 25 | ||||
-rw-r--r-- | www/firefox/files/patch-bug854936 | 22 | ||||
-rw-r--r-- | www/firefox/files/patch-clang33 | 34 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug854936 | 22 | ||||
-rw-r--r-- | www/seamonkey/files/patch-clang33 | 34 |
8 files changed, 206 insertions, 0 deletions
diff --git a/mail/thunderbird/files/patch-bug854936 b/mail/thunderbird/files/patch-bug854936 new file mode 100644 index 000000000000..fc3aa229c965 --- /dev/null +++ b/mail/thunderbird/files/patch-bug854936 @@ -0,0 +1,22 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp~ ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp +@@ -9,7 +9,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static void ATTRIBUTE_USED __attribute__ ((regparm(3))) ++void ATTRIBUTE_USED __attribute__ ((regparm(3))) + invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d) + { + for(uint32_t i = paramCount; i >0; i--, d++, s++) +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp~ ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp +@@ -10,7 +10,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static nsresult ATTRIBUTE_USED ++nsresult ATTRIBUTE_USED + __attribute__ ((regparm (3))) + PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args) + { diff --git a/mail/thunderbird/files/patch-clang33 b/mail/thunderbird/files/patch-clang33 new file mode 100644 index 000000000000..520639b339d1 --- /dev/null +++ b/mail/thunderbird/files/patch-clang33 @@ -0,0 +1,25 @@ +--- mozilla/js/src/jspropertycacheinlines.h~ ++++ mozilla/js/src/jspropertycacheinlines.h +@@ -31,7 +31,7 @@ JS_ALWAYS_INLINE void + js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject *&obj, + JSObject *&pobj, PropertyCacheEntry *&entry, PropertyName *&name) + { +- AssertRootingUnnecessary assert(cx); ++ js::AssertRootingUnnecessary assert(cx); + + JS_ASSERT(this == &JS_PROPERTY_CACHE(cx)); + +--- mozilla/js/src/vm/ObjectImpl-inl.h~ ++++ mozilla/js/src/vm/ObjectImpl-inl.h +@@ -176,9 +176,9 @@ js::ObjectImpl::initializeSlotRange(uint + JSCompartment *comp = compartment(); + uint32_t offset = start; + for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + } + + inline bool diff --git a/www/firefox-esr/files/patch-bug854936 b/www/firefox-esr/files/patch-bug854936 new file mode 100644 index 000000000000..a8ac9ffb98e5 --- /dev/null +++ b/www/firefox-esr/files/patch-bug854936 @@ -0,0 +1,22 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp~ ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp +@@ -9,7 +9,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static void ATTRIBUTE_USED __attribute__ ((regparm(3))) ++void ATTRIBUTE_USED __attribute__ ((regparm(3))) + invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d) + { + for(uint32_t i = paramCount; i >0; i--, d++, s++) +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp~ ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp +@@ -10,7 +10,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static nsresult ATTRIBUTE_USED ++nsresult ATTRIBUTE_USED + __attribute__ ((regparm (3))) + PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args) + { diff --git a/www/firefox-esr/files/patch-clang33 b/www/firefox-esr/files/patch-clang33 new file mode 100644 index 000000000000..dbf18eb4b70d --- /dev/null +++ b/www/firefox-esr/files/patch-clang33 @@ -0,0 +1,25 @@ +--- js/src/jspropertycacheinlines.h~ ++++ js/src/jspropertycacheinlines.h +@@ -31,7 +31,7 @@ JS_ALWAYS_INLINE void + js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject *&obj, + JSObject *&pobj, PropertyCacheEntry *&entry, PropertyName *&name) + { +- AssertRootingUnnecessary assert(cx); ++ js::AssertRootingUnnecessary assert(cx); + + JS_ASSERT(this == &JS_PROPERTY_CACHE(cx)); + +--- js/src/vm/ObjectImpl-inl.h~ ++++ js/src/vm/ObjectImpl-inl.h +@@ -176,9 +176,9 @@ js::ObjectImpl::initializeSlotRange(uint + JSCompartment *comp = compartment(); + uint32_t offset = start; + for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + } + + inline bool diff --git a/www/firefox/files/patch-bug854936 b/www/firefox/files/patch-bug854936 new file mode 100644 index 000000000000..a8ac9ffb98e5 --- /dev/null +++ b/www/firefox/files/patch-bug854936 @@ -0,0 +1,22 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp~ ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp +@@ -9,7 +9,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static void ATTRIBUTE_USED __attribute__ ((regparm(3))) ++void ATTRIBUTE_USED __attribute__ ((regparm(3))) + invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d) + { + for(uint32_t i = paramCount; i >0; i--, d++, s++) +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp~ ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp +@@ -10,7 +10,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static nsresult ATTRIBUTE_USED ++nsresult ATTRIBUTE_USED + __attribute__ ((regparm (3))) + PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args) + { diff --git a/www/firefox/files/patch-clang33 b/www/firefox/files/patch-clang33 new file mode 100644 index 000000000000..2d2b15d71d75 --- /dev/null +++ b/www/firefox/files/patch-clang33 @@ -0,0 +1,34 @@ +--- js/src/jspropertycacheinlines.h~ ++++ js/src/jspropertycacheinlines.h +@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void + js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj, + JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name) + { +- AutoAssertNoGC nogc; ++ js::AutoAssertNoGC nogc; + + JS_ASSERT(this == &cx->propertyCache()); + +@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool + js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj, + PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep) + { +- AutoAssertNoGC nogc; ++ js::AutoAssertNoGC nogc; + + JS_ASSERT(this == &cx->propertyCache()); + +--- js/src/vm/ObjectImpl-inl.h.orig 2013-03-26 23:17:49.000000000 +0100 ++++ js/src/vm/ObjectImpl-inl.h 2013-04-15 13:24:59.885671177 +0200 +@@ -212,9 +212,9 @@ + JSCompartment *comp = compartment(); + uint32_t offset = start; + for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + } + + inline bool diff --git a/www/seamonkey/files/patch-bug854936 b/www/seamonkey/files/patch-bug854936 new file mode 100644 index 000000000000..fc3aa229c965 --- /dev/null +++ b/www/seamonkey/files/patch-bug854936 @@ -0,0 +1,22 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp~ ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp +@@ -9,7 +9,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static void ATTRIBUTE_USED __attribute__ ((regparm(3))) ++void ATTRIBUTE_USED __attribute__ ((regparm(3))) + invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d) + { + for(uint32_t i = paramCount; i >0; i--, d++, s++) +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp~ ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp +@@ -10,7 +10,7 @@ + #include "xptc_gcc_x86_unix.h" + + extern "C" { +-static nsresult ATTRIBUTE_USED ++nsresult ATTRIBUTE_USED + __attribute__ ((regparm (3))) + PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args) + { diff --git a/www/seamonkey/files/patch-clang33 b/www/seamonkey/files/patch-clang33 new file mode 100644 index 000000000000..2ffac579006d --- /dev/null +++ b/www/seamonkey/files/patch-clang33 @@ -0,0 +1,34 @@ +--- mozilla/js/src/jspropertycacheinlines.h~ ++++ mozilla/js/src/jspropertycacheinlines.h +@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void + js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj, + JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name) + { +- AutoAssertNoGC nogc; ++ js::AutoAssertNoGC nogc; + + JS_ASSERT(this == &cx->propertyCache()); + +@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool + js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj, + PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep) + { +- AutoAssertNoGC nogc; ++ js::AutoAssertNoGC nogc; + + JS_ASSERT(this == &cx->propertyCache()); + +--- mozilla/js/src/vm/ObjectImpl-inl.h.orig 2013-03-26 23:17:49.000000000 +0100 ++++ mozilla/js/src/vm/ObjectImpl-inl.h 2013-04-15 13:24:59.885671177 +0200 +@@ -212,9 +212,9 @@ + JSCompartment *comp = compartment(); + uint32_t offset = start; + for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) +- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue()); ++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue()); + } + + inline bool |