Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 07/07: [CRT] Fix rot functions aliases in non-x86 clang builds

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=620f3332521b7912e2403… commit 620f3332521b7912e24032bed4e1764562a674ae Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 14:59:33 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 15:00:07 2021 +0200 [CRT] Fix rot functions aliases in non-x86 clang builds --- sdk/lib/crt/stdlib/rot.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sdk/lib/crt/stdlib/rot.c b/sdk/lib/crt/stdlib/rot.c index 51a6a6c0218..cb82df097fd 100644 --- a/sdk/lib/crt/stdlib/rot.c +++ b/sdk/lib/crt/stdlib/rot.c @@ -11,25 +11,27 @@ #include <stdlib.h> #ifdef __clang__ -#define _rotl __function_rotl -#define _rotr __function_rotr -#define _lrotl __function_lrotl -#define _lrotr __function_lrotr +# define _rotl __function_rotl +# define _rotr __function_rotr +# define _lrotl __function_lrotl +# define _lrotr __function_lrotr #elif defined(_MSC_VER) -#pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) +# pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) #endif #if defined (__clang__) && !defined(_MSC_VER) -#define ASM_ALIAS __asm__ -#else -#define ASM_ALIAS(x) +# ifdef _M_IX86 +unsigned int _rotr( unsigned int value, int shift ) __asm__("__rotr"); +unsigned long _lrotr(unsigned long value, int shift) __asm__("__lrotr"); +unsigned int _rotl( unsigned int value, int shift ) __asm__("__rotl"); +unsigned long _lrotl( unsigned long value, int shift ) __asm__("__lrotl"); +# else +unsigned int _rotr( unsigned int value, int shift ) __asm__("_rotr"); +unsigned long _lrotr(unsigned long value, int shift) __asm__("_lrotr"); +unsigned int _rotl( unsigned int value, int shift ) __asm__("_rotl"); +unsigned long _lrotl( unsigned long value, int shift ) __asm__("_lrotl"); +# endif #endif - -unsigned int _rotr( unsigned int value, int shift ) ASM_ALIAS("__rotr"); -unsigned long _lrotr(unsigned long value, int shift) ASM_ALIAS("__lrotr"); -unsigned int _rotl( unsigned int value, int shift ) ASM_ALIAS("__rotl"); -unsigned long _lrotl( unsigned long value, int shift ) ASM_ALIAS("__lrotl"); - /* * @implemented */

3 years, 5 months

[reactos] 06/07: [CRT] Add a generic C version of exp2(f) and use it for all architecture

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=199adee3fede28245b1ab… commit 199adee3fede28245b1ab75107b327f77a7f2810 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 14:33:27 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 14:59:07 2021 +0200 [CRT] Add a generic C version of exp2(f) and use it for all architecture --- sdk/lib/crt/math/exp2.c | 13 +++++++++++++ sdk/lib/crt/math/exp2f.c | 13 +++++++++++++ sdk/lib/crt/math/i386/exp2_asm.s | 38 -------------------------------------- sdk/lib/crt/msvcrtex.cmake | 8 ++++++-- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/sdk/lib/crt/math/exp2.c b/sdk/lib/crt/math/exp2.c new file mode 100644 index 00000000000..e843be9fffd --- /dev/null +++ b/sdk/lib/crt/math/exp2.c @@ -0,0 +1,13 @@ + +#include <math.h> + +_Check_return_ +double +__cdecl +exp2( + _In_ double x) +{ + /* This below avoids clang to optimize our pow call to exp2 */ + static const TWO = 2.0; + return pow(TWO, x); +} diff --git a/sdk/lib/crt/math/exp2f.c b/sdk/lib/crt/math/exp2f.c new file mode 100644 index 00000000000..292308ae521 --- /dev/null +++ b/sdk/lib/crt/math/exp2f.c @@ -0,0 +1,13 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +exp2f( + _In_ float x) +{ + /* This below avoids clang to optimize our pow call to exp2 */ + static const TWO = 2.0f; + return powf(TWO, x); +} diff --git a/sdk/lib/crt/math/i386/exp2_asm.s b/sdk/lib/crt/math/i386/exp2_asm.s deleted file mode 100644 index d2ab14d63b1..00000000000 --- a/sdk/lib/crt/math/i386/exp2_asm.s +++ /dev/null @@ -1,38 +0,0 @@ -#include <asm.inc> - -PUBLIC _exp2 - -/* FUNCTIONS ***************************************************************/ -.code - -_exp2: - push ebp - mov ebp, esp - - fld qword ptr [ebp + 8] - fxam - fstsw ax - fwait - sahf - jnp .not_inf - jnc .not_inf - test ah, 2 - jz .done - fstp st - fldz - jmp .done -.not_inf: - fst st(1) - frndint - fxch st(1) - fsub st, st(1) - f2xm1 - fld1 - faddp st(1), st - fscale - fstp st(1) -.done: - pop ebp - ret - -END diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index a9ebe297330..d438a841d31 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -43,6 +43,12 @@ else() list(APPEND MSVCRTEX_SOURCE startup/pseudo-reloc.c startup/pseudo-reloc-list.c) + if (CLANG) + # CLang performs some optimisations requiring those funtions + list(APPEND MSVCRTEX_SOURCE + math/exp2.c + math/exp2f.c) + endif() endif() if(ARCH STREQUAL "i386") @@ -51,10 +57,8 @@ if(ARCH STREQUAL "i386") except/i386/chkstk_ms.s math/i386/alldiv_asm.s) if (GCC AND CLANG) - # CLang performs some optimisations requiring those funtions list(APPEND MSVCRTEX_ASM_SOURCE math/i386/ceilf.S - math/i386/exp2_asm.s math/i386/floorf.S) list(APPEND MSVCRTEX_SOURCE math/i386/sqrtf.c)

