Ticket #5763: boost_1_47_0-intel-segfault-in-asio-signal.diff

File boost_1_47_0-intel-segfault-in-asio-signal.diff, 2.7 KB (added by Vladislav <phprus@…>, 11 years ago)

  • boost/asio/detail/fenced_block.hpp 

    diff -r -u boost_1_47_0.orig/boost/asio/detail/fenced_block.hpp boost_1_47_0/boost/asio/detail/fenced_block.hpp
    old new  
    3030#elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__))
    3131# include <boost/asio/detail/gcc_hppa_fenced_block.hpp>
    3232#elif defined(__GNUC__) \
    33   && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
    34   && !defined(__INTEL_COMPILER) && !defined(__ICL) \
    35   && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__)
     33  && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
     34    && !defined(__INTEL_COMPILER) && !defined(__ICC)) \
     35  || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \
     36  && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__)
    3637# include <boost/asio/detail/gcc_sync_fenced_block.hpp>
    3738#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
    3839# include <boost/asio/detail/gcc_x86_fenced_block.hpp>
    … …  
    5960#elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__))
    6061typedef gcc_hppa_fenced_block fenced_block;
    6162#elif defined(__GNUC__) \
    62   && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
    63   && !defined(__INTEL_COMPILER) && !defined(__ICL) \
    64   && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__)
     63  && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
     64    && !defined(__INTEL_COMPILER) && !defined(__ICC)) \
     65  || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \
     66  && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__)
    6567typedef gcc_sync_fenced_block fenced_block;
    6668#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
    6769typedef gcc_x86_fenced_block fenced_block;

  • boost/asio/detail/gcc_sync_fenced_block.hpp 

    diff -r -u boost_1_47_0.orig/boost/asio/detail/gcc_sync_fenced_block.hpp boost_1_47_0/boost/asio/detail/gcc_sync_fenced_block.hpp
    old new  
    1818#include <boost/asio/detail/config.hpp>
    1919
    2020#if defined(__GNUC__) \
    21   && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
    22   && !defined(__INTEL_COMPILER) && !defined(__ICL) \
    23   && !defined(__ICC) && !defined(__ECC) && !defined(__PATHSCALE__)
     21  && ((((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)) \
     22    && !defined(__INTEL_COMPILER) && !defined(__ICC)) \
     23  || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1100)) \
     24  && !defined(__ICL) && !defined(__ECC) && !defined(__PATHSCALE__)
    2425
    2526#include <boost/asio/detail/push_options.hpp>
    2627