From 6cc7fb90517d6928054354f8249532af84e1dc5b Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 13 Dec 2011 11:22:44 -0800 Subject: [PATCH] sparc: Default memory model to TSO for Linux and Solaris. * config/sparc/tso.h: New file. * config.gcc (sparc-*-linux*, sparc*-*-solaris2*): Use it. * config/sparc/sparc.c (sparc_option_override): Honor SUBTARGET_DEFAULT_MEMORY_MODEL. * config/sparc/sparc.h (SUBTARGET_DEFAULT_MEMORY_MODEL): New. From-SVN: r182297 --- gcc/ChangeLog | 8 ++++++++ gcc/config.gcc | 6 +++--- gcc/config/sparc/sparc.c | 6 +++++- gcc/config/sparc/sparc.h | 5 +++++ gcc/config/sparc/tso.h | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 gcc/config/sparc/tso.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 60435516e7f1..2b324a470c4c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-12-13 Richard Henderson + + * config/sparc/tso.h: New file. + * config.gcc (sparc-*-linux*, sparc*-*-solaris2*): Use it. + * config/sparc/sparc.c (sparc_option_override): Honor + SUBTARGET_DEFAULT_MEMORY_MODEL. + * config/sparc/sparc.h (SUBTARGET_DEFAULT_MEMORY_MODEL): New. + 2011-12-13 Aldy Hernandez PR/51443 diff --git a/gcc/config.gcc b/gcc/config.gcc index a4772892b45b..d0f7b283b9ab 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2357,7 +2357,7 @@ sparc-*-rtems*) tmake_file="sparc/t-sparc sparc/t-elf t-rtems" ;; sparc-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h" + tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" case ${target} in *-leon-*) @@ -2384,7 +2384,7 @@ sparc-*-netbsdelf*) tmake_file="${tmake_file} sparc/t-sparc" ;; sparc*-*-solaris2*) - tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h" + tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h sparc/tso.h" case ${target} in sparc64-*-* | sparcv9-*-*) tm_file="sparc/default-64.h ${tm_file}" @@ -2410,7 +2410,7 @@ sparc64-*-rtems*) tmake_file="${tmake_file} sparc/t-sparc t-rtems" ;; sparc64-*-linux*) - tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h" + tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64" ;; diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 713db26ee0ba..20efb00c4517 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -1162,8 +1162,12 @@ sparc_option_override (void) if (sparc_memory_model == SMM_DEFAULT) { + /* Choose the memory model for the operating system. */ + enum sparc_memory_model_type os_default = SUBTARGET_DEFAULT_MEMORY_MODEL; + if (os_default != SMM_DEFAULT) + sparc_memory_model = os_default; /* Choose the most relaxed model for the processor. */ - if (TARGET_V9) + else if (TARGET_V9) sparc_memory_model = SMM_RMO; else if (TARGET_V8) sparc_memory_model = SMM_PSO; diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index 32f8c1074aee..bb6b07943503 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -1755,3 +1755,8 @@ extern int sparc_indent_opcode; #define MASK_DEBUG_ALL MASK_DEBUG_OPTIONS #define TARGET_DEBUG_OPTIONS (sparc_debug & MASK_DEBUG_OPTIONS) + +/* By default, use the weakest memory model for the cpu. */ +#ifndef SUBTARGET_DEFAULT_MEMORY_MODEL +#define SUBTARGET_DEFAULT_MEMORY_MODEL SMM_DEFAULT +#endif diff --git a/gcc/config/sparc/tso.h b/gcc/config/sparc/tso.h new file mode 100644 index 000000000000..c81ea4d35a3f --- /dev/null +++ b/gcc/config/sparc/tso.h @@ -0,0 +1,23 @@ +/* Include fragment for Sparc TSO operating systems. + Copyright (C) 2011 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 +. */ + + +/* This operating system sets PSTATE.MM to the TSO memory model. */ +#undef SUBTARGET_DEFAULT_MEMORY_MODEL +#define SUBTARGET_DEFAULT_MEMORY_MODEL SMM_TSO -- 2.47.2