diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-10-13 18:21:32 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-10-13 18:21:32 +0200 |
| commit | ad0d71b531e7d06b96e1b3675ba99845f43f766d (patch) | |
| tree | 17541ff65910eb69bb15a9689634fda36c44df38 /gcc/ada/s-oscons-tmplt.c | |
| parent | cf895a0159fe915e00213fa700fbe8a1bc838b7a (diff) | |
| download | gcc-ad0d71b531e7d06b96e1b3675ba99845f43f766d.zip gcc-ad0d71b531e7d06b96e1b3675ba99845f43f766d.tar.gz gcc-ad0d71b531e7d06b96e1b3675ba99845f43f766d.tar.bz2 | |
[multiple changes]
2013-10-13 Thomas Quinot <quinot@adacore.com>
* scos.ads: Minor documentation clarification.
2013-10-13 Thomas Quinot <quinot@adacore.com>
* s-oscons-tmplt.c (CLOCK_RT_Ada): Set to CLOCK_MONOTONIC when
building on AIX 5.3 or later, and to CLOCK_REALTIME on older
versions of AIX.
* init.c (pthread_condattr_setclock): Remove now useless weak symbol.
* thread.c(__gnat_pthread_condattr_setup): Remove bogus AIX 5.2
compatibility shim.
* s-osinte-aix.ads(clock_id_t): Fix C mapping (this is a 64-bit
type).
(clock_gettime): Import from C runtime library.
* s-osinte-aix.adb (clock_gettime): Remove bogus emulation body,
this routine is provided by the system in current supported
versions of AIX.
2013-10-13 Robert Dewar <dewar@adacore.com>
* sem_ch3.adb: Minor reformatting.
2013-10-13 Ed Schonberg <schonberg@adacore.com>
* freeze.adb (Freeze_Entity): For a function whose return type
is incomplete, do not replace the type with the full view if the
type is a limited view. In that case the full view appears in a
different unit, and the back-end will retrieve it at the proper
elaboration point.
2013-10-13 Yannick Moy <moy@adacore.com>
* exp_spark.adb (Expand_SPARK_Call): Do not introduce temporaries for
actuals.
From-SVN: r203503
Diffstat (limited to 'gcc/ada/s-oscons-tmplt.c')
| -rw-r--r-- | gcc/ada/s-oscons-tmplt.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c index 6f018f8..2357d61 100644 --- a/gcc/ada/s-oscons-tmplt.c +++ b/gcc/ada/s-oscons-tmplt.c @@ -1407,11 +1407,15 @@ CND(CLOCK_FASTEST, "Fastest clock") #endif CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock") - -#if defined(__FreeBSD__) || defined(_AIX) +#if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530)) /** On these platforms use system provided monotonic clock instead of - ** the default CLOCK_REALTIME. Note: We then need to set up cond var - ** attributes appropriately (see thread.c). + ** the default CLOCK_REALTIME. We then need to set up cond var attributes + ** appropriately (see thread.c). + ** + ** Note that AIX 5.2 does not support CLOCK_MONOTONIC timestamps for + ** pthread_cond_timedwait (and does not have pthread_condattr_setclock), + ** hence the conditionalization on AIX version above). _AIXVERSION_530 + ** is defined in AIX 5.3 and more recent versions. **/ # define CLOCK_RT_Ada "CLOCK_MONOTONIC" |