Commit 22bedfa6 authored by paroga@webkit.org's avatar paroga@webkit.org

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147040 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9d3bf065
2013-03-27 Patrick Gansterer <paroga@webkit.org>
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.
2013-03-27 Timothy Hatcher <timothy@apple.com> 2013-03-27 Timothy Hatcher <timothy@apple.com>
Add support for dock-to-right of the Web Inspector in the Mac port. Add support for dock-to-right of the Web Inspector in the Mac port.
......
2013-03-27 Patrick Gansterer <paroga@webkit.org>
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.
The Microsoft compiler defines _M_ARM with used ARM version.
* wtf/Platform.h:
2013-03-27 Allan Sandfeld Jensen <allan.jensen@digia.com> 2013-03-27 Allan Sandfeld Jensen <allan.jensen@digia.com>
Support C++11 static_assert Support C++11 static_assert
......
...@@ -190,8 +190,7 @@ ...@@ -190,8 +190,7 @@
/* Set WTF_ARM_ARCH_VERSION */ /* Set WTF_ARM_ARCH_VERSION */
#if defined(__ARM_ARCH_4__) \ #if defined(__ARM_ARCH_4__) \
|| defined(__ARM_ARCH_4T__) \ || defined(__ARM_ARCH_4T__) \
|| defined(__MARM_ARMV4__) \ || defined(__MARM_ARMV4__)
|| defined(_ARMV4I_)
#define WTF_ARM_ARCH_VERSION 4 #define WTF_ARM_ARCH_VERSION 4
#elif defined(__ARM_ARCH_5__) \ #elif defined(__ARM_ARCH_5__) \
...@@ -220,6 +219,10 @@ ...@@ -220,6 +219,10 @@
|| defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_7S__)
#define WTF_ARM_ARCH_VERSION 7 #define WTF_ARM_ARCH_VERSION 7
/* MSVC sets _M_ARM */
#elif defined(_M_ARM)
#define WTF_ARM_ARCH_VERSION _M_ARM
/* RVCT sets _TARGET_ARCH_ARM */ /* RVCT sets _TARGET_ARCH_ARM */
#elif defined(__TARGET_ARCH_ARM) #elif defined(__TARGET_ARCH_ARM)
#define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM
......
...@@ -3,7 +3,7 @@ include(OptionsWindows) ...@@ -3,7 +3,7 @@ include(OptionsWindows)
add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX) add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX)
add_definitions(-DWTF_USE_WCHAR_UNICODE=1) add_definitions(-DWTF_USE_WCHAR_UNICODE=1)
add_definitions(-DWTF_USE_WININET=1) add_definitions(-DWTF_USE_WININET=1)
add_definitions(-DWTF_CPU_ARM_TRADITIONAL -DWINCEBASIC) add_definitions(-DWINCEBASIC)
add_definitions(-DJS_NO_EXPORT) add_definitions(-DJS_NO_EXPORT)
add_definitions(-DHAVE_ACCESSIBILITY=0) add_definitions(-DHAVE_ACCESSIBILITY=0)
add_definitions(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000) add_definitions(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment