From 557a99fe9b89763161796e5b71f63b9a2c807576 Mon Sep 17 00:00:00 2001 From: rguenth Date: Tue, 19 Jan 2016 15:10:40 +0000 Subject: [PATCH] 2016-01-19 Richard Biener * hsa-gen.c (get_memory_order_name): Use MEMMODEL_ constants and name. (get_memory_order): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232571 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/hsa-gen.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9687f3f014e..1e753efda90 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-01-19 Richard Biener + + * hsa-gen.c (get_memory_order_name): Use MEMMODEL_ constants. + (get_memory_order): Likewise. + 2016-01-19 Kirill Yukhin * tree-vect-stmts.c (vectorizable_store): Check diff --git a/gcc/hsa-gen.c b/gcc/hsa-gen.c index a6f4170dfa6..e8f80daf693 100644 --- a/gcc/hsa-gen.c +++ b/gcc/hsa-gen.c @@ -4417,17 +4417,17 @@ get_memory_order_name (unsigned memmodel) { switch (memmodel) { - case __ATOMIC_RELAXED: + case MEMMODEL_RELAXED: return "__ATOMIC_RELAXED"; - case __ATOMIC_CONSUME: + case MEMMODEL_CONSUME: return "__ATOMIC_CONSUME"; - case __ATOMIC_ACQUIRE: + case MEMMODEL_ACQUIRE: return "__ATOMIC_ACQUIRE"; - case __ATOMIC_RELEASE: + case MEMMODEL_RELEASE: return "__ATOMIC_RELEASE"; - case __ATOMIC_ACQ_REL: + case MEMMODEL_ACQ_REL: return "__ATOMIC_ACQ_REL"; - case __ATOMIC_SEQ_CST: + case MEMMODEL_SEQ_CST: return "__ATOMIC_SEQ_CST"; default: return NULL; @@ -4442,13 +4442,13 @@ get_memory_order (unsigned memmodel, location_t location) { switch (memmodel) { - case __ATOMIC_RELAXED: + case MEMMODEL_RELAXED: return BRIG_MEMORY_ORDER_RELAXED; - case __ATOMIC_ACQUIRE: + case MEMMODEL_ACQUIRE: return BRIG_MEMORY_ORDER_SC_ACQUIRE; - case __ATOMIC_RELEASE: + case MEMMODEL_RELEASE: return BRIG_MEMORY_ORDER_SC_RELEASE; - case __ATOMIC_ACQ_REL: + case MEMMODEL_ACQ_REL: return BRIG_MEMORY_ORDER_SC_ACQUIRE_RELEASE; default: HSA_SORRY_ATV (location, -- 2.11.4.GIT