genemit.c (main): Include "target.h" in insn-emit.c.

        * 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.

From-SVN: r184964

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bc925dbbf4624c1a99728211e9c9bf4e12f68b9..ad4bfb025fc76eebec9f1d4650909007119bca04 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-05  Richard Henderson  <rth@redhat.com>
+
+       * 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  <joern.rennecke@embecosm.com>
 
        * config/epiphany/epiphany.c (epiphany_function_value_regno_p):

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9a35295e626ffd6ecbd544633679fcec36b622f9..0b7e6351074d8c50b92066600e8b8d7d90b1ab38 100644 (file)
--- 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 113288c7629530174e28ff6c2e3cdec954040759..258e048f3c7bb61878459d4d532cb8c3ebaceba2 100644 (file)
--- 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 662d8ca59b3c5658bec9ab5878cc2d9ac1f74a81..173e4d30ab2cb4932c96e0026dc80ecb5dc7b59c 100644 (file)
--- 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");