From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
Date: Sun, 24 May 2015 00:33:06 +0000 (+0000)
Subject: add default for HAVE_tablejump
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e5f14d42027a66519fc8129c7632608783eeaeb;p=gcc.git

add default for HAVE_tablejump

gcc/ChangeLog:

2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* defaults.h (gen_tablejump): New function.
	(HAVE_tablejump): Add default value.
	* expr.c: Adjust.
	* stmt.c: Likewise.

From-SVN: r223625
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99ee6ddda40..864ce021f8f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* defaults.h (gen_tablejump): New function.
+	(HAVE_tablejump): Add default value.
+	* expr.c: Adjust.
+	* stmt.c: Likewise.
+
 2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
 	* defaults.h (gen_store_multiple): New function.
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 566841b532b..53d66823977 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1494,6 +1494,16 @@ gen_store_multiple (rtx, rtx, rtx)
 }
 #endif
 
+#ifndef HAVE_tablejump
+#define HAVE_tablejump 0
+static inline rtx
+gen_tablejump (rtx, rtx)
+{
+  gcc_unreachable ();
+  return NULL;
+}
+#endif
+
 #endif /* GCC_INSN_FLAGS_H  */
 
 #endif  /* ! GCC_DEFAULTS_H */
diff --git a/gcc/expr.c b/gcc/expr.c
index 0dad73729d4..dccaf8be51b 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -11226,11 +11226,6 @@ try_casesi (tree index_type, tree index_expr, tree minval, tree range,
 }
 
 /* Attempt to generate a tablejump instruction; same concept.  */
-#ifndef HAVE_tablejump
-#define HAVE_tablejump 0
-#define gen_tablejump(x, y) (0)
-#endif
-
 /* Subroutine of the next function.
 
    INDEX is the value being switched on, with the lowest value
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 16a080a623a..303df725a0b 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -796,10 +796,6 @@ dump_case_nodes (FILE *f, struct case_node *root,
 #define HAVE_casesi 0
 #endif
 
-#ifndef HAVE_tablejump
-#define HAVE_tablejump 0
-#endif
-
 /* Return the smallest number of different values for which it is best to use a
    jump-table instead of a tree of conditional branches.  */