Date: Mon, 22 Apr 2013 20:39:16 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316274 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files Message-ID: <201304222039.r3MKdGNS095645@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Mon Apr 22 20:39:15 2013 New Revision: 316274 URL: http://svnweb.freebsd.org/changeset/ports/316274 Log: Fix build with clang 3.3 Submitted by: Jan Beich <jbeich@tormail.org> Added: head/mail/thunderbird/files/patch-bug854936 (contents, props changed) head/mail/thunderbird/files/patch-clang33 (contents, props changed) head/www/firefox-esr/files/patch-bug854936 (contents, props changed) head/www/firefox-esr/files/patch-clang33 (contents, props changed) head/www/firefox/files/patch-bug854936 (contents, props changed) head/www/firefox/files/patch-clang33 (contents, props changed) head/www/seamonkey/files/patch-bug854936 (contents, props changed) head/www/seamonkey/files/patch-clang33 (contents, props changed) Added: head/mail/thunderbird/files/patch-bug854936 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug854936 Mon Apr 22 20:39:15 2013 (r316274) @@ -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) + { Added: head/mail/thunderbird/files/patch-clang33 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-clang33 Mon Apr 22 20:39:15 2013 (r316274) @@ -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 Added: head/www/firefox-esr/files/patch-bug854936 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug854936 Mon Apr 22 20:39:15 2013 (r316274) @@ -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) + { Added: head/www/firefox-esr/files/patch-clang33 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-clang33 Mon Apr 22 20:39:15 2013 (r316274) @@ -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 Added: head/www/firefox/files/patch-bug854936 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug854936 Mon Apr 22 20:39:15 2013 (r316274) @@ -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) + { Added: head/www/firefox/files/patch-clang33 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-clang33 Mon Apr 22 20:39:15 2013 (r316274) @@ -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 Added: head/www/seamonkey/files/patch-bug854936 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-bug854936 Mon Apr 22 20:39:15 2013 (r316274) @@ -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) + { Added: head/www/seamonkey/files/patch-clang33 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-clang33 Mon Apr 22 20:39:15 2013 (r316274) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304222039.r3MKdGNS095645>