Date: Fri, 28 Feb 2014 21:44:31 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1525 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201402282144.s1SLiVmE087476@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Feb 28 21:44:30 2014 New Revision: 1525 Log: improve r1517 based on upstream feedback Modified: trunk/mail/thunderbird/files/patch-bug977457 trunk/www/firefox-esr/files/patch-bug977457 trunk/www/firefox-nightly/files/patch-bug977457 trunk/www/firefox/files/patch-bug977457 trunk/www/libxul/files/patch-bug977457 trunk/www/seamonkey/files/patch-bug977457 Modified: trunk/mail/thunderbird/files/patch-bug977457 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/mail/thunderbird/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/Makefile.in xpcom/base/Makefile.in -index 36d0a5a..877a72f 100644 ---- mozilla/xpcom/base/Makefile.in -+++ mozilla/xpcom/base/Makefile.in -@@ -59,6 +59,7 @@ include $(topsrcdir)/ipc/chromium/chromi - include $(topsrcdir)/config/rules.mk - - DEFINES += -D_IMPL_NS_COM -+DEFINES += -D_GNU_SOURCE - - ifdef MOZ_WIDGET_GTK - CXXFLAGS += $(TK_CFLAGS) diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- mozilla/xpcom/base/nsStackWalk.cpp +++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 Modified: trunk/www/firefox-esr/files/patch-bug977457 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/www/firefox-esr/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/Makefile.in xpcom/base/Makefile.in -index 36d0a5a..877a72f 100644 ---- xpcom/base/Makefile.in -+++ xpcom/base/Makefile.in -@@ -59,6 +59,7 @@ include $(topsrcdir)/ipc/chromium/chromi - include $(topsrcdir)/config/rules.mk - - DEFINES += -D_IMPL_NS_COM -+DEFINES += -D_GNU_SOURCE - - ifdef MOZ_WIDGET_GTK - CXXFLAGS += $(TK_CFLAGS) diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- xpcom/base/nsStackWalk.cpp +++ xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 Modified: trunk/www/firefox-nightly/files/patch-bug977457 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/www/firefox-nightly/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/moz.build xpcom/base/moz.build -index 36d0a5a..877a72f 100644 ---- xpcom/base/moz.build -+++ xpcom/base/moz.build -@@ -124,6 +124,7 @@ UNIFIED_SOURCES += [ - # NS_StackWalk silently return garbage at runtime. - if CONFIG['OS_TARGET'] != 'WINNT' or \ - (not CONFIG['MOZ_OPTIMIZE'] or CONFIG['MOZ_PROFILING'] or CONFIG['MOZ_DEBUG']): -+ DEFINES['_GNU_SOURCE'] = True - UNIFIED_SOURCES += [ - 'nsStackWalk.cpp', - ] diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- xpcom/base/nsStackWalk.cpp +++ xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 Modified: trunk/www/firefox/files/patch-bug977457 ============================================================================== --- trunk/www/firefox/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/www/firefox/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/moz.build xpcom/base/moz.build -index 36d0a5a..877a72f 100644 ---- xpcom/base/moz.build -+++ xpcom/base/moz.build -@@ -92,6 +92,7 @@ SOURCES += [ - 'nsDebugImpl.cpp', - ] - -+DEFINES['_GNU_SOURCE'] = True - UNIFIED_SOURCES += [ - 'AvailableMemoryTracker.cpp', - 'ClearOnShutdown.cpp', diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- xpcom/base/nsStackWalk.cpp +++ xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 Modified: trunk/www/libxul/files/patch-bug977457 ============================================================================== --- trunk/www/libxul/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/www/libxul/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/Makefile.in xpcom/base/Makefile.in -index 36d0a5a..877a72f 100644 ---- xpcom/base/Makefile.in -+++ xpcom/base/Makefile.in -@@ -59,6 +59,7 @@ include $(topsrcdir)/ipc/chromium/chromi - include $(topsrcdir)/config/rules.mk - - DEFINES += -D_IMPL_NS_COM -+DEFINES += -D_GNU_SOURCE - - ifdef MOZ_WIDGET_GTK - CXXFLAGS += $(TK_CFLAGS) diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- xpcom/base/nsStackWalk.cpp +++ xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 Modified: trunk/www/seamonkey/files/patch-bug977457 ============================================================================== --- trunk/www/seamonkey/files/patch-bug977457 Fri Feb 28 21:44:22 2014 (r1524) +++ trunk/www/seamonkey/files/patch-bug977457 Fri Feb 28 21:44:30 2014 (r1525) @@ -1,20 +1,21 @@ -diff --git xpcom/base/moz.build xpcom/base/moz.build -index 36d0a5a..877a72f 100644 ---- mozilla/xpcom/base/moz.build -+++ mozilla/xpcom/base/moz.build -@@ -92,6 +92,7 @@ SOURCES += [ - 'nsDebugImpl.cpp', - ] - -+DEFINES['_GNU_SOURCE'] = True - UNIFIED_SOURCES += [ - 'AvailableMemoryTracker.cpp', - 'ClearOnShutdown.cpp', diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp -index bb0e15b..dab82a6 100644 +index bb0e15b..7641267 100644 --- mozilla/xpcom/base/nsStackWalk.cpp +++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -1222,9 +1222,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, +@@ -23,6 +23,12 @@ struct CriticalAddress { + }; + static CriticalAddress gCriticalAddress; + ++// for _Unwind_Backtrace from libcxxrt or libunwind ++// cxxabi.h from libcxxrt implicitly includes unwind.h first ++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE) ++#define _GNU_SOURCE ++#endif ++ + #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) + #include <dlfcn.h> + #endif +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402282144.s1SLiVmE087476>