Attachment 580229 Details for Bug 814879 – Only build SPS on supported platforms

[patch] Only build SPS on supported platforms

mozilla-734335.patch (text/plain), 4.54 KB, created by Gustavo Luiz Duarte on 2012-04-25 18:14:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gustavo Luiz Duarte

Created: 2012-04-25 18:14:08 UTC

Size: 4.54 KB

patch

obsolete

>Index: xulrunner-12.0/mozilla-release/configure.in
>===================================================================
>--- xulrunner-12.0.orig/mozilla-release/configure.in
>+++ xulrunner-12.0/mozilla-release/configure.in
>@@ -2124,10 +2124,33 @@ fi
> dnl ========================================================
> dnl SPS Profiler
> dnl ========================================================
>-MOZ_ARG_ENABLE_BOOL(sps,
>-[  --enable-sps          Enable sps profiling tool.],
>-    MOZ_ENABLE_PROFILER_SPS=1,
>-    MOZ_ENABLE_PROFILER_SPS= )
>+MOZ_ENABLE_PROFILER_SPS=1
>+
>+case "${OS_TARGET}" in
>+Android)
>+    case "${CPU_ARCH}" in
>+    x86 | arm) ;;
>+    *)
>+        MOZ_ENABLE_PROFILER_SPS=
>+    esac
>+    ;;
>+Linux)
>+    case "${CPU_ARCH}" in
>+    x86 | x86_64) ;;
>+    *)
>+        MOZ_ENABLE_PROFILER_SPS=
>+    esac
>+    ;;
>+WINNT|Darwin) ;;
>+*)
>+    MOZ_ENABLE_PROFILER_SPS=
>+    ;;
>+esac
>+
>+MOZ_ARG_DISABLE_BOOL(sps,
>+[  --disable-sps         Disable sps profiling tool.],
>+    MOZ_ENABLE_PROFILER_SPS=,
>+    MOZ_ENABLE_PROFILER_SPS=1)
> if test -n "$MOZ_ENABLE_PROFILER_SPS"; then
>     AC_DEFINE(MOZ_ENABLE_PROFILER_SPS)
> fi
>Index: xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in
>===================================================================
>--- xulrunner-12.0.orig/mozilla-release/toolkit/library/Makefile.in
>+++ xulrunner-12.0/mozilla-release/toolkit/library/Makefile.in
>@@ -315,7 +315,9 @@ endif
> 
> STATIC_LIBS += thebes gl ycbcr
> 
>+ifdef MOZ_ENABLE_PROFILER_SPS
> COMPONENT_LIBS += profiler
>+endif
> 
> ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
> COMPONENT_LIBS += widget_windows
>Index: xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp
>===================================================================
>--- xulrunner-12.0.orig/mozilla-release/toolkit/library/nsStaticXULComponents.cpp
>+++ xulrunner-12.0/mozilla-release/toolkit/library/nsStaticXULComponents.cpp
>@@ -198,6 +198,12 @@
> #endif
> #endif
> 
>+#if defined(MOZ_ENABLE_PROFILER_SPS)
>+#define PROFILER_MODULE MODULE(nsProfilerModule)
>+#else
>+#define PROFILER_MODULE
>+#endif
>+
> #define XUL_MODULES                          \
>     MODULE(nsUConvModule)                    \
>     MODULE(nsI18nModule)                     \
>@@ -214,7 +220,7 @@
>     MODULE(nsWindowDataSourceModule)         \
>     MODULE(nsParserModule)                   \
>     MODULE(nsGfxModule)                      \
>-    MODULE(nsProfilerModule)                 \
>+    PROFILER_MODULE                          \
>     WIDGET_MODULES                           \
>     MODULE(nsImageLib2Module)                \
>     ICON_MODULE                              \
>Index: xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in
>===================================================================
>--- xulrunner-12.0.orig/mozilla-release/tools/profiler/Makefile.in
>+++ xulrunner-12.0/mozilla-release/tools/profiler/Makefile.in
>@@ -48,8 +48,10 @@ VPATH       = \
> 
> include $(DEPTH)/config/autoconf.mk
> 
>-EXPORTS = \
>-  sampler.h \
>+EXPORTS = sampler.h
>+
>+ifdef MOZ_ENABLE_PROFILER_SPS
>+EXPORTS += \
>   sps_sampler.h \
>   thread_helper.h \
>   $(NULL)
>@@ -68,6 +70,7 @@ IS_COMPONENT    = 1
> CPPSRCS		= \
>   nsProfilerFactory.cpp \
>   nsProfiler.cpp \
>+  TableTicker.cpp \
>   $(NULL)
> 
> XPIDLSRCS = \
>@@ -79,42 +82,31 @@ EXTRA_JS_MODULES = \
>   $(NULL)
> 
> ifneq (,$(filter Android Linux,$(OS_TARGET)))
>-
>-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
>-
> CPPSRCS += \
>   shared-libraries-linux.cc \
>   platform-linux.cc \
>-  TableTicker.cpp \
>   $(NULL)
> endif
>+
> ifeq ($(OS_TARGET),Darwin)
> # For now we use platform-linux.cc because we can't unwind
> # another thread on mac using backtrace(), the implementation
> # for platform-macosx.cc is in the hg history and should be
> # used when we can stackwalk using a thread handle.
>-
>-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
>-
> CPPSRCS += \
>   shared-libraries-macos.cc \
>   platform-linux.cc \
>-  TableTicker.cpp \
>   $(NULL)
> endif
> 
> ifeq ($(OS_TARGET),WINNT)
>-
>-DEFINES += -DMOZ_ENABLE_PROFILER_SPS
>-
> CPPSRCS += \
>   shared-libraries-win32.cc \
>   platform-win32.cc \
>-  TableTicker.cpp \
>   $(NULL)
> endif
> 
>-
>+endif
> 
> include $(topsrcdir)/config/rules.mk
> 
>Index: xulrunner-12.0/mozilla-release/tools/profiler/sampler.h
>===================================================================
>--- xulrunner-12.0.orig/mozilla-release/tools/profiler/sampler.h
>+++ xulrunner-12.0/mozilla-release/tools/profiler/sampler.h
>@@ -78,7 +78,7 @@
> #define SAMPLER_H
> 
> // Redefine the macros for platforms where SPS is supported.
>-#if defined(ANDROID) || defined(__linux__) || defined(XP_MACOSX) || defined(XP_WIN)
>+#ifdef MOZ_ENABLE_PROFILER_SPS
> 
> #include "sps_sampler.h"
>

Actions: View | Diff

Attachments on bug 814879: 580226 | 580229 | 580231