3 years, 5 months

[reactos] 05/07: [PSEH] Each amd64 compiler that we use support SEH

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a19ca409ae6dd035f04d9… commit a19ca409ae6dd035f04d9e6079e4923fa339e044 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 12:36:04 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 12:36:04 2021 +0200 [PSEH] Each amd64 compiler that we use support SEH --- sdk/lib/pseh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/pseh/CMakeLists.txt b/sdk/lib/pseh/CMakeLists.txt index ae121a820a7..3a5f46e282e 100644 --- a/sdk/lib/pseh/CMakeLists.txt +++ b/sdk/lib/pseh/CMakeLists.txt @@ -12,7 +12,7 @@ elseif(ARCH STREQUAL "arm") arm/seh_prolog.s) endif() -if(MSVC OR (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND ARCH STREQUAL "amd64")) +if(MSVC OR ARCH STREQUAL "amd64") list(APPEND SOURCE dummy.c) add_asm_files(pseh_asm ${ASM_SOURCE})

3 years, 5 months

[reactos] 04/07: [CMAKE] Also set GCC/CLANG variables on amd64 builds

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76a241dea6905f242c075… commit 76a241dea6905f242c0758cbc6b1121356fdb0bd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 12:35:30 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 12:35:30 2021 +0200 [CMAKE] Also set GCC/CLANG variables on amd64 builds --- sdk/cmake/config-amd64.cmake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake index 110a0f218af..01ef763c719 100644 --- a/sdk/cmake/config-amd64.cmake +++ b/sdk/cmake/config-amd64.cmake @@ -44,3 +44,22 @@ set(_PREFAST_ FALSE CACHE BOOL cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(GCC TRUE CACHE BOOL "The compiler is GCC") + set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") +elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + # We can use LLVM Clang mimicking CL or GCC. Account for this + if (MSVC) + set(GCC FALSE CACHE BOOL "The compiler is GCC") + else() + set(GCC TRUE CACHE BOOL "The compiler is GCC") + endif() + set(CLANG TRUE CACHE BOOL "The compiler is LLVM Clang") +elseif(MSVC) # aka CMAKE_C_COMPILER_ID STEQUAL "MSVC" + set(GCC FALSE CACHE BOOL "The compiler is GCC") + set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") + # MSVC variable is already set by cmake +else() + message("WARNING: the compiler has not been recognized") +endif()

3 years, 5 months

[reactos] 03/07: [CRT] Do not try to implement x86_64 builtins of clang

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc3a471413ff2d5e33348… commit bc3a471413ff2d5e333483fde09ba377fc7af4a2 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 10:33:05 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 10:33:05 2021 +0200 [CRT] Do not try to implement x86_64 builtins of clang --- sdk/include/crt/mingw32/intrin_x86.h | 67 +++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index ee41ff971a2..2ba1ed1258c 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -120,7 +120,7 @@ __INTRIN_INLINE void _mm_sfence(void) } #endif -#ifdef __x86_64__ +#if defined(__x86_64__) && !HAS_BUILTIN(__faststorefence) __INTRIN_INLINE void __faststorefence(void) { long local; @@ -197,7 +197,7 @@ __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * Target, voi } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedExchange64) __INTRIN_INLINE long long _InterlockedExchange64(volatile long long * Target, long long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ @@ -227,7 +227,7 @@ __INTRIN_INLINE long __cdecl _InterlockedExchangeAdd(volatile long * Addend, lon } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedExchangeAdd64) __INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * Addend, long long Value) { return __sync_fetch_and_add(Addend, Value); @@ -255,7 +255,7 @@ __INTRIN_INLINE long _InterlockedAnd(volatile long * value, long mask) } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedAnd64) __INTRIN_INLINE long long _InterlockedAnd64(volatile long long * value, long long mask) { return __sync_fetch_and_and(value, mask); @@ -283,7 +283,7 @@ __INTRIN_INLINE long _InterlockedOr(volatile long * value, long mask) } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedOr64) __INTRIN_INLINE long long _InterlockedOr64(volatile long long * value, long long mask) { return __sync_fetch_and_or(value, mask); @@ -311,7 +311,7 @@ __INTRIN_INLINE long _InterlockedXor(volatile long * value, long mask) } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedXor64) __INTRIN_INLINE long long _InterlockedXor64(volatile long long * value, long long mask) { return __sync_fetch_and_xor(value, mask); @@ -347,16 +347,20 @@ __INTRIN_INLINE short _InterlockedIncrement16(volatile short * lpAddend) #endif #if defined(__x86_64__) +#if !HAS_BUILTIN(_InterlockedIncrement64) __INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } +#endif +#if !HAS_BUILTIN(_InterlockedIncrement64) __INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); } #endif +#endif #else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ @@ -672,6 +676,7 @@ __INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) #endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ +#if !HAS_BUILTIN(_InterlockedCompareExchange64) #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Destination, long long Exchange, long long Comperand) @@ -680,8 +685,6 @@ __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Des } #else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) */ - -#if !HAS_BUILTIN(_InterlockedCompareExchange64) __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Destination, long long Exchange, long long Comperand) { long long retval = Comperand; @@ -698,9 +701,8 @@ __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Des return retval; } -#endif - #endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) */ +#endif /* !HAS_BUILTIN(_InterlockedCompareExchange64) */ #ifdef __i386__ __INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * Addend, long Value) @@ -729,13 +731,14 @@ __INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, lon } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_interlockedbittestandreset64) __INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * a, long long b) { unsigned char retval; __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } + #endif #if !HAS_BUILTIN(_interlockedbittestandset) @@ -747,7 +750,7 @@ __INTRIN_INLINE unsigned char _interlockedbittestandset(volatile long * a, long } #endif -#if defined(__x86_64__) +#if defined(__x86_64__) && !HAS_BUILTIN(_interlockedbittestandset64) __INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a, long long b) { unsigned char retval; @@ -869,33 +872,41 @@ __INTRIN_INLINE void __writegsqword(unsigned long Offset, unsigned long long Dat __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } +#if !HAS_BUILTIN(__readgsbyte) __INTRIN_INLINE unsigned char __readgsbyte(unsigned long Offset) { unsigned char value; __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } +#endif +#if !HAS_BUILTIN(__readgsword) __INTRIN_INLINE unsigned short __readgsword(unsigned long Offset) { unsigned short value; __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } +#endif +#if !HAS_BUILTIN(__readgsdword) __INTRIN_INLINE unsigned long __readgsdword(unsigned long Offset) { unsigned long value; __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } +#endif +#if !HAS_BUILTIN(__readgsqword) __INTRIN_INLINE unsigned long long __readgsqword(unsigned long Offset) { unsigned long long value; __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } +#endif __INTRIN_INLINE void __incgsbyte(unsigned long Offset) { @@ -1060,6 +1071,7 @@ __INTRIN_INLINE unsigned char _bittest(const long * a, long b) #endif #ifdef __x86_64__ +#if !HAS_BUILTIN(_BitScanForward64) __INTRIN_INLINE unsigned char _BitScanForward64(unsigned long * Index, unsigned long long Mask) { unsigned long long Index64; @@ -1067,7 +1079,9 @@ __INTRIN_INLINE unsigned char _BitScanForward64(unsigned long * Index, unsigned *Index = Index64; return Mask ? 1 : 0; } +#endif +#if !HAS_BUILTIN(_BitScanReverse64) __INTRIN_INLINE unsigned char _BitScanReverse64(unsigned long * Index, unsigned long long Mask) { unsigned long long Index64; @@ -1075,7 +1089,9 @@ __INTRIN_INLINE unsigned char _BitScanReverse64(unsigned long * Index, unsigned *Index = Index64; return Mask ? 1 : 0; } +#endif +#if !HAS_BUILTIN(_bittest64) __INTRIN_INLINE unsigned char _bittest64(const long long * a, long long b) { unsigned char retval; @@ -1088,6 +1104,7 @@ __INTRIN_INLINE unsigned char _bittest64(const long long * a, long long b) return retval; } #endif +#endif #if !HAS_BUILTIN(_bittestandcomplement) __INTRIN_INLINE unsigned char _bittestandcomplement(long * a, long b) @@ -1132,7 +1149,7 @@ __INTRIN_INLINE unsigned char _bittestandset(long * a, long b) #endif #ifdef __x86_64__ - +#if !HAS_BUILTIN(_bittestandset64) __INTRIN_INLINE unsigned char _bittestandset64(long long * a, long long b) { unsigned char retval; @@ -1144,7 +1161,9 @@ __INTRIN_INLINE unsigned char _bittestandset64(long long * a, long long b) return retval; } +#endif +#if !HAS_BUILTIN(_bittestandreset64) __INTRIN_INLINE unsigned char _bittestandreset64(long long * a, long long b) { unsigned char retval; @@ -1156,7 +1175,9 @@ __INTRIN_INLINE unsigned char _bittestandreset64(long long * a, long long b) return retval; } +#endif +#if !HAS_BUILTIN(_bittestandcomplement64) __INTRIN_INLINE unsigned char _bittestandcomplement64(long long * a, long long b) { unsigned char retval; @@ -1168,7 +1189,7 @@ __INTRIN_INLINE unsigned char _bittestandcomplement64(long long * a, long long b return retval; } - +#endif #endif /* __x86_64__ */ #if !HAS_BUILTIN(_rotl8) @@ -1198,6 +1219,7 @@ __INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift) } #endif +#if !HAS_BUILTIN(_rotl64) #ifdef __x86_64__ __INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) { @@ -1206,14 +1228,13 @@ __INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) return retval; } #else /* __x86_64__ */ -#if !HAS_BUILTIN(_rotl64) __INTRIN_INLINE unsigned long long __cdecl _rotl64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value << shift) | (value >> (64 - shift)); } -#endif /* !HAS_BUILTIN(_rotl64) */ #endif /* __x86_64__ */ +#endif /* !HAS_BUILTIN(_rotl64) */ #if !HAS_BUILTIN(_rotr) __INTRIN_INLINE unsigned int __cdecl _rotr(unsigned int value, int shift) @@ -1242,6 +1263,7 @@ __INTRIN_INLINE unsigned short __cdecl _rotr16(unsigned short value, unsigned ch } #endif +#if !HAS_BUILTIN(_rotr64) #ifdef __x86_64__ __INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) { @@ -1250,14 +1272,13 @@ __INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) return retval; } #else /* __x86_64__ */ -#if !HAS_BUILTIN(_rotr64) __INTRIN_INLINE unsigned long long __cdecl _rotr64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value >> shift) | (value << (64 - shift)); } -#endif /* !HAS_BUILTIN(_rotr64) */ #endif /* __x86_64__ */ +#endif /* !HAS_BUILTIN(_rotr64) */ #if !HAS_BUILTIN(_lrotl) __INTRIN_INLINE unsigned long __cdecl _lrotl(unsigned long value, int shift) @@ -1394,16 +1415,20 @@ __INTRIN_INLINE unsigned short __popcnt16(unsigned short value) #endif #ifdef __x86_64__ +#if !HAS_BUILTIN(__lzcnt64) __INTRIN_INLINE unsigned long long __lzcnt64(unsigned long long value) { return __builtin_clzll(value); } +#endif +#if !HAS_BUILTIN(__popcnt64) __INTRIN_INLINE unsigned long long __popcnt64(unsigned long long value) { return __builtin_popcountll(value); } #endif +#endif /*** 64-bit math ***/ @@ -1431,21 +1456,23 @@ __INTRIN_INLINE long long __cdecl _abs64(long long value) } #ifdef __x86_64__ - +#if !HAS_BUILTIN(__mulh) __INTRIN_INLINE long long __mulh(long long a, long long b) { long long retval; __asm__("imulq %[b]" : "=d" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } +#endif +#if !HAS_BUILTIN(__umulh) __INTRIN_INLINE unsigned long long __umulh(unsigned long long a, unsigned long long b) { unsigned long long retval; __asm__("mulq %[b]" : "=d" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } - +#endif #endif /*** Port I/O ***/

