diff options
| author | singhai <singhai@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-03 04:42:30 +0000 |
|---|---|---|
| committer | singhai <singhai@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-03 04:42:30 +0000 |
| commit | 767c2c2a32b1d79f5417a8d30af05fa5a1bb9e60 (patch) | |
| tree | 148618640af00773fdf4ee821e9e172fbd9dcd31 /libgomp | |
| parent | 73ba8947260dc0e23275ab27d3c3737faa72ce88 (diff) | |
Merged revisions 184668-184669,184672,184674-184676,184680-184681,184684,184686,184688,184692,184739,184743,184746,184748,184750-184757,184760-184761,184763-184766,184770,184772-184776 via svnmerge from
svn+ssh://gcc.gnu.org/svn/gcc/trunk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/google/integration@184851 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 4 | ||||
| -rw-r--r-- | libgomp/config/linux/sparc/futex.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index c0d578f3e9e..44fabda7b36 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2012-02-29 Eric Botcazou <ebotcazou@adacore.com> + + * config/linux/sparc/futex.h (cpu_relax): Read from CC register. + 2012-02-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libstdc++/52188 diff --git a/libgomp/config/linux/sparc/futex.h b/libgomp/config/linux/sparc/futex.h index 6c600446eb9..96e37b820c5 100644 --- a/libgomp/config/linux/sparc/futex.h +++ b/libgomp/config/linux/sparc/futex.h @@ -90,9 +90,5 @@ futex_wake (int *addr, int count) static inline void cpu_relax (void) { -#if defined __arch64__ || defined __sparc_v9__ - __asm volatile ("membar #LoadLoad" : : : "memory"); -#else - __asm volatile ("" : : : "memory"); -#endif + __asm volatile ("rd %%ccr, %%g0" : : : "memory"); } |