Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 62394: [CMAKE] * Remove some unsupported warning from the Clang build.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:57:57 2014 New Revision: 62394 URL: http://svn.reactos.org/svn/reactos?rev=62394&view=rev Log: [CMAKE] * Remove some unsupported warning from the Clang build. Modified: trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Sun Mar 2 20:57:57 2014 @@ -19,6 +19,6 @@ add_dependencies(cardlib psdk) add_pch(cardlib cardlib.h SOURCE) -if(NOT MSVC) +if(NOT MSVC AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(cardlib "-Wno-unused-but-set-variable") endif()

1 0

[tkreuzer] 62393: [PSEH3] - Switch parameters in _SEH3$_RegisterFrame and _SEH3$_RegisterTryLevel (just for consistency) - rename _SEH3$_RegisterTryLevel macro to _SEH3$_RegisterTryLevel_ - Add Try...
by tkreuzer＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: tkreuzer Date: Sun Mar 2 20:54:04 2014 New Revision: 62393 URL: http://svn.reactos.org/svn/reactos?rev=62393&view=rev Log: [PSEH3] - Switch parameters in _SEH3$_RegisterFrame and _SEH3$_RegisterTryLevel (just for consistency) - rename _SEH3$_RegisterTryLevel macro to _SEH3$_RegisterTryLevel_ - Add TryLevel and HandlerType fields to the scope table, since we'll need these later - Start factoring out some Clang specific macros Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3_i386.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Mar 2 20:54:04 2014 @@ -21,6 +21,8 @@ { void *Target; void *Filter; + unsigned char TryLevel; + unsigned char HandlerType; } SEH3$_SCOPE_TABLE, *PSEH3$_SCOPE_TABLE; typedef struct _SEH3$_EXCEPTION_POINTERS @@ -57,6 +59,7 @@ /* Prevent gcc from inlining functions that use SEH. */ static inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH3$_PreventInlining() {} +/* Unregister the root frame */ extern inline __attribute__((always_inline,gnu_inline)) void _SEH3$_UnregisterFrame(volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame) { @@ -64,6 +67,7 @@ : : [NewHead] "ir" (RegistrationFrame->Next) : "memory"); } +/* Unregister a trylevel frame */ extern inline __attribute__((always_inline,gnu_inline)) void _SEH3$_UnregisterTryLevel( volatile SEH3$_REGISTRATION_FRAME *TrylevelFrame) @@ -84,41 +88,80 @@ unsigned long __cdecl __attribute__((error("Can only be used inside an exception filter or __except block."))) _exception_code(void); void * __cdecl __attribute__((error("Can only be used inside an exception filter."))) _exception_info(void); -/* Define the registers that get clobbered, when reaching the __except block. - We specify ebp on optimized builds without frame pointer, since it will be - used by GCC as a general purpose register then. */ -#if defined(__OPTIMIZE__) && defined(_ALLOW_OMIT_FRAME_POINTER) -#define _SEH3$_CLOBBER_ON_EXCEPTION "ebp", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" -#else -#define _SEH3$_CLOBBER_ON_EXCEPTION "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" -#endif - /* This attribute allows automatic cleanup of the registered frames */ #define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup))) -#define _SEH3$_ASM_GOTO(_Asm, _Label, ...) asm goto (_Asm : : : "memory", ## __VA_ARGS__ : _Label) +/* CLANG specific definitions! */ +#ifdef __clang__ + +/* CLANG doesn't have asm goto! */ +#define _SEH3$_ASM_GOTO(_Label, ...) + +int +__attribute__((regparm(2))) +__attribute__((returns_twice)) +_SEH3$_RegisterFrameWithNonVolatiles( + volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, + const SEH3$_SCOPE_TABLE* ScopeTable); + +#define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \ + do { \ + int result = _SEH3$_RegisterFrameWithNonVolatiles(_TrylevelFrame, _DataTable); \ + if (__builtin_expect(result != 0, 0)) \ + { \ + if (result == 1) goto _SEH3$_l_FilterOrFinally; \ + if (result == 2) goto _SEH3$_l_HandlerTarget; \ + goto _SEH3$_l_BeforeFilterOrFinally; \ + } \ + } while(0) + +int +__attribute__((regparm(2))) +__attribute__((returns_twice)) +_SEH3$_RegisterTryLevelWithNonVolatiles( + volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, + const SEH3$_SCOPE_TABLE* ScopeTable); + +#define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \ + do { \ + int result = _SEH3$_RegisterTryLevelWithNonVolatiles(_TrylevelFrame, _DataTable); \ + if (__builtin_expect(result != 0, 0)) \ + { \ + if (result == 1) goto _SEH3$_l_FilterOrFinally; \ + if (result == 2) goto _SEH3$_l_HandlerTarget; \ + goto _SEH3$_l_BeforeFilterOrFinally; \ + } \ + } while(0) + +#else /* !__clang__ */ + +#define _SEH3$_ASM_GOTO(_Label, ...) asm goto ("#\n" : : : "memory", ## __VA_ARGS__ : _Label) + +/* This is an asm wrapper around _SEH3$_RegisterFrame */ +#define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \ + asm goto ("leal %1, %%edx\n" \ + "call __SEH3$_RegisterFrame\n" \ + : \ + : "a" (_TrylevelFrame), "m" (*(_DataTable)) \ + : "ecx", "edx", "memory" \ + : _SEH3$_l_HandlerTarget) + +/* This is an asm wrapper around _SEH3$_RegisterTryLevel */ +#define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \ + asm goto ("leal %1, %%edx\n" \ + "call __SEH3$_RegisterTryLevel\n" \ + : \ + : "a" (_TrylevelFrame), "m" (*(_DataTable)) \ + : "ecx", "edx", "memory" \ + : _SEH3$_l_HandlerTarget) + +#endif /* __clang__ */ + #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } -/* This is an asm wrapper around _SEH3$_RegisterFrame */ -#define _SEH3$_RegisterFrame(_TrylevelFrame, _DataTable, _Target) \ - asm goto ("leal %0, %%edx\n" \ - "call __SEH3$_RegisterFrame\n" \ - : \ - : "m" (*(_TrylevelFrame)), "a" (_DataTable) \ - : "ecx", "edx", "memory" \ - : _Target) - -/* This is an asm wrapper around _SEH3$_EnterTryLevel */ -#define _SEH3$_RegisterTryLevel(_TrylevelFrame, _DataTable, _Target) \ - asm goto ("leal %0, %%edx\n" \ - "call __SEH3$_RegisterTryLevel\n" \ - : \ - : "m" (*(_TrylevelFrame)), "a" (_DataTable) \ - : "ecx", "edx", "memory" \ - : _Target) /* On GCC the filter function is a nested function with __fastcall calling convention. The eax register contains a base address the function uses @@ -176,13 +219,22 @@ _SEH3$_FinallyFunction(1); \ } +/* Define the registers that get clobbered, when reaching the __except block. + We specify ebp on optimized builds without frame pointer, since it will be + used by GCC as a general purpose register then. */ +#if defined(__OPTIMIZE__) && defined(_ALLOW_OMIT_FRAME_POINTER) +#define _SEH3$_CLOBBER_ON_EXCEPTION "ebp", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" +#else +#define _SEH3$_CLOBBER_ON_EXCEPTION "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" +#endif + /* This construct scares GCC so much, that it will stop moving code around into places that are never executed. */ #define _SEH3$_SCARE_GCC() \ void *plabel; \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_BeforeTry); \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_HandlerTarget); \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \ + _SEH3$_ASM_GOTO(_SEH3$_l_BeforeTry); \ + _SEH3$_ASM_GOTO(_SEH3$_l_HandlerTarget); \ + _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \ : _SEH3$_CLOBBER_ON_EXCEPTION ); \ goto _SEH3$_l_OnException; @@ -226,7 +278,7 @@ goto _SEH3$_l_EndTry; \ \ _SEH3$_l_BeforeTry: (void)0; \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \ + _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Forward declaration of the filter function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \ @@ -235,8 +287,8 @@ static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { &&_SEH3$_l_HandlerTarget, _SEH3$_FILTER(&_SEH3$_FilterFunction, (__VA_ARGS__)) }; \ \ /* Register the registration record. */ \ - if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \ - else _SEH3$_RegisterTryLevel(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \ + if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ + else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ \ /* Emit the filter function */ \ _SEH3$_DEFINE_FILTER_FUNC(_SEH3$_FilterFunction, (__VA_ARGS__)) \ @@ -268,7 +320,7 @@ goto _SEH3$_l_EndTry; \ \ _SEH3$_l_BeforeTry: (void)0; \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \ + _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Forward declaration of the finally function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \ @@ -277,8 +329,8 @@ static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, &_SEH3$_FinallyFunction }; \ \ /* Register the registration record. */ \ - if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \ - else _SEH3$_RegisterTryLevel(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable, _SEH3$_l_HandlerTarget); \ + if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ + else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ \ goto _SEH3$_l_DoTry; \ \ @@ -300,7 +352,7 @@ _SEH3$_SCARE_GCC() \ \ _SEH3$_l_EndTry:(void)0; \ - _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \ + _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Implementation of the auto cleanup function */ \ _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ Modified: trunk/reactos/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_i386.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] Sun Mar 2 20:54:04 2014 @@ -18,37 +18,37 @@ * __attribute__((regparm(2))) * __attribute__((returns_twice)) * _SEH3$_RegisterFrame[WithNonVolatiles]( - * PSEH_DATA_TABLE DataTable<eax>, - * PSEH_REGISTRATION_FRAME RegistrationRecord<edx>); + * PSEH3$_REGISTRATION_FRAME RegistrationFrame<eax>, + * PSEH3$_SCOPE_TABLE ScopeTable<edx>); */ .global __SEH3$_RegisterFrameWithNonVolatiles __SEH3$_RegisterFrameWithNonVolatiles: /* Save non-volatiles in the registration frame */ - mov [edx + SEH3_REGISTRATION_FRAME_Ebx], ebx - mov [edx + SEH3_REGISTRATION_FRAME_Esi], esi - mov [edx + SEH3_REGISTRATION_FRAME_Edi], edi + mov [eax + SEH3_REGISTRATION_FRAME_Ebx], ebx + mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi + mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi .global __SEH3$_RegisterFrame __SEH3$_RegisterFrame: /* Save the address of the static data table */ - mov [edx + SEH3_REGISTRATION_FRAME_ScopeTable], eax + mov [eax + SEH3_REGISTRATION_FRAME_ScopeTable], edx /* Set the handler address */ - mov dword ptr [edx + SEH3_REGISTRATION_FRAME_Handler], offset __SEH3$_except_handler + mov dword ptr [eax + SEH3_REGISTRATION_FRAME_Handler], offset __SEH3$_except_handler /* Set this as the end of the internal chain */ - mov dword ptr [edx + SEH3_REGISTRATION_FRAME_EndOfChain], edx + mov dword ptr [eax + SEH3_REGISTRATION_FRAME_EndOfChain], eax /* Register the frame in the TEB */ - mov eax, dword ptr fs:[0] - mov [edx + SEH3_REGISTRATION_FRAME_Next], eax - mov dword ptr fs:[0], edx + mov edx, dword ptr fs:[0] + mov [eax + SEH3_REGISTRATION_FRAME_Next], edx + mov dword ptr fs:[0], eax /* Save the stack registers */ - mov [edx + SEH3_REGISTRATION_FRAME_Esp], esp - mov [edx + SEH3_REGISTRATION_FRAME_Ebp], ebp + mov [eax + SEH3_REGISTRATION_FRAME_Esp], esp + mov [eax + SEH3_REGISTRATION_FRAME_Ebp], ebp /* Set eax to 0 to indicate 1st return */ xor eax, eax @@ -60,39 +60,39 @@ * __attribute__((regparm(2))) * __attribute__((returns_twice)) * _SEH3$_RegisterTryLevel[WithNonVolatiles]( - * PSEH_DATA_TABLE DataTable<eax>, - * PSEH_REGISTRATION_FRAME RegistrationRecord<edx>); + * PSEH3$_REGISTRATION_FRAME RegistrationFrame<edx>, + * PSEH3$_SCOPE_TABLE ScopeTable<eax>); */ .global __SEH3$_RegisterTryLevelWithNonVolatiles __SEH3$_RegisterTryLevelWithNonVolatiles: /* Save non-volatiles in the registration frame */ - mov [edx + SEH3_REGISTRATION_FRAME_Ebx], ebx - mov [edx + SEH3_REGISTRATION_FRAME_Esi], esi - mov [edx + SEH3_REGISTRATION_FRAME_Edi], edi + mov [eax + SEH3_REGISTRATION_FRAME_Ebx], ebx + mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi + mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi .global __SEH3$_RegisterTryLevel __SEH3$_RegisterTryLevel: /* Save the address of the static data table */ - mov [edx + SEH3_REGISTRATION_FRAME_ScopeTable], eax + mov [eax + SEH3_REGISTRATION_FRAME_ScopeTable], edx /* Set the handler address to NULL as identification */ - and dword ptr [edx + SEH3_REGISTRATION_FRAME_Handler], 0 + and dword ptr [eax + SEH3_REGISTRATION_FRAME_Handler], 0 /* Get the current registered frame */ - mov eax, dword ptr fs:[0] + mov edx, dword ptr fs:[0] /* Get the current end of the chain and set this as Next */ - mov ecx, [eax + SEH3_REGISTRATION_FRAME_EndOfChain] - mov [edx + SEH3_REGISTRATION_FRAME_Next], ecx + mov ecx, [edx + SEH3_REGISTRATION_FRAME_EndOfChain] + mov [eax + SEH3_REGISTRATION_FRAME_Next], ecx /* Set this as the end of the internal chain */ - mov dword ptr [eax + SEH3_REGISTRATION_FRAME_EndOfChain], edx + mov dword ptr [edx + SEH3_REGISTRATION_FRAME_EndOfChain], eax /* Save the stack registers */ - mov [edx + SEH3_REGISTRATION_FRAME_Esp], esp - mov [edx + SEH3_REGISTRATION_FRAME_Ebp], ebp + mov [eax + SEH3_REGISTRATION_FRAME_Esp], esp + mov [eax + SEH3_REGISTRATION_FRAME_Ebp], ebp /* Set eax to 0 to indicate 1st return */ xor eax, eax

