From 29cedf8ef3b3fd547d778738157a6bdbc3a7b78a Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sun, 22 May 2011 21:32:32 +0000 Subject: [PATCH] mips.h (SUBTARGET_ASM_OPTIMIZING_SPEC): Delete. gcc/ * config/mips/mips.h (SUBTARGET_ASM_OPTIMIZING_SPEC): Delete. (ASM_SPEC): Add a -O* option here. Pass -O0 for -noasmopt, -O1 for -fno-delayed-branch, -O2 if optimization is enabled, and -O0 otherwise. (EXTRA_SPECS): Remove subtarget_asm_optimizing_spec. From-SVN: r174047 --- gcc/ChangeLog | 8 ++++++++ gcc/config/mips/mips.h | 11 +---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6959dd4c78d..a7243328a0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-05-22 Richard Sandiford + + * config/mips/mips.h (SUBTARGET_ASM_OPTIMIZING_SPEC): Delete. + (ASM_SPEC): Add a -O* option here. Pass -O0 for -noasmopt, + -O1 for -fno-delayed-branch, -O2 if optimization is enabled, + and -O0 otherwise. + (EXTRA_SPECS): Remove subtarget_asm_optimizing_spec. + 2011-05-22 Eric Botcazou * cfgcleanup.c (try_forward_edges): Do not update BB_FORWARDER_BLOCK. diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 366970e677a..92e932a29c9 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -1079,14 +1079,6 @@ struct mips_cpu_info { #endif -/* SUBTARGET_ASM_OPTIMIZING_SPEC handles passing optimization options - to the assembler. It may be overridden by subtargets. */ -#ifndef SUBTARGET_ASM_OPTIMIZING_SPEC -#define SUBTARGET_ASM_OPTIMIZING_SPEC "\ -%{noasmopt:-O0} \ -%{!noasmopt:%{O:-O2} %{O1:-O2} %{O2:-O2} %{O3:-O3}}" -#endif - /* SUBTARGET_ASM_DEBUGGING_SPEC handles passing debugging options to the assembler. It may be overridden by subtargets. @@ -1123,7 +1115,7 @@ struct mips_cpu_info { %{mmt} %{mno-mt} \ %{mfix-vr4120} %{mfix-vr4130} \ %{mfix-24k} \ -%(subtarget_asm_optimizing_spec) \ +%{noasmopt:-O0; O0|fno-delayed-branch:-O1; O*:-O2; :-O1} \ %(subtarget_asm_debugging_spec) \ %{mabi=*} %{!mabi=*: %(asm_abi_default_spec)} \ %{mgp32} %{mgp64} %{march=*} %{mxgot:-xgot} \ @@ -1181,7 +1173,6 @@ struct mips_cpu_info { #define EXTRA_SPECS \ { "subtarget_cc1_spec", SUBTARGET_CC1_SPEC }, \ { "subtarget_cpp_spec", SUBTARGET_CPP_SPEC }, \ - { "subtarget_asm_optimizing_spec", SUBTARGET_ASM_OPTIMIZING_SPEC }, \ { "subtarget_asm_debugging_spec", SUBTARGET_ASM_DEBUGGING_SPEC }, \ { "subtarget_asm_spec", SUBTARGET_ASM_SPEC }, \ { "asm_abi_default_spec", "-" MULTILIB_ABI_DEFAULT }, \ -- 2.30.2