Changeset 147040 in webkit


Ignore:
Timestamp:
Mar 27, 2013 5:47:54 PM (11 years ago)
Author:
Patrick Gansterer
Message:

Set WTF_ARM_ARCH_VERSION to correct value when used with MSVC
​https://bugs.webkit.org/show_bug.cgi?id=113436

Reviewed by Benjamin Poulain.

.:

  • Source/cmake/OptionsWinCE.cmake: CPU(ARM_TRADITIONAL) is now set correctly by Platform.h.

Source/WTF:

The Microsoft compiler defines _M_ARM with used ARM version.

  • wtf/Platform.h:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r147004 r147040  
     12013-03-27  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Set WTF_ARM_ARCH_VERSION to correct value when used with MSVC
     4        https://bugs.webkit.org/show_bug.cgi?id=113436
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * Source/cmake/OptionsWinCE.cmake: CPU(ARM_TRADITIONAL) is now set correctly by Platform.h.
     9
    1102013-03-27  Timothy Hatcher  <timothy@apple.com>
    211

  • trunk/Source/WTF/ChangeLog

    r146993 r147040  
     12013-03-27  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Set WTF_ARM_ARCH_VERSION to correct value when used with MSVC
     4        https://bugs.webkit.org/show_bug.cgi?id=113436
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        The Microsoft compiler defines _M_ARM with used ARM version.
     9
     10        * wtf/Platform.h:
     11
    1122013-03-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    213

  • trunk/Source/WTF/wtf/Platform.h

    r146459 r147040  
    191191#if   defined(__ARM_ARCH_4__) \
    192192    || defined(__ARM_ARCH_4T__) \
    193     || defined(__MARM_ARMV4__) \
    194     || defined(_ARMV4I_)
     193    || defined(__MARM_ARMV4__)
    195194#define WTF_ARM_ARCH_VERSION 4
    196195
    … …  
    220219    || defined(__ARM_ARCH_7S__)
    221220#define WTF_ARM_ARCH_VERSION 7
     221
     222/* MSVC sets _M_ARM */
     223#elif defined(_M_ARM)
     224#define WTF_ARM_ARCH_VERSION _M_ARM
    222225
    223226/* RVCT sets _TARGET_ARCH_ARM */

  • trunk/Source/cmake/OptionsWinCE.cmake

    r136790 r147040  
    44add_definitions(-DWTF_USE_WCHAR_UNICODE=1)
    55add_definitions(-DWTF_USE_WININET=1)
    6 add_definitions(-DWTF_CPU_ARM_TRADITIONAL -DWINCEBASIC)
     6add_definitions(-DWINCEBASIC)
    77add_definitions(-DJS_NO_EXPORT)
    88add_definitions(-DHAVE_ACCESSIBILITY=0)
Note: See TracChangeset for help on using the changeset viewer.