1 

     2 # HG changeset patch

     3 # User Mike Hommey <mh+mozilla@glandium.org>

     4 # Date 1526871862 -32400

     5 # Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43

     6 # Parent  0b7e1398ca2e15e27da93144ba9fb30db38367b1

     7 Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons

     8 

     9 For some reason, GNU as is not happy with the assembly generated after

    10 bug 1238661 anymore on Debian armel.

    11 

    12 OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this

    13 workaround anymore, so let's just kill it.

    14 

    15 diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp

    16 --- a/mozglue/baseprofiler/core/platform-linux-android.cpp

    17 +++ b/mozglue/baseprofiler/core/platform-linux-android.cpp

    18 @@ -55,17 +55,16 @@

    19  #ifdef __GLIBC__

    20  #  include <execinfo.h>  // backtrace, backtrace_symbols

    21  #endif                   // def __GLIBC__

    22  #include <strings.h>     // index

    23  #include <errno.h>

    24  #include <stdarg.h>

    25  

    26  #include "prenv.h"

    27 -#include "mozilla/LinuxSignal.h"

    28  #include "mozilla/PodOperations.h"

    29  #include "mozilla/DebugOnly.h"

    30  

    31  #include <string.h>

    32  #include <list>

    33  

    34  using namespace mozilla;

    35  

    36 @@ -266,17 +265,17 @@ Sampler::Sampler(PSLockRef aLock)

    37  

    38    // NOTE: We don't initialize LUL here, instead initializing it in

    39    // SamplerThread's constructor. This is because with the

    40    // profiler_suspend_and_sample_thread entry point, we want to be able to

    41    // sample without waiting for LUL to be initialized.

    42  

    43    // Request profiling signals.

    44    struct sigaction sa;

    45 -  sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);

    46 +  sa.sa_sigaction = SigprofHandler;

    47    sigemptyset(&sa.sa_mask);

    48    sa.sa_flags = SA_RESTART | SA_SIGINFO;

    49    if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {

    50      MOZ_CRASH("Error installing SIGPROF handler in the profiler");

    51    }

    52  }

    53  

    54  void Sampler::Disable(PSLockRef aLock) {

    55 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp

    56 --- a/tools/profiler/core/platform-linux-android.cpp

    57 +++ b/tools/profiler/core/platform-linux-android.cpp

    58 @@ -258,17 +258,17 @@ Sampler::Sampler(PSLockRef aLock)

    59  

    60    // NOTE: We don't initialize LUL here, instead initializing it in

    61    // SamplerThread's constructor. This is because with the

    62    // profiler_suspend_and_sample_thread entry point, we want to be able to

    63    // sample without waiting for LUL to be initialized.

    64  

    65    // Request profiling signals.

    66    struct sigaction sa;

    67 -  sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);

    68 +  sa.sa_sigaction = SigprofHandler;

    69    sigemptyset(&sa.sa_mask);

    70    sa.sa_flags = SA_RESTART | SA_SIGINFO;

    71    if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {

    72      MOZ_CRASH("Error installing SIGPROF handler in the profiler");

    73    }

    74  }

    75  

    76  void Sampler::Disable(PSLockRef aLock) {