Move MEMMODEL_* from coretypes.h to memmodel.h

2016-10-13  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    gcc/
    * coretypes.h: Move MEMMODEL_* macros and enum memmodel definition
    into ...
    * memmodel.h: This file.
    * alias.c, asan.c, auto-inc-dec.c, bb-reorder.c, bt-load.c,
      caller-save.c, calls.c, ccmp.c, cfgbuild.c, cfgcleanup.c,
      cfgexpand.c, cfgloopanal.c, cfgrtl.c, cilk-common.c, combine.c,
      combine-stack-adj.c, common/config/aarch64/aarch64-common.c,
      common/config/arm/arm-common.c, common/config/bfin/bfin-common.c,
      common/config/c6x/c6x-common.c, common/config/i386/i386-common.c,
      common/config/ia64/ia64-common.c, common/config/nvptx/nvptx-common.c,
      compare-elim.c, config/aarch64/aarch64-builtins.c,
      config/aarch64/aarch64-c.c, config/aarch64/cortex-a57-fma-steering.c,
      config/arc/arc.c, config/arc/arc-c.c, config/arm/arm-builtins.c,
      config/arm/arm-c.c, config/avr/avr.c, config/avr/avr-c.c,
      config/avr/avr-log.c, config/bfin/bfin.c, config/c6x/c6x.c,
      config/cr16/cr16.c, config/cris/cris.c, config/darwin-c.c,
      config/darwin.c, config/epiphany/epiphany.c,
      config/epiphany/mode-switch-use.c,
      config/epiphany/resolve-sw-modes.c, config/fr30/fr30.c,
      config/frv/frv.c, config/ft32/ft32.c, config/h8300/h8300.c,
      config/i386/i386-c.c, config/i386/winnt.c, config/iq2000/iq2000.c,
      config/lm32/lm32.c, config/m32c/m32c.c, config/m32r/m32r.c,
      config/m68k/m68k.c, config/mcore/mcore.c,
      config/microblaze/microblaze.c, config/mmix/mmix.c,
      config/mn10300/mn10300.c, config/moxie/moxie.c,
      config/msp430/msp430.c, config/nds32/nds32-cost.c,
      config/nds32/nds32-intrinsic.c, config/nds32/nds32-md-auxiliary.c,
      config/nds32/nds32-memory-manipulation.c,
      config/nds32/nds32-predicates.c, config/nds32/nds32.c,
      config/nios2/nios2.c, config/nvptx/nvptx.c, config/pa/pa.c,
      config/pdp11/pdp11.c, config/rl78/rl78.c, config/rs6000/rs6000-c.c,
      config/rx/rx.c, config/s390/s390-c.c, config/s390/s390.c,
      config/sh/sh.c, config/sh/sh-c.c, config/sh/sh-mem.cc,
      config/sh/sh_treg_combine.cc, config/sol2.c, config/spu/spu.c,
      config/stormy16/stormy16.c, config/tilegx/tilegx.c,
      config/tilepro/tilepro.c, config/v850/v850.c, config/vax/vax.c,
      config/visium/visium.c, config/vms/vms-c.c, config/xtensa/xtensa.c,
      coverage.c, cppbuiltin.c, cprop.c, cse.c, cselib.c, dbxout.c, dce.c,
      df-core.c, df-problems.c, df-scan.c, dojump.c, dse.c, dwarf2asm.c,
      dwarf2cfi.c, dwarf2out.c, emit-rtl.c, except.c, explow.c, expmed.c,
      expr.c, final.c, fold-const.c, function.c, fwprop.c, gcse.c,
      ggc-page.c, haifa-sched.c, hsa-brig.c, hsa-gen.c, hw-doloop.c,
      ifcvt.c, init-regs.c, internal-fn.c, ira-build.c, ira-color.c,
      ira-conflicts.c, ira-costs.c, ira-emit.c, ira-lives.c, ira.c, jump.c,
      loop-doloop.c, loop-invariant.c, loop-iv.c, loop-unroll.c,
      lower-subreg.c, lra.c, lra-assigns.c, lra-coalesce.c,
      lra-constraints.c, lra-eliminations.c, lra-lives.c, lra-remat.c,
      lra-spills.c, mode-switching.c, modulo-sched.c, omp-low.c, passes.c,
      postreload-gcse.c, postreload.c, predict.c, print-rtl-function.c,
      recog.c, ree.c, reg-stack.c, regcprop.c, reginfo.c, regrename.c,
      reload.c, reload1.c, reorg.c, resource.c, rtl-chkp.c, rtl-tests.c,
      rtlanal.c, rtlhooks.c, sched-deps.c, sched-rgn.c, sdbout.c,
      sel-sched-ir.c, sel-sched.c, shrink-wrap.c, simplify-rtx.c,
      stack-ptr-mod.c, stmt.c, stor-layout.c, target-globals.c,
      targhooks.c, toplev.c, tree-nested.c, tree-outof-ssa.c,
      tree-profile.c, tree-ssa-coalesce.c, tree-ssa-ifcombine.c,
      tree-ssa-loop-ivopts.c, tree-ssa-loop.c, tree-ssa-reassoc.c,
      tree-ssa-sccvn.c, tree-vect-data-refs.c, ubsan.c, valtrack.c,
      var-tracking.c, varasm.c: Include memmodel.h.
    * genattrtab.c (write_header): Include memmodel.h in generated file.
    * genautomata.c (main): Likewise.
    * gengtype.c (open_base_files): Likewise.
    * genopinit.c (main): Likewise.
    * genconditions.c (write_header): Include memmodel.h earlier in
    generated file.
    * genemit.c (main): Likewise.
    * genoutput.c (output_prologue): Likewise.
    * genpeep.c (main): Likewise.
    * genpreds.c (write_insn_preds_c): Likewise.
    * genrecog.c (write_header): Likewise.
    * Makefile.in (PLUGIN_HEADERS): Include memmodel.h

    gcc/ada/
    * gcc-interface/utils2.c: Include memmodel.h.

    gcc/c-family/
    * c-cppbuiltin.c: Include memmodel.h.
    * c-opts.c: Likewise.
    * c-pragma.c: Likewise.
    * c-warn.c: Likewise.

    gcc/c/
    * c-typeck.c: Include memmodel.h.

    gcc/cp/
    * decl2.c: Include memmodel.h.
    * rtti.c: Likewise.

    gcc/fortran/
    * trans-intrinsic.c: Include memmodel.h.

    gcc/go/
    * go-backend.c: Include memmodel.h.

    libgcc/
    * libgcov-profiler.c: Replace MEMMODEL_* macros by their __ATOMIC_*
    equivalent.
    * config/tilepro/atomic.c: Likewise and stop casting model to
    enum memmodel.

From-SVN: r241121

3 files changed, 25 insertions, 18 deletions

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index d9949a1b725..c861ca6d9e7 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-10-13  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* libgcov-profiler.c: Replace MEMMODEL_* macros by their __ATOMIC_*
+	equivalent.
+	* config/tilepro/atomic.c: Likewise and stop casting model to
+	enum memmodel.
+
 2016-10-10  Joseph Myers  <joseph@codesourcery.com>
 
 	PR target/77586
diff --git a/libgcc/config/tilepro/atomic.c b/libgcc/config/tilepro/atomic.c
index 87665f7eccb..f8a4ef53e41 100644
--- a/libgcc/config/tilepro/atomic.c
+++ b/libgcc/config/tilepro/atomic.c
@@ -33,11 +33,11 @@
 static inline void
 pre_atomic_barrier (int model)
 {
-  switch ((enum memmodel) model)
+  switch (model)
     {
-    case MEMMODEL_RELEASE:
-    case MEMMODEL_ACQ_REL:
-    case MEMMODEL_SEQ_CST:
+    case __ATOMIC_RELEASE:
+    case __ATOMIC_ACQ_REL:
+    case __ATOMIC_SEQ_CST:
       __atomic_thread_fence (model);
       break;
     default:
@@ -49,11 +49,11 @@ pre_atomic_barrier (int model)
 static inline void
 post_atomic_barrier (int model)
 {
-  switch ((enum memmodel) model)
+  switch (model)
     {
-    case MEMMODEL_ACQUIRE:
-    case MEMMODEL_ACQ_REL:
-    case MEMMODEL_SEQ_CST:
+    case __ATOMIC_ACQUIRE:
+    case __ATOMIC_ACQ_REL:
+    case __ATOMIC_SEQ_CST:
       __atomic_thread_fence (model);
       break;
     default:
diff --git a/libgcc/libgcov-profiler.c b/libgcc/libgcov-profiler.c
index d9217b9885b..38ed5f113e7 100644
--- a/libgcc/libgcov-profiler.c
+++ b/libgcc/libgcov-profiler.c
@@ -69,11 +69,11 @@ __gcov_interval_profiler_atomic (gcov_type *counters, gcov_type value,
 {
   gcov_type delta = value - start;
   if (delta < 0)
-    __atomic_fetch_add (&counters[steps + 1], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[steps + 1], 1, __ATOMIC_RELAXED);
   else if (delta >= steps)
-    __atomic_fetch_add (&counters[steps], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[steps], 1, __ATOMIC_RELAXED);
   else
-    __atomic_fetch_add (&counters[delta], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[delta], 1, __ATOMIC_RELAXED);
 }
 #endif
 
@@ -99,9 +99,9 @@ void
 __gcov_pow2_profiler_atomic (gcov_type *counters, gcov_type value)
 {
   if (value == 0 || (value & (value - 1)))
-    __atomic_fetch_add (&counters[0], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[0], 1, __ATOMIC_RELAXED);
   else
-    __atomic_fetch_add (&counters[1], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[1], 1, __ATOMIC_RELAXED);
 }
 #endif
 
@@ -132,7 +132,7 @@ __gcov_one_value_profiler_body (gcov_type *counters, gcov_type value,
     counters[1]--;
 
   if (use_atomic)
-    __atomic_fetch_add (&counters[2], 1, MEMMODEL_RELAXED);
+    __atomic_fetch_add (&counters[2], 1, __ATOMIC_RELAXED);
   else
     counters[2]++;
 }
@@ -361,7 +361,7 @@ void
 __gcov_time_profiler_atomic (gcov_type* counters)
 {
   if (!counters[0])
-    counters[0] = __atomic_add_fetch (&function_counter, 1, MEMMODEL_RELAXED);
+    counters[0] = __atomic_add_fetch (&function_counter, 1, __ATOMIC_RELAXED);
 }
 #endif
 #endif
@@ -386,8 +386,8 @@ __gcov_average_profiler (gcov_type *counters, gcov_type value)
 void
 __gcov_average_profiler_atomic (gcov_type *counters, gcov_type value)
 {
-  __atomic_fetch_add (&counters[0], value, MEMMODEL_RELAXED);
-  __atomic_fetch_add (&counters[1], 1, MEMMODEL_RELAXED);
+  __atomic_fetch_add (&counters[0], value, __ATOMIC_RELAXED);
+  __atomic_fetch_add (&counters[1], 1, __ATOMIC_RELAXED);
 }
 #endif
 
@@ -407,7 +407,7 @@ __gcov_ior_profiler (gcov_type *counters, gcov_type value)
 void
 __gcov_ior_profiler_atomic (gcov_type *counters, gcov_type value)
 {
-  __atomic_fetch_or (&counters[0], value, MEMMODEL_RELAXED);
+  __atomic_fetch_or (&counters[0], value, __ATOMIC_RELAXED);
 }
 #endif