1 0

[akhaldi] 62392: [CMAKE] * Add a Clang toolchain file. Only Windows build is tested ATM.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:51:42 2014 New Revision: 62392 URL: http://svn.reactos.org/svn/reactos?rev=62392&view=rev Log: [CMAKE] * Add a Clang toolchain file. Only Windows build is tested ATM. Added: trunk/reactos/toolchain-clang.cmake (with props) Added: trunk/reactos/toolchain-clang.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-clang.cmake?rev=… ============================================================================== --- trunk/reactos/toolchain-clang.cmake (added) +++ trunk/reactos/toolchain-clang.cmake [iso-8859-1] Sun Mar 2 20:51:42 2014 @@ -0,0 +1,64 @@ + +if(NOT ARCH) + set(ARCH i386) +endif() + +# Choose the right MinGW toolchain prefix +if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX) + if(ARCH STREQUAL "i386") + + if(CMAKE_HOST_WIN32) + set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") + else() + if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1) + set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix") + else() + set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") + endif() + endif() + + elseif(ARCH STREQUAL "amd64") + set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix") + elseif(ARCH STREQUAL "arm") + set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix") + endif() +endif() + +if (NOT DEFINED MINGW_TOOLCHAIN_SUFFIX) + set(MINGW_TOOLCHAIN_SUFFIX "" CACHE STRING "MinGW Toolchain Suffix") +endif() + +if(ENABLE_CCACHE) + set(CCACHE "ccache" CACHE STRING "ccache") +else() + set(CCACHE "" CACHE STRING "ccache") +endif() + +# The name of the target operating system +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR i686) + +# Which tools to use +set(CMAKE_C_COMPILER clang) +set(CMAKE_CXX_COMPILER clang++) +set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_ASM_COMPILER_ID "GNU") +set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) +set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) +set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) + +if(NOT LTCG) + set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") +else() + set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") +endif() +set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) +set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) + +# Don't link with anything by default unless we say so +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") + +#MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) +set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") + +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") Propchange: trunk/reactos/toolchain-clang.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 62391: [CMAKE] * Disable PCH in Clang builds. We'll inspect this later.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:47:34 2014 New Revision: 62391 URL: http://svn.reactos.org/svn/reactos?rev=62391&view=rev Log: [CMAKE] * Disable PCH in Clang builds. We'll inspect this later. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62391&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Mar 2 20:47:34 2014 @@ -134,7 +134,7 @@ add_definitions(-D_WINKD_=1) endif() - if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")) + if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) set(PCH 1) else() set(PCH 0)

