GitList

Browse code

Cherry-pick LLVM upstream commit r90748.

commit 4aafc85f5a94802c121050ec113973249e295577
Author: Oscar Fuentes <ofv@wanadoo.es>
Date: Mon Dec 7 05:29:59 2009 +0000

Fixes the Atomic implementation if compiled by MSVC compiler.

sys::cas_flag should be long on this platform, InterlockedAdd() is
defined only for the Itanium architecture (according to MSDN).

Patch by Michael Beck!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90748 91177308-0d34-0410-b5e6-96231b3b80d8

Török Edvin authored on 2009/12/12 05:57:23
Showing 2 changed files

libclamav/c++/llvm/include/llvm/System/Atomic.h index 0c05d69..fc19369 100644
libclamav/c++/llvm/lib/System/Atomic.cpp index f9b55a1..7ba8b77 100644

libclamav/c++/llvm/include/llvm/System/Atomic.h

History View file @ 363aa4d

@@ -20,7 +20,11 @@ namespace llvm {
                        namespace sys {
                          void MemoryFence();
                     +#ifdef _MSC_VER
                     +    typedef long cas_flag;
                     +#else
                          typedef uint32_t cas_flag;
                     +#endif
                          cas_flag CompareAndSwap(volatile cas_flag* ptr,
                                                  cas_flag new_value,
                                                  cas_flag old_value);

libclamav/c++/llvm/lib/System/Atomic.cpp

History View file @ 363aa4d

@@ -85,7 +85,7 @@ sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
                      #elif defined(__GNUC__)
                        return __sync_add_and_fetch(ptr, val);
                      #elif defined(_MSC_VER)
                     -  return InterlockedAdd(ptr, val);
                     +  return InterlockedExchangeAdd(ptr, val) + val;
                      #else
                      #  error No atomic add implementation for your platform!
                      #endif