3 years, 5 months

[reactos] 02/07: [CMAKE] Use find_program to get the location of LD when building with clang

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b379743ccb0580d56e05a… commit b379743ccb0580d56e05a5dbd48f44ff3a791c8f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 10:32:12 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 10:32:12 2021 +0200 [CMAKE] Use find_program to get the location of LD when building with clang --- toolchain-clang.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake index 2facc441683..e181bf0baf4 100644 --- a/toolchain-clang.cmake +++ b/toolchain-clang.cmake @@ -55,11 +55,8 @@ set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") -if (DEFINED CMAKE_SYSROOT) - set(LD_EXECUTABLE ${CMAKE_SYSROOT}/bin/${GCC_TOOLCHAIN_PREFIX}ld) -else() - set(LD_EXECUTABLE ${GCC_TOOLCHAIN_PREFIX}ld) -endif() +find_program (LD_EXECUTABLE ${GCC_TOOLCHAIN_PREFIX}ld) +message(STATUS "Using linker ${LD_EXECUTABLE}") set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${LD_EXECUTABLE}") set(CMAKE_MODULE_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import -fuse-ld=${LD_EXECUTABLE}")

3 years, 5 months

[reactos] 01/07: [CMAKE] Do not call clang with unsupported arguments

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83e1afe12a8c8ecf1bda6… commit 83e1afe12a8c8ecf1bda602c31c29e341b5d3553 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 10:09:55 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Apr 9 10:09:55 2021 +0200 [CMAKE] Do not call clang with unsupported arguments --- sdk/cmake/gcc.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 9da30e09008..b1d4b95fb14 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -123,7 +123,10 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_options(-O2 -DNDEBUG) else() if(OPTIMIZE STREQUAL "1") - add_compile_options(-Os -ftracer) + add_compile_options(-Os) + if (CMAKE_C_COMPILER_ID STREQUAL "GNU") + add_compile_options(-ftracer) + endif() elseif(OPTIMIZE STREQUAL "2") add_compile_options(-Os) elseif(OPTIMIZE STREQUAL "3") @@ -154,7 +157,9 @@ if(ARCH STREQUAL "i386") add_compile_options(-momit-leaf-frame-pointer) endif() elseif(ARCH STREQUAL "amd64") - add_compile_options(-mpreferred-stack-boundary=4) + if (CMAKE_C_COMPILER_ID STREQUAL "GNU") + add_compile_options(-mpreferred-stack-boundary=4) + endif() add_compile_options(-Wno-error) endif()

3 years, 5 months

[reactos] 01/01: [NDK] DATA_SEG requires an extra #pragma on MSVC

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3e1697c2b96e77b670f2… commit f3e1697c2b96e77b670f2ae19260091028e82f95 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 04:38:35 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 04:38:35 2021 +0300 [NDK] DATA_SEG requires an extra #pragma on MSVC --- hal/halx86/include/hal.h | 5 +++++ ntoskrnl/config/cmdata.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hal/halx86/include/hal.h b/hal/halx86/include/hal.h index 860651951c8..ec38e8c70ce 100644 --- a/hal/halx86/include/hal.h +++ b/hal/halx86/include/hal.h @@ -36,6 +36,11 @@ #include <ndk/kefuncs.h> #include <ndk/rtlfuncs.h> +/* For MSVC, this is required before using DATA_SEG (used in pcidata) */ +#ifdef _MSC_VER +# pragma section("INIT", read,execute,discard) +#endif + /* Internal shared PCI and ACPI header */ #include <drivers/pci/pci.h> #include <drivers/acpi/acpi.h> diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index eb1c39bf320..95fafb225c6 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -65,6 +65,11 @@ ULONG CmpTypeCount[MaximumType + 1]; HANDLE CmpRegistryRootHandle; +// for MSVC, this is required before using DATA_SEG +#ifdef _MSC_VER +# pragma section("INIT", read,execute,discard) +#endif + DATA_SEG("INIT") UNICODE_STRING CmClassName[MaximumClass + 1] = { RTL_CONSTANT_STRING(L"System"),

3 years, 5 months

[reactos] 01/01: [PC98VID] Fix a typo, addendum to 959729f6eecc2b23fe5b56554cf9c61938dc4c1e

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6645227270514ba981b89… commit 6645227270514ba981b89693038791de1cad70d4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:59:55 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:59:55 2021 +0300 [PC98VID] Fix a typo, addendum to 959729f6eecc2b23fe5b56554cf9c61938dc4c1e --- sdk/include/reactos/drivers/pc98/video.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/drivers/pc98/video.h b/sdk/include/reactos/drivers/pc98/video.h index 00db994f68a..b9a9dc6b1e9 100644 --- a/sdk/include/reactos/drivers/pc98/video.h +++ b/sdk/include/reactos/drivers/pc98/video.h @@ -188,7 +188,7 @@ WRITE_GDC_CSRFORM(PUCHAR Port, PCSRFORMPARAM CursorParameters) WRITE_PORT_UCHAR(Port, (((_Bool)CursorParameters->Show) << 7) | (CursorParameters->LinesPerRow - 1)); WRITE_PORT_UCHAR(Port, ((CursorParameters->BlinkRate & 0x03) << 6) | - (((_Bool)CursorParameters->Blink) << 5) | CursorParameters->StartScanLine); + (((_Bool)!CursorParameters->Blink) << 5) | CursorParameters->StartScanLine); WRITE_PORT_UCHAR(Port, (CursorParameters->EndScanLine << 3) | ((CursorParameters->BlinkRate & 0x1C) >> 2)); }

3 years, 5 months

[reactos] 03/03: [CMAKE] Some options are only supported by GCC, don't use them for clang

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74ec94e12c7a4e8c7a6af… commit 74ec94e12c7a4e8c7a6af6dfadc605ec54b46f07 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:58:19 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:58:19 2021 +0300 [CMAKE] Some options are only supported by GCC, don't use them for clang These are (so far): -Wno-format-overflow -Wno-nonnull-compare -Wno-old-style-declaration -Wno-unused-but-set-variable --- base/applications/network/telnet/CMakeLists.txt | 7 ++++++- base/services/tftpd/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 6 ++++-- dll/directx/wine/wined3d/CMakeLists.txt | 2 +- dll/opengl/glu32/CMakeLists.txt | 10 +++++++--- dll/win32/browseui/CMakeLists.txt | 5 ++++- dll/win32/browseui/shellbars/CMakeLists.txt | 4 ++-- dll/win32/browseui/shellfind/CMakeLists.txt | 4 ++-- dll/win32/winmm/CMakeLists.txt | 4 ++-- drivers/bluetooth/fbtusb/CMakeLists.txt | 4 ++-- drivers/filesystems/ext2/CMakeLists.txt | 7 ++++--- drivers/filesystems/ffs/CMakeLists.txt | 6 ++++-- drivers/filesystems/reiserfs/CMakeLists.txt | 5 ++++- drivers/filesystems/udfs/CMakeLists.txt | 6 ++++-- drivers/network/dd/netkvm/CMakeLists.txt | 6 ++++-- drivers/storage/class/classpnp/CMakeLists.txt | 6 +++++- drivers/storage/class/disk_new/CMakeLists.txt | 6 +++++- drivers/storage/ide/uniata/CMakeLists.txt | 6 ++++-- modules/rosapps/applications/devutils/symdump/CMakeLists.txt | 4 ++-- modules/rosapps/applications/net/ncftp/CMakeLists.txt | 2 +- modules/rosapps/applications/sysutils/logevent/CMakeLists.txt | 4 ++-- modules/rosapps/applications/sysutils/pedump/CMakeLists.txt | 4 ++-- .../rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt | 4 ++-- modules/rosapps/templates/dialog/CMakeLists.txt | 4 ++-- modules/rostests/winetests/advpack/CMakeLists.txt | 2 +- modules/rostests/winetests/fusion/CMakeLists.txt | 2 +- modules/rostests/winetests/msi/CMakeLists.txt | 2 +- modules/rostests/winetests/ole32/CMakeLists.txt | 4 +++- modules/rostests/winetests/services/CMakeLists.txt | 2 +- modules/rostests/winetests/setupapi/CMakeLists.txt | 2 +- modules/rostests/winetests/shell32/CMakeLists.txt | 4 +++- modules/rostests/winetests/user32/CMakeLists.txt | 4 +++- modules/rostests/winetests/version/CMakeLists.txt | 8 +++++--- sdk/lib/3rdparty/adns/CMakeLists.txt | 4 ++-- sdk/lib/3rdparty/cardlib/CMakeLists.txt | 4 ++-- 35 files changed, 99 insertions(+), 57 deletions(-) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index d77a95cc8bd..7bb174f62f2 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -24,10 +24,15 @@ list(APPEND SOURCE add_executable(telnet ${SOURCE} telnet.rc) target_link_libraries(telnet cppstl) set_target_cpp_properties(telnet WITH_EXCEPTIONS) + if (NOT MSVC) - target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE) endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) +endif() + set_module_type(telnet win32cui) add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll) add_pch(telnet precomp.h SOURCE) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 1b10567bd7f..1790a81dff6 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(tftpd win32cui) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32) add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all) -if(GCC OR CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(tftpd PRIVATE -Wno-format-overflow) endif() diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index fc98c11cac4..f7c0b904c23 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -67,6 +67,8 @@ if(MSVC) remove_target_compile_option(libtiff "/we4311") # error C4312: 'type cast': conversion from 'int' to 'thandle_t' of greater size remove_target_compile_option(libtiff "/we4312") -else() - target_compile_options(libtiff PRIVATE "-Wno-unused-but-set-variable") +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(libtiff PRIVATE -Wno-unused-but-set-variable) endif() diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 3af303fd783..10f144b93e6 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -53,6 +53,6 @@ add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(d3dwine precomp.h SOURCE) add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all) -if(NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(d3dwine PRIVATE -Wno-format-overflow) endif() diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index 490732e6d49..ffa8a540818 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -121,14 +121,18 @@ target_link_libraries(glu32 cpprt) set_module_type(glu32 win32dll) if(NOT MSVC) - target_compile_options(glu32 PRIVATE -Wno-write-strings -Wno-unused-but-set-variable) - # Prevent a warning when comparing 'this' against 0 - set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") + target_compile_options(glu32 PRIVATE -Wno-write-strings) elseif(USE_CLANG_CL) target_compile_options(glu32 PRIVATE -Wno-self-assign -Wno-unused-function -Wno-microsoft-include) target_compile_options(glu32 PRIVATE -Wno-deprecated-register -Wno-tautological-undefined-compare) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(glu32 PRIVATE -Wno-unused-but-set-variable) + # Prevent a warning when comparing 'this' against 0 + set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") +endif() + add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) add_pch(glu32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index d606fbfbb18..146ee786ca7 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -53,8 +53,11 @@ add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 us add_pch(browseui precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(browseui PRIVATE -Wno-unused-but-set-variable) +endif() + if(NOT MSVC) - target_compile_options(browseui PRIVATE "-Wno-unused-but-set-variable") # Binutils linker bug if(LTCG) add_target_link_flags(browseui "-Wl,--allow-multiple-definition") diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index 360c785e5c3..bf64a68c96f 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -14,8 +14,8 @@ list(APPEND SOURCE add_library(shellbars OBJECT ${SOURCE}) target_link_libraries(shellbars PRIVATE atl_classes) -if(NOT MSVC) - target_compile_options(shellbars PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(shellbars PRIVATE -Wno-unused-but-set-variable) endif() add_pch(shellbars shellbars.h SOURCE) diff --git a/dll/win32/browseui/shellfind/CMakeLists.txt b/dll/win32/browseui/shellfind/CMakeLists.txt index 72f15422fcd..43c31511710 100644 --- a/dll/win32/browseui/shellfind/CMakeLists.txt +++ b/dll/win32/browseui/shellfind/CMakeLists.txt @@ -11,8 +11,8 @@ list(APPEND SOURCE add_library(shellfind OBJECT ${SOURCE}) target_link_libraries(shellfind PRIVATE atl_classes) -if(NOT MSVC) - target_compile_options(shellfind PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(shellfind PRIVATE -Wno-unused-but-set-variable) endif() add_pch(shellfind shellfind.h SOURCE) diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 640ebf63081..d6bc6b7f478 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -33,8 +33,8 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) -if(NOT MSVC) - target_compile_options(winmm PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(winmm PRIVATE -Wno-unused-but-set-variable) endif() add_subdirectory(midimap) diff --git a/drivers/bluetooth/fbtusb/CMakeLists.txt b/drivers/bluetooth/fbtusb/CMakeLists.txt index 20c8d7bfd12..7de68e74752 100644 --- a/drivers/bluetooth/fbtusb/CMakeLists.txt +++ b/drivers/bluetooth/fbtusb/CMakeLists.txt @@ -12,8 +12,8 @@ list(APPEND SOURCE add_library(fbtusb MODULE ${SOURCE} fbtusb.rc) -if(NOT MSVC) - target_compile_options(fbtusb PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(fbtusb PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(fbtusb kernelmodedriver) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index dadf04c06b7..06c51e756c3 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -103,9 +103,10 @@ else() target_compile_options(ext2fs PRIVATE -Wno-pointer-sign -Wno-unused-function -Wno-unused-variable -Wno-missing-braces) - if (NOT CLANG) - target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) - endif() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) endif() if(CLANG) diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index b2e5135b84a..9d5670aaa56 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -35,11 +35,13 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(ffs PRIVATE -Wno-unused-variable -Wno-missing-braces) if(USE_CLANG_CL) target_compile_options(ffs PRIVATE -Wno-empty-body) - else() - target_compile_options(ffs PRIVATE -Wno-unused-but-set-variable) endif() endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(ffs PRIVATE -Wno-unused-but-set-variable) +endif() + add_definitions(-D__KERNEL__) set_module_type(ffs kernelmodedriver) target_link_libraries(ffs memcmp ${PSEH_LIB}) diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index b921bbfa250..84e680eb2f7 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -82,7 +82,6 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(reiserfs PRIVATE -Wno-missing-braces -Wno-pointer-sign) target_compile_options(reiserfs PRIVATE -Wno-unused-function -Wno-unused-variable) if(NOT USE_CLANG_CL) - target_compile_options(reiserfs PRIVATE -Wno-unused-but-set-variable) target_compile_definitions(reiserfs PRIVATE __GCC__) endif() else() @@ -92,6 +91,10 @@ else() target_compile_options(reiserfs PRIVATE /wd4189 /wd4142 /wd4101) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(reiserfs PRIVATE -Wno-unused-but-set-variable) +endif() + target_link_libraries(reiserfs memcmp ${PSEH_LIB}) add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(reiserfs kernelmodedriver) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 292fe2421e3..dd1b7a5694a 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -50,8 +50,10 @@ if(MSVC) target_compile_options(udfs PRIVATE -Wno-tautological-unsigned-zero-compare -Wno-self-assign) target_compile_options(udfs PRIVATE -Wno-sometimes-uninitialized -Wno-parentheses-equality) endif() -else() - target_compile_options(udfs PRIVATE "-Wno-unused-but-set-variable") +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(udfs PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(udfs kernelmodedriver) diff --git a/drivers/network/dd/netkvm/CMakeLists.txt b/drivers/network/dd/netkvm/CMakeLists.txt index ac916e92cab..26ff48a184b 100644 --- a/drivers/network/dd/netkvm/CMakeLists.txt +++ b/drivers/network/dd/netkvm/CMakeLists.txt @@ -29,11 +29,13 @@ add_driver_inf(netkvm netkvm.inf) if(NOT MSVC) target_compile_options(netkvm PRIVATE -Wno-unused-function - -Wno-old-style-declaration -Wno-unknown-pragmas - -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-attributes) endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(netkvm PRIVATE -Wno-old-style-declaration -Wno-unused-but-set-variable) +endif() diff --git a/drivers/storage/class/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt index fc80d6dba6b..a1cee352784 100644 --- a/drivers/storage/class/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -42,7 +42,11 @@ target_compile_definitions(classpnp PRIVATE CLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) if(GCC) - target_compile_options(classpnp PRIVATE -Wno-unused-but-set-variable -Wno-pointer-to-int-cast -Wno-switch) + target_compile_options(classpnp PRIVATE -Wno-pointer-to-int-cast -Wno-switch) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(classpnp PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(classpnp kernelmodedriver) diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index 8c11bc30a72..68407eafe56 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -21,7 +21,11 @@ if(USE_CLANG_CL OR (NOT MSVC)) endif() if(GCC) - target_compile_options(disk PRIVATE -Wno-unused-but-set-variable -Wno-pointer-to-int-cast -Wno-switch) + target_compile_options(disk PRIVATE -Wno-pointer-to-int-cast -Wno-switch) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(disk PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(disk kernelmodedriver) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 0df8e748a6c..c172d96ac54 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -25,11 +25,13 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(uniata PRIVATE "-Wno-narrowing") if(USE_CLANG_CL) target_compile_options(uniata PRIVATE "-Wno-unused-const-variable") - else() - target_compile_options(uniata PRIVATE "-Wno-unused-but-set-variable") endif() endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(uniata PRIVATE -Wno-unused-but-set-variable) +endif() + add_pch(uniata stdafx.h SOURCE) set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) diff --git a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt index 0e0bd3b2adf..327566bf97b 100644 --- a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(symdump symdump.c) set_module_type(symdump win32cui) target_link_libraries(symdump wine) add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll) -if(NOT MSVC) - target_compile_options(symdump PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(symdump PRIVATE -Wno-unused-but-set-variable) endif() add_cd_file(TARGET symdump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/net/ncftp/CMakeLists.txt b/modules/rosapps/applications/net/ncftp/CMakeLists.txt index 41ad22bd30e..7b080fbb687 100644 --- a/modules/rosapps/applications/net/ncftp/CMakeLists.txt +++ b/modules/rosapps/applications/net/ncftp/CMakeLists.txt @@ -71,7 +71,7 @@ list(APPEND SOURCE add_executable(ncftp ${SOURCE} ncftp.rc) set_module_type(ncftp win32cui) target_compile_definitions(ncftp PRIVATE HAVE_UTIME_H HAVE_UNISTD_H) -if(NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(ncftp PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32) diff --git a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt index 7b5aba3b6cb..2d2311a4a1d 100644 --- a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable(logevent logevent.c logevent.rc) set_module_type(logevent win32cui) -if(NOT MSVC) - target_compile_options(logevent PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(logevent PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(logevent advapi32 msvcrt kernel32) add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt index ca2eade1876..6d15201f7b8 100644 --- a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable(pedump pedump.c pedump.rc) set_module_type(pedump win32cui) -if(NOT MSVC) - target_compile_options(pedump PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(pedump PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(pedump msvcrt kernel32 ntdll) add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt index 748d0f03544..5d70928f475 100644 --- a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt @@ -11,8 +11,8 @@ list(APPEND SOURCE add_executable(rosperf ${SOURCE} rosperf.rc) set_module_type(rosperf win32cui UNICODE) -if(NOT MSVC) - target_compile_options(rosperf PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(rosperf PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(rosperf version msimg32 gdi32 shell32 advapi32 user32 ntdll msvcrt kernel32) add_cd_file(TARGET rosperf DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/templates/dialog/CMakeLists.txt b/modules/rosapps/templates/dialog/CMakeLists.txt index 16aed4a4261..2451bd065cf 100644 --- a/modules/rosapps/templates/dialog/CMakeLists.txt +++ b/modules/rosapps/templates/dialog/CMakeLists.txt @@ -9,8 +9,8 @@ list(APPEND SOURCE add_executable(template_dialog ${SOURCE} dialog.rc) set_module_type(template_dialog win32cui) -if(NOT MSVC) - target_compile_options(template_dialog PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(template_dialog PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(template_dialog user32 gdi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET template_dialog DESTINATION reactos/system32 FOR all) diff --git a/modules/rostests/winetests/advpack/CMakeLists.txt b/modules/rostests/winetests/advpack/CMakeLists.txt index 9eebedf7ba0..097c91f79a5 100644 --- a/modules/rostests/winetests/advpack/CMakeLists.txt +++ b/modules/rostests/winetests/advpack/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(advpack_winetest ${SOURCE}) target_compile_definitions(advpack_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(advpack_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/fusion/CMakeLists.txt b/modules/rostests/winetests/fusion/CMakeLists.txt index f3600c383d0..4654753fa9b 100644 --- a/modules/rostests/winetests/fusion/CMakeLists.txt +++ b/modules/rostests/winetests/fusion/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(fusion_winetest ${SOURCE}) target_compile_definitions(fusion_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(fusion_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 815c2cfc2cc..8884c47513c 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -32,7 +32,7 @@ add_executable(msi_winetest target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(msi_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/ole32/CMakeLists.txt b/modules/rostests/winetests/ole32/CMakeLists.txt index dd2aa62975d..37c0d4aa520 100644 --- a/modules/rostests/winetests/ole32/CMakeLists.txt +++ b/modules/rostests/winetests/ole32/CMakeLists.txt @@ -30,7 +30,9 @@ add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel if(MSVC) add_importlibs(ole32_winetest ntdll) -else() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(ole32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/services/CMakeLists.txt b/modules/rostests/winetests/services/CMakeLists.txt index b6313f4d2e8..a7051a0f91e 100644 --- a/modules/rostests/winetests/services/CMakeLists.txt +++ b/modules/rostests/winetests/services/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(services_winetest win32cui) add_importlibs(services_winetest user32 advapi32 msvcrt kernel32) add_rostests_file(TARGET services_winetest) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(services_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/setupapi/CMakeLists.txt b/modules/rostests/winetests/setupapi/CMakeLists.txt index 60ba1fef77b..7233a7900b1 100644 --- a/modules/rostests/winetests/setupapi/CMakeLists.txt +++ b/modules/rostests/winetests/setupapi/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(setupapi_winetest uuid) add_importlibs(setupapi_winetest advapi32 setupapi user32 shell32 msvcrt kernel32 ntdll) add_rostests_file(TARGET setupapi_winetest) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(setupapi_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index a9816a60be4..23dcd7c751b 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -38,7 +38,9 @@ add_importlibs(shell32_winetest shell32 shlwapi ole32 oleaut32 user32 gdi32 adva if(MSVC) add_importlibs(shell32_winetest ntdll) -else() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(shell32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 132170024a8..32f89934309 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -40,7 +40,9 @@ add_executable(user32_winetest if(MSVC) # Disable warning C4477 (printf format warnings) remove_target_compile_option(user32_winetest "/we4477") -elseif(GCC) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(user32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/version/CMakeLists.txt b/modules/rostests/winetests/version/CMakeLists.txt index a4d8a7901e2..f472718d44b 100644 --- a/modules/rostests/winetests/version/CMakeLists.txt +++ b/modules/rostests/winetests/version/CMakeLists.txt @@ -10,10 +10,12 @@ add_importlibs(version_winetest shell32 version msvcrt kernel32) target_compile_definitions(version_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) - target_compile_options(version_winetest PRIVATE -Wno-format-overflow) -else() +if(MSVC) add_importlibs(version_winetest ntdll) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(version_winetest PRIVATE -Wno-format-overflow) +endif() + add_rostests_file(TARGET version_winetest) diff --git a/sdk/lib/3rdparty/adns/CMakeLists.txt b/sdk/lib/3rdparty/adns/CMakeLists.txt index d46b9e4cdfa..34b0deeafd8 100644 --- a/sdk/lib/3rdparty/adns/CMakeLists.txt +++ b/sdk/lib/3rdparty/adns/CMakeLists.txt @@ -24,8 +24,8 @@ list(APPEND SOURCE add_library(adns ${SOURCE}) -if(NOT MSVC) - target_compile_options(adns PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(adns PRIVATE -Wno-unused-but-set-variable) endif() add_dependencies(adns psdk) diff --git a/sdk/lib/3rdparty/cardlib/CMakeLists.txt b/sdk/lib/3rdparty/cardlib/CMakeLists.txt index 1a90575b34b..b35c25d8046 100644 --- a/sdk/lib/3rdparty/cardlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/cardlib/CMakeLists.txt @@ -18,8 +18,8 @@ add_library(cardlib STATIC ${SOURCE}) target_link_libraries(cardlib PRIVATE cpprt) target_include_directories(cardlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -if(NOT MSVC) - target_compile_options(cardlib PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(cardlib PRIVATE -Wno-unused-but-set-variable) endif() add_dependencies(cardlib psdk)

3 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2021