1 0

[akhaldi] 62390: [NDK] * Fix a Clang warning.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:43:19 2014 New Revision: 62390 URL: http://svn.reactos.org/svn/reactos?rev=62390&view=rev Log: [NDK] * Fix a Clang warning. Modified: trunk/reactos/include/ndk/vffuncs.h Modified: trunk/reactos/include/ndk/vffuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vffuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/vffuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/vffuncs.h [iso-8859-1] Sun Mar 2 20:43:19 2014 @@ -38,7 +38,6 @@ ); VOID -NTAPI VfFailDeviceNode( _In_ PDEVICE_OBJECT PhysicalDeviceObject, _In_ ULONG BugCheckMajorCode,

1 0

[akhaldi] 62389: [CRT/INTRIN_X86] * In Clang these are built-ins.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:42:26 2014 New Revision: 62389 URL: http://svn.reactos.org/svn/reactos?rev=62389&view=rev Log: [CRT/INTRIN_X86] * In Clang these are built-ins. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Mar 2 20:42:26 2014 @@ -186,10 +186,12 @@ return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } +#ifndef __clang__ __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } +#endif __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { @@ -224,10 +226,12 @@ return __sync_fetch_and_add(Addend, Value); } +#ifndef __clang__ __INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { return __sync_fetch_and_add(Addend, Value); } +#endif #if defined(_M_AMD64) __INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value) @@ -302,6 +306,7 @@ } #endif +#ifndef __clang__ __INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); @@ -311,6 +316,7 @@ { return __sync_add_and_fetch(lpAddend, 1); } +#endif __INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) {

