diff options
| author | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-03-11 19:13:53 +0000 |
|---|---|---|
| committer | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-03-11 19:13:53 +0000 |
| commit | f00977533de6fd27a2f796b2e8e9adb7fcd965e8 (patch) | |
| tree | f78c6a6fd0685cea1c47e4f16d4ddf803cfc8a69 | |
| parent | 34cdd6821b637b124722687578aa119e8714266c (diff) | |
| download | gperftools-f00977533de6fd27a2f796b2e8e9adb7fcd965e8.tar.gz | |
issue-504: use gcc inline assembly atomic ops on mingw
Because those are well tested and can be trusted
git-svn-id: http://gperftools.googlecode.com/svn/trunk@203 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/base/atomicops.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index da0eb8b..88550b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,6 +238,7 @@ SPINLOCK_INCLUDES = src/base/spinlock.h \ noinst_LTLIBRARIES += libspinlock.la libspinlock_la_SOURCES = src/base/spinlock.cc \ src/base/spinlock_internal.cc \ + src/base/atomicops-internals-x86.cc \ $(SPINLOCK_INCLUDES) LIBSPINLOCK = libwindows.la libspinlock.la libsysinfo.la liblogging.la diff --git a/src/base/atomicops.h b/src/base/atomicops.h index 7f01b4a..fc8fdc5 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h @@ -105,10 +105,10 @@ #include "base/atomicops-internals-arm-v6plus.h" #elif defined(ARMV3) #include "base/atomicops-internals-arm-generic.h" -#elif defined(_WIN32) -#include "base/atomicops-internals-windows.h" #elif defined(__GNUC__) && (defined(__i386) || defined(__x86_64__)) #include "base/atomicops-internals-x86.h" +#elif defined(_WIN32) +#include "base/atomicops-internals-windows.h" #elif defined(__linux__) && defined(__PPC__) #include "base/atomicops-internals-linuxppc.h" #else |