Changeset 92555 in webkit


Ignore:
Timestamp:
Aug 6, 2011 12:52:39 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Patch by Aron Rosenberg <​arosenberg@logitech.com> on 2011-08-06
Reviewed by Benjamin Poulain.

[Qt] Fix build with Intel compiler on Windows
​https://bugs.webkit.org/show_bug.cgi?id=65088

.:

Disable Intel Compiler warning 873 - function "" has no corresponding operator
delete (to be called if an exception is thrown during initialization of an
allocated object).

  • Source/WebKit.pri:

Source/JavaScriptCore:

Intel compiler needs .lib suffixes instead of .a
Intel compiler doesn't support nullptr
Intel compiler supports unsized arrays

Source/WebCore:

Intel compiler needs .lib suffixes instead of .a

  • WebCore.pri:

Source/WebKit2:

Intel compiler needs .lib suffixes instead of .a

  • WebKit2.pri:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r92303 r92555  
     12011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] Fix build with Intel compiler on Windows
     6        https://bugs.webkit.org/show_bug.cgi?id=65088
     7
     8        Disable Intel Compiler warning 873 - function "" has no corresponding operator
     9        delete (to be called if an exception is thrown during initialization of an
     10        allocated object).
     11
     12        * Source/WebKit.pri:
     13
    1142011-08-03  Kevin Ollivier  <kevino@theolliviers.com>
    215

  • trunk/Source/JavaScriptCore/ChangeLog

    r92540 r92555  
     12011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] Fix build with Intel compiler on Windows
     6        https://bugs.webkit.org/show_bug.cgi?id=65088
     7
     8        Intel compiler needs .lib suffixes instead of .a
     9        Intel compiler doesn't support nullptr
     10        Intel compiler supports unsized arrays
     11
     12        * JavaScriptCore.pri:
     13        * jsc.cpp:
     14        * wtf/ByteArray.h:
     15        * wtf/NullPtr.h:
     16
    1172011-08-05  Gavin Barraclough  <barraclough@apple.com>
    218

  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r88350 r92555  
    7777    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
    7878
    79     win32-msvc*|wince* {
     79    win32-msvc*|wince*|win32-icc {
    8080        LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS
    8181        LIBS = -L$$pathToJavaScriptCoreOutput $$LIBS

  • trunk/Source/JavaScriptCore/jsc.cpp

    r92224 r92555  
    341341// unwinding.
    342342
    343 #if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
     343#if COMPILER(MSVC) && !COMPILER(INTEL) && !defined(_DEBUG) && !OS(WINCE)
    344344#define TRY       __try {
    345345#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }

  • trunk/Source/JavaScriptCore/wtf/ByteArray.h

    r70421 r92555  
    9292// warning C4200: nonstandard extension used : zero-sized array in struct/union
    9393// Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array
    94 #if COMPILER(MSVC)
     94#if COMPILER(MSVC) && !COMPILER(INTEL)
    9595        unsigned char m_data[INT_MAX];
    9696#else

  • trunk/Source/JavaScriptCore/wtf/NullPtr.h

    r90915 r92555  
    3636#endif
    3737
    38 #if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600)
     38#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL))
    3939
    4040#define HAVE_NULLPTR 1

  • trunk/Source/WebCore/ChangeLog

    r92553 r92555  
     12011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] Fix build with Intel compiler on Windows
     6        https://bugs.webkit.org/show_bug.cgi?id=65088
     7
     8        Intel compiler needs .lib suffixes instead of .a
     9
     10        * WebCore.pri:
     11
    1122011-08-06  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Source/WebCore/WebCore.pri

    r91752 r92555  
    356356    pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
    357357
    358     win32-msvc*|wince* {
     358    win32-msvc*|wince*|win32-icc {
    359359        LIBS = -l$$WEBCORE_TARGET $$LIBS
    360360        LIBS = -L$$pathToWebCoreOutput $$LIBS

  • trunk/Source/WebKit.pri

    r91354 r92555  
    160160# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
    161161win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
     162win32-icc: QMAKE_CXXFLAGS += -wd873
    162163
    163164CONFIG(qt_minimal) {

  • trunk/Source/WebKit2/ChangeLog

    r92491 r92555  
     12011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] Fix build with Intel compiler on Windows
     6        https://bugs.webkit.org/show_bug.cgi?id=65088
     7
     8        Intel compiler needs .lib suffixes instead of .a
     9
     10        * WebKit2.pri:
     11
    1122011-08-05  Darin Adler  <darin@apple.com>
    213

  • trunk/Source/WebKit2/WebKit2.pri

    r90578 r92555  
    6767    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
    6868
    69     win32-msvc*|wince* {
     69    win32-msvc*|wince*|win32-icc {
    7070        LIBS = -l$$WEBKIT2_TARGET $$LIBS
    7171        LIBS = -L$$pathToWebKit2Output $$LIBS
Note: See TracChangeset for help on using the changeset viewer.