1 0

[akhaldi] 62388: [CMAKE] * Disable the MS extensions warning in Clang build.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:41:36 2014 New Revision: 62388 URL: http://svn.reactos.org/svn/reactos?rev=62388&view=rev Log: [CMAKE] * Disable the MS extensions warning in Clang build. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62388&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 2 20:41:36 2014 @@ -33,6 +33,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_flags_language("-std=gnu89" "C") + add_compile_flags("-Wno-microsoft") endif() add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX")

1 0

[akhaldi] 62387: [CMAKE] * Use the GCC compatible dialect in Clang builds.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:27:39 2014 New Revision: 62387 URL: http://svn.reactos.org/svn/reactos?rev=62387&view=rev Log: [CMAKE] * Use the GCC compatible dialect in Clang builds. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62387&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 2 20:27:39 2014 @@ -29,6 +29,10 @@ add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags_language("-std=gnu89" "C") endif() add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX")

1 0

[akhaldi] 62386: [CMAKE] * Remove some unsupported flags from the Clang build options.
by akhaldi＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: akhaldi Date: Sun Mar 2 20:08:07 2014 New Revision: 62386 URL: http://svn.reactos.org/svn/reactos?rev=62386&view=rev Log: [CMAKE] * Remove some unsupported flags from the Clang build options. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62386&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 2 20:08:07 2014 @@ -40,13 +40,19 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() -add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS") + +if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS") +endif() # Debugging if(SEPARATE_DBG) add_compile_flags("-gdwarf-2 -g2") else() - add_compile_flags("-gdwarf-2 -gstrict-dwarf -femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") + add_compile_flags("-gdwarf-2 -gstrict-dwarf") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") + endif() endif() # For some reason, cmake sets -fPIC, and we don't want it @@ -63,8 +69,14 @@ # Warnings, errors add_compile_flags("-Werror -Wall -Wpointer-arith") -add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized") -add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=narrowing") +add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value") + +if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-Wno-maybe-uninitialized") + add_compile_flags("-Wno-error=unused-but-set-variable") +endif() + +add_compile_flags("-Wno-error=narrowing") add_compile_flags("-Wtype-limits -Wno-error=type-limits") if(ARCH STREQUAL "amd64") @@ -96,7 +108,10 @@ endif() if(ARCH STREQUAL "i386") - add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + add_compile_flags("-fno-optimize-sibling-calls -fno-omit-frame-pointer") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable") + endif() # FIXME: this doesn't work. CMAKE_BUILD_TYPE is always "Debug" if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") add_compile_flags("-momit-leaf-frame-pointer") @@ -174,9 +189,13 @@ set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> -Wa,--compress-debug-sections <FLAGS> -o <OBJECT> -c <SOURCE>") +if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") +endif() + +SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>") SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") -set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -Wa,--compress-debug-sections -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX} -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ")

1 0

[tkreuzer] 62385: [CMAKE] Add simple clang support to configure.cmp (use "configure clang", which will use ninja as the generator and clang as the compiler)
by tkreuzer＠svn.reactos.org 02 Mar '14

02 Mar '14

Author: tkreuzer Date: Sun Mar 2 19:53:15 2014 New Revision: 62385 URL: http://svn.reactos.org/svn/reactos?rev=62385&view=rev Log: [CMAKE] Add simple clang support to configure.cmp (use "configure clang", which will use ninja as the generator and clang as the compiler) Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=62385&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Mar 2 19:53:15 2014 @@ -37,6 +37,9 @@ set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" ) else if /I "%1" == "Makefiles" ( set CMAKE_GENERATOR="MinGW Makefiles" + ) else if /I "%1" == "clang" ( + set BUILD_ENVIRONMENT=Clang + set CMAKE_GENERATOR="Ninja" ) else ( set CMAKE_GENERATOR="Ninja" ) @@ -151,6 +154,8 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" +) else if "%BUILD_ENVIRONMENT%" == "Clang" ( + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-clang.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" )

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs