03353de80b
- GCC gets updated from 5.2.0 to 6.3.0: gcc-6.3.0_riscv.patch is a diff between 5fcb8c4 and 173684b in riscv-gcc, and it needs gcc-6.3.0_memmodel.patch. - Binutils goes from 2.26.1 to 2.28: There is a build error for MIPS gold so I add patch for it. - GMP gets a bump from 6.1.0 to 6.1.2 - MPFR is updated from 3.1.4 to 3.1.5 - GDB is upgraded from 6.1.1 to 6.1.2 - IASL is changed from 20160831 to 20161222 - LLVM is changed from 3.8.0 to 3.9.1 Change-Id: I20fea838d798c430d8c4d2cc6b07614d967c60c5 Signed-off-by: Iru Cai <mytbk920423@gmail.com> Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/17189 Tested-by: build bot (Jenkins)
417 lines
12 KiB
Diff
417 lines
12 KiB
Diff
commit ea36272bdc2602a690019b9612d23594571d3d2b
|
|
Author: thopre01 <thopre01@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
Date: Mon Sep 26 17:20:39 2016 +0000
|
|
|
|
2016-09-26 Thomas Preud'homme <thomas.preudhomme@arm.com>
|
|
|
|
gcc/
|
|
* tree.h (memmodel_from_int, memmodel_base, is_mm_relaxed,
|
|
is_mm_consume, is_mm_acquire, is_mm_release, is_mm_acq_rel,
|
|
is_mm_seq_cst, is_mm_sync): Move to ...
|
|
* memmodel.h: This. New file.
|
|
* builtins.c: Include memmodel.h.
|
|
* optabs.c: Likewise.
|
|
* tsan.c: Likewise.
|
|
* config/aarch64/aarch64.c: Likewise.
|
|
* config/alpha/alpha.c: Likewise.
|
|
* config/arm/arm.c: Likewise.
|
|
* config/i386/i386.c: Likewise.
|
|
* config/ia64/ia64.c: Likewise.
|
|
* config/mips/mips.c: Likewise.
|
|
* config/rs6000/rs6000.c: Likewise.
|
|
* config/sparc/sparc.c: Likewise.
|
|
* genconditions.c: Include memmodel.h in generated file.
|
|
* genemit.c: Likewise.
|
|
* genoutput.c: Likewise.
|
|
* genpeep.c: Likewise.
|
|
* genpreds.c: Likewise.
|
|
* genrecog.c: Likewise.
|
|
|
|
gcc/c-family/
|
|
* c-common.c: Include memmodel.h.
|
|
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240504 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
diff --git a/gcc/builtins.c b/gcc/builtins.c
|
|
index 93cbe15ad3c..04dcf95acd2 100644
|
|
--- a/gcc/builtins.c
|
|
+++ b/gcc/builtins.c
|
|
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "predict.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
|
|
index e9f619fd3af..2652259a312 100644
|
|
--- a/gcc/c-family/c-common.c
|
|
+++ b/gcc/c-family/c-common.c
|
|
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "function.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "c-common.h"
|
|
#include "gimple-expr.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
|
index 6078b163548..c65b826b0cc 100644
|
|
--- a/gcc/config/aarch64/aarch64.c
|
|
+++ b/gcc/config/aarch64/aarch64.c
|
|
@@ -26,6 +26,7 @@
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "cfghooks.h"
|
|
#include "cfgloop.h"
|
|
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
|
|
index 6d4af04dd7d..d646879e7e8 100644
|
|
--- a/gcc/config/alpha/alpha.c
|
|
+++ b/gcc/config/alpha/alpha.c
|
|
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "df.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
|
|
index 619c3291c87..feb54cbc64a 100644
|
|
--- a/gcc/config/arm/arm.c
|
|
+++ b/gcc/config/arm/arm.c
|
|
@@ -27,6 +27,7 @@
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "cfghooks.h"
|
|
#include "df.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
|
|
index 143b905a341..01e2ad8e1b2 100644
|
|
--- a/gcc/config/i386/i386.c
|
|
+++ b/gcc/config/i386/i386.c
|
|
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "backend.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "cfghooks.h"
|
|
#include "cfgloop.h"
|
|
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
|
|
index 5f0bf43a103..573872eb85f 100644
|
|
--- a/gcc/config/ia64/ia64.c
|
|
+++ b/gcc/config/ia64/ia64.c
|
|
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "cfghooks.h"
|
|
#include "df.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
|
|
index 88f4038224a..3586a1001e7 100644
|
|
--- a/gcc/config/mips/mips.c
|
|
+++ b/gcc/config/mips/mips.c
|
|
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "cfghooks.h"
|
|
#include "df.h"
|
|
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
|
|
index d76f479d9e5..6897b5c260d 100644
|
|
--- a/gcc/config/rs6000/rs6000.c
|
|
+++ b/gcc/config/rs6000/rs6000.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "backend.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "cfghooks.h"
|
|
#include "cfgloop.h"
|
|
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
|
|
index 5efed3dc52f..5936f96bd80 100644
|
|
--- a/gcc/config/sparc/sparc.c
|
|
+++ b/gcc/config/sparc/sparc.c
|
|
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "df.h"
|
|
#include "tm_p.h"
|
|
diff --git a/gcc/genconditions.c b/gcc/genconditions.c
|
|
index e4f45b097cd..d8b0ebba56b 100644
|
|
--- a/gcc/genconditions.c
|
|
+++ b/gcc/genconditions.c
|
|
@@ -94,6 +94,7 @@ write_header (void)
|
|
#include \"resource.h\"\n\
|
|
#include \"diagnostic-core.h\"\n\
|
|
#include \"reload.h\"\n\
|
|
+#include \"memmodel.h\"\n\
|
|
#include \"tm-constrs.h\"\n");
|
|
|
|
if (saw_eh_return)
|
|
diff --git a/gcc/genemit.c b/gcc/genemit.c
|
|
index 33040aac36d..d5e07a97a6d 100644
|
|
--- a/gcc/genemit.c
|
|
+++ b/gcc/genemit.c
|
|
@@ -792,6 +792,7 @@ from the machine description file `md'. */\n\n");
|
|
printf ("#include \"reload.h\"\n");
|
|
printf ("#include \"diagnostic-core.h\"\n");
|
|
printf ("#include \"regs.h\"\n");
|
|
+ printf ("#include \"memmodel.h\"\n");
|
|
printf ("#include \"tm-constrs.h\"\n");
|
|
printf ("#include \"ggc.h\"\n");
|
|
printf ("#include \"dumpfile.h\"\n");
|
|
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
|
|
index f8c25ac4df0..59092580e49 100644
|
|
--- a/gcc/genoutput.c
|
|
+++ b/gcc/genoutput.c
|
|
@@ -231,6 +231,7 @@ output_prologue (void)
|
|
printf ("#include \"diagnostic-core.h\"\n");
|
|
printf ("#include \"output.h\"\n");
|
|
printf ("#include \"target.h\"\n");
|
|
+ printf ("#include \"memmodel.h\"\n");
|
|
printf ("#include \"tm-constrs.h\"\n");
|
|
}
|
|
|
|
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
|
|
index 132cdced690..e1997e03e47 100644
|
|
--- a/gcc/genpeep.c
|
|
+++ b/gcc/genpeep.c
|
|
@@ -373,6 +373,7 @@ from the machine description file `md'. */\n\n");
|
|
printf ("#include \"except.h\"\n");
|
|
printf ("#include \"diagnostic-core.h\"\n");
|
|
printf ("#include \"flags.h\"\n");
|
|
+ printf ("#include \"memmodel.h\"\n");
|
|
printf ("#include \"tm-constrs.h\"\n\n");
|
|
|
|
printf ("extern rtx peep_operand[];\n\n");
|
|
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
|
|
index d18ebd2ab5a..6db1b7b0301 100644
|
|
--- a/gcc/genpreds.c
|
|
+++ b/gcc/genpreds.c
|
|
@@ -1580,6 +1580,7 @@ write_insn_preds_c (void)
|
|
#include \"reload.h\"\n\
|
|
#include \"regs.h\"\n\
|
|
#include \"emit-rtl.h\"\n\
|
|
+#include \"memmodel.h\"\n\
|
|
#include \"tm-constrs.h\"\n");
|
|
|
|
FOR_ALL_PREDICATES (p)
|
|
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
|
|
index 056798c82f7..77861074492 100644
|
|
--- a/gcc/genrecog.c
|
|
+++ b/gcc/genrecog.c
|
|
@@ -4192,6 +4192,7 @@ write_header (void)
|
|
#include \"diagnostic-core.h\"\n\
|
|
#include \"reload.h\"\n\
|
|
#include \"regs.h\"\n\
|
|
+#include \"memmodel.h\"\n\
|
|
#include \"tm-constrs.h\"\n\
|
|
\n");
|
|
|
|
diff --git a/gcc/memmodel.h b/gcc/memmodel.h
|
|
new file mode 100644
|
|
index 00000000000..d53eb7bc9d9
|
|
--- /dev/null
|
|
+++ b/gcc/memmodel.h
|
|
@@ -0,0 +1,86 @@
|
|
+/* Prototypes of memory model helper functions.
|
|
+ Copyright (C) 2015-2016 Free Software Foundation, Inc.
|
|
+
|
|
+This file is part of GCC.
|
|
+
|
|
+GCC is free software; you can redistribute it and/or modify it under
|
|
+the terms of the GNU General Public License as published by the Free
|
|
+Software Foundation; either version 3, or (at your option) any later
|
|
+version.
|
|
+
|
|
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
+for more details.
|
|
+
|
|
+You should have received a copy of the GNU General Public License
|
|
+along with GCC; see the file COPYING3. If not see
|
|
+<http://www.gnu.org/licenses/>. */
|
|
+
|
|
+#ifndef GCC_MEMMODEL_H
|
|
+#define GCC_MEMMODEL_H
|
|
+
|
|
+/* Return the memory model from a host integer. */
|
|
+static inline enum memmodel
|
|
+memmodel_from_int (unsigned HOST_WIDE_INT val)
|
|
+{
|
|
+ return (enum memmodel) (val & MEMMODEL_MASK);
|
|
+}
|
|
+
|
|
+/* Return the base memory model from a host integer. */
|
|
+static inline enum memmodel
|
|
+memmodel_base (unsigned HOST_WIDE_INT val)
|
|
+{
|
|
+ return (enum memmodel) (val & MEMMODEL_BASE_MASK);
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is RELAXED. */
|
|
+static inline bool
|
|
+is_mm_relaxed (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_RELAXED;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is CONSUME. */
|
|
+static inline bool
|
|
+is_mm_consume (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_CONSUME;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is ACQUIRE. */
|
|
+static inline bool
|
|
+is_mm_acquire (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_ACQUIRE;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is RELEASE. */
|
|
+static inline bool
|
|
+is_mm_release (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_RELEASE;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is ACQ_REL. */
|
|
+static inline bool
|
|
+is_mm_acq_rel (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_ACQ_REL;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is SEQ_CST. */
|
|
+static inline bool
|
|
+is_mm_seq_cst (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_BASE_MASK) == MEMMODEL_SEQ_CST;
|
|
+}
|
|
+
|
|
+/* Return TRUE if the memory model is a SYNC variant. */
|
|
+static inline bool
|
|
+is_mm_sync (enum memmodel model)
|
|
+{
|
|
+ return (model & MEMMODEL_SYNC);
|
|
+}
|
|
+
|
|
+#endif /* GCC_MEMMODEL_H */
|
|
diff --git a/gcc/optabs.c b/gcc/optabs.c
|
|
index e41747a630f..c5e9b4f8e13 100644
|
|
--- a/gcc/optabs.c
|
|
+++ b/gcc/optabs.c
|
|
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "target.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "predict.h"
|
|
#include "tm_p.h"
|
|
#include "expmed.h"
|
|
diff --git a/gcc/tree.h b/gcc/tree.h
|
|
index 0d9ad0198fa..563e6d9e287 100644
|
|
--- a/gcc/tree.h
|
|
+++ b/gcc/tree.h
|
|
@@ -4675,69 +4675,6 @@ extern void warn_deprecated_use (tree, tree);
|
|
extern void cache_integer_cst (tree);
|
|
extern const char *combined_fn_name (combined_fn);
|
|
|
|
-/* Return the memory model from a host integer. */
|
|
-static inline enum memmodel
|
|
-memmodel_from_int (unsigned HOST_WIDE_INT val)
|
|
-{
|
|
- return (enum memmodel) (val & MEMMODEL_MASK);
|
|
-}
|
|
-
|
|
-/* Return the base memory model from a host integer. */
|
|
-static inline enum memmodel
|
|
-memmodel_base (unsigned HOST_WIDE_INT val)
|
|
-{
|
|
- return (enum memmodel) (val & MEMMODEL_BASE_MASK);
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is RELAXED. */
|
|
-static inline bool
|
|
-is_mm_relaxed (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_RELAXED;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is CONSUME. */
|
|
-static inline bool
|
|
-is_mm_consume (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_CONSUME;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is ACQUIRE. */
|
|
-static inline bool
|
|
-is_mm_acquire (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_ACQUIRE;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is RELEASE. */
|
|
-static inline bool
|
|
-is_mm_release (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_RELEASE;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is ACQ_REL. */
|
|
-static inline bool
|
|
-is_mm_acq_rel (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_ACQ_REL;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is SEQ_CST. */
|
|
-static inline bool
|
|
-is_mm_seq_cst (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_BASE_MASK) == MEMMODEL_SEQ_CST;
|
|
-}
|
|
-
|
|
-/* Return TRUE if the memory model is a SYNC variant. */
|
|
-static inline bool
|
|
-is_mm_sync (enum memmodel model)
|
|
-{
|
|
- return (model & MEMMODEL_SYNC);
|
|
-}
|
|
-
|
|
/* Compare and hash for any structure which begins with a canonical
|
|
pointer. Assumes all pointers are interchangeable, which is sort
|
|
of already assumed by gcc elsewhere IIRC. */
|
|
diff --git a/gcc/tsan.c b/gcc/tsan.c
|
|
index 91dbd41a0b4..cc194749665 100644
|
|
--- a/gcc/tsan.c
|
|
+++ b/gcc/tsan.c
|
|
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
|
|
#include "backend.h"
|
|
#include "rtl.h"
|
|
#include "tree.h"
|
|
+#include "memmodel.h"
|
|
#include "gimple.h"
|
|
#include "tree-pass.h"
|
|
#include "ssa.h"
|