diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-11 13:47:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-11 13:47:26 +0000 |
| commit | 06b19f65f248242929289a85ec10f0bb656fbe5c (patch) | |
| tree | ef9004d2ebbffa58a06a3baef2d775f742da7fbc | |
| parent | 767624ccdf79e3b256d77174bcd3ca4fe75cc7bc (diff) | |
| download | ATCD-06b19f65f248242929289a85ec10f0bb656fbe5c.tar.gz | |
Wed Aug 11 13:45:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-g++-common.h:
Only enable GCC builtin atomic op when threads are enabled. Thanks to
Rafi <rafi dot net at gmail dot com> for reporting this
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/config-g++-common.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6905fa062f6..ad550092d7d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 11 13:45:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-g++-common.h: + Only enable GCC builtin atomic op when threads are enabled. Thanks to + Rafi <rafi dot net at gmail dot com> for reporting this + Tue Aug 10 17:24:05 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/apps/svcconf/Svcconf.cpp: diff --git a/ACE/THANKS b/ACE/THANKS index ac9e557dce7..83f1f0eac81 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2329,6 +2329,7 @@ Anatoli Sakhnik <sakhnik at gmail dot com> Max Zhou <earthdog at 126 dot com> Daynesh Mangal <daynesh at gmail dot com> Robert Shectman <shectman at llnl dot gov> +Rafi <rafi dot net at gmail dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 8ec44f47bbf..a6841fc49a8 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -140,6 +140,7 @@ // GCC >= 4.1 provides __sync_XXXX builtins for use in atomic operations // although the builtins are provided globally they are not supported on all platforms +#if defined (ACE_HAS_THREADS) #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) # if defined (__powerpc__) // The builtins seem to be provided for all powerpc platforms @@ -159,6 +160,7 @@ # define ACE_HAS_GCC_ATOMIC_BUILTINS 1 # endif #endif +#endif /* ACE_HAS_THREADS */ #if defined (ACE_HAS_GNU_REPO) // -frepo causes unresolved symbols of basic_string left- and |