From e374c627be63c1a2c225fe5af3e433624e266cc5 Mon Sep 17 00:00:00 2001 From: rth Date: Mon, 5 Mar 2012 22:25:19 +0000 Subject: [PATCH] * genemit.c (main): Include "target.h" in insn-emit.c. * Makefile.in (insn-emit.o): Depend on TARGET_H. * config/sh/sync.md (atomic_test_and_set): Reference targetm.atomic_test_and_set_trueval instead of TARGET_ATOMIC_TEST_AND_SET_TRUEVAL. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184964 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/Makefile.in | 4 ++-- gcc/config/sh/sync.md | 7 ++++--- gcc/genemit.c | 3 ++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5bc925d..ad4bfb0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-03-05 Richard Henderson + + * genemit.c (main): Include "target.h" in insn-emit.c. + * Makefile.in (insn-emit.o): Depend on TARGET_H. + * config/sh/sync.md (atomic_test_and_set): Reference + targetm.atomic_test_and_set_trueval instead of + TARGET_ATOMIC_TEST_AND_SET_TRUEVAL. + 2012-03-05 Joern Rennecke * config/epiphany/epiphany.c (epiphany_function_value_regno_p): diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 9a35295..0b7e635 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3495,8 +3495,8 @@ insn-automata.o : insn-automata.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ insn-emit.o : insn-emit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(RTL_H) $(TM_P_H) $(FUNCTION_H) $(EXPR_H) $(OPTABS_H) \ dfp.h $(FLAGS_H) output.h insn-config.h hard-reg-set.h $(RECOG_H) \ - $(RESOURCE_H) reload.h $(DIAGNOSTIC_CORE_H) $(REGS_H) tm-constrs.h $(GGC_H) \ - $(BASIC_BLOCK_H) $(INTEGRATE_H) + $(RESOURCE_H) reload.h $(DIAGNOSTIC_CORE_H) $(REGS_H) tm-constrs.h \ + $(GGC_H) $(BASIC_BLOCK_H) $(INTEGRATE_H) $(TARGET_H) insn-enums.o : insn-enums.c $(CONFIG_H) $(SYSTEM_H) insn-constants.h insn-extract.o : insn-extract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H) diff --git a/gcc/config/sh/sync.md b/gcc/config/sh/sync.md index 113288c..258e048 100644 --- a/gcc/config/sh/sync.md +++ b/gcc/config/sh/sync.md @@ -417,9 +417,10 @@ emit_insn (gen_tasb (addr)); else { - rtx val = force_reg (QImode, - gen_int_mode (TARGET_ATOMIC_TEST_AND_SET_TRUEVAL, - QImode)); + rtx val; + + val = gen_int_mode (targetm.atomic_test_and_set_trueval, QImode); + val = force_reg (QImode, val); emit_insn (gen_atomic_test_and_set_soft (addr, val)); } diff --git a/gcc/genemit.c b/gcc/genemit.c index 662d8ca..173e4d3 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -812,7 +812,8 @@ from the machine description file `md'. */\n\n"); printf ("#include \"tm-constrs.h\"\n"); printf ("#include \"ggc.h\"\n"); printf ("#include \"basic-block.h\"\n"); - printf ("#include \"integrate.h\"\n\n"); + printf ("#include \"integrate.h\"\n"); + printf ("#include \"target.h\"\n\n"); printf ("#define FAIL return (end_sequence (), _val)\n"); printf ("#define DONE return (_val = get_insns (), end_sequence (), _val)\n\n"); -- 2.7.4