diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-27 11:49:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 13:33:44 +0200 |
| commit | 8a55c4af62d90ff8518491a86a97bfe827591ece (patch) | |
| tree | 9e857db9f238e81f7fc460870277397c3cb48541 /clucene/patches | |
| parent | 8474c6af652343777653e6ac8115b994b54ff853 (diff) | |
fdo#53855: Use the newly added HAVE_GCC_BUILTIN_ATOMIC for clucene
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* added clucene-config-MINGW-atomic.h, to not lose _CL_HAVE_GCC_ATOMIC_FUNCTIONS
when applicable there
* renamed clucene-config-GCC.h to clucene-config-GCC-atomic.h for consistency
with above
Change-Id: I3dd15721b568fa9358b79ec28bad39249200c773
Diffstat (limited to 'clucene/patches')
| -rw-r--r-- | clucene/patches/clucene-gcc-atomics.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/clucene/patches/clucene-gcc-atomics.patch b/clucene/patches/clucene-gcc-atomics.patch deleted file mode 100644 index 819e9a7d7a3e..000000000000 --- a/clucene/patches/clucene-gcc-atomics.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/shared/CLucene/config/threads.cpp 2012-02-23 12:06:55.355506304 +0000 -+++ src/shared/CLucene/config/threads.cpp 2012-02-23 12:07:17.131766381 +0000 -@@ -185,7 +185,7 @@ - } - - int32_t atomic_threads::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){ -- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS -+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) - return __sync_add_and_fetch(theInteger, 1); - #else - SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) -@@ -193,7 +193,7 @@ - #endif - } - int32_t atomic_threads::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){ -- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS -+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) - return __sync_sub_and_fetch(theInteger, 1); - #else - SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) ---- src/shared/CLucene/LuceneThreads.h 2012-02-23 12:36:28.388299322 +0000 -+++ src/shared/CLucene/LuceneThreads.h 2012-02-23 12:37:23.131885433 +0000 -@@ -70,7 +70,7 @@ - void NotifyAll(); - }; - -- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS -+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) - #define _LUCENE_ATOMIC_INT uint32_t - #define _LUCENE_ATOMIC_INT_SET(x,v) x=v - #define _LUCENE_ATOMIC_INT_GET(x) x |