From 4bcbfa039316bc3e3f9c43ec1230971935e17290 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 12 Jul 2010 18:54:35 +0000
Subject: Makefile.in (target-globals.o): Depend on $(EXPR_H) and $(OPTABS_H).

gcc/
	* Makefile.in (target-globals.o): Depend on $(EXPR_H) and $(OPTABS_H).
	* optabs.h (target_optabs): New structure.
	(default_target_optabs): Declare.
	(this_target_optabs): Declare as a variable or define as a macro.
	(optab_table, convert_optab_table, direct_optab_table): Redefine
	as macros.
	* optabs.c (default_target_optabs): New variable.
	(this_target_optabs): New conditional variable.
	(optab_table, convert_optab_table, direct_optab_table): Delete.
	* target-globals.h (this_target_optabs): Declare.
	(target_globals): Add a optabs field.
	(restore_target_globals): Copy the optabs field to
	this_target_optabs.
	* target-globals.c: Include expr.h and optabs.h.
	(default_target_globals): Initialize the optabs field.
	(save_target_globals): Likewise.

From-SVN: r162097
---
 gcc/target-globals.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc/target-globals.c')

diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index 5934ad9..cfabb87 100644
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -32,6 +32,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "reload.h"
 #include "expmed.h"
+#include "expr.h"
+#include "optabs.h"
 
 #if SWITCHABLE_TARGET
 struct target_globals default_target_globals = {
@@ -40,7 +42,8 @@ struct target_globals default_target_globals = {
   &default_target_rtl,
   &default_target_hard_regs,
   &default_target_reload,
-  &default_target_expmed
+  &default_target_expmed,
+  &default_target_optabs
 };
 
 struct target_globals *
@@ -55,6 +58,7 @@ save_target_globals (void)
   g->hard_regs = XCNEW (struct target_hard_regs);
   g->reload = XCNEW (struct target_reload);
   g->expmed = XCNEW (struct target_expmed);
+  g->optabs = XCNEW (struct target_optabs);
   restore_target_globals (g);
   target_reinit ();
   return g;
-- 
cgit v1.1