From 62298c61227b5a420f278002fe04c6897529ad59 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@adacore.com>
Date: Fri, 10 Apr 2009 12:36:00 +0000
Subject: [PATCH] Makefile.in, utils.c: Include "rtl.h" to avoid compile time
 warnings.

2009-04-10  Tristan Gingold  <gingold@adacore.com>

	* gcc-interface/Makefile.in, gcc-interface/utils.c: Include "rtl.h" to
	avoid compile time warnings.
	Do not add gcc/config in include search list while compiling the RTS.
	Pragma Thread_Local_Storage is available on any target.

From-SVN: r145891
---
 gcc/ada/ChangeLog                 |  7 +++++++
 gcc/ada/gcc-interface/Makefile.in | 26 +++++++++-----------------
 gcc/ada/gcc-interface/utils.c     |  8 +++-----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1cb067ba252..6126f52896d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-10  Tristan Gingold  <gingold@adacore.com>
+
+	* gcc-interface/Makefile.in, gcc-interface/utils.c: Include "rtl.h" to
+	avoid compile time warnings.
+	Do not add gcc/config in include search list while compiling the RTS.
+	Pragma Thread_Local_Storage is available on any target.
+
 2009-04-10  Bob Duff  <duff@adacore.com>
 
 	* sem.ads, par.adb, sem_ch6.adb, sem_ch8.adb: Minor comment fixes.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 8d0d92c5707..6127636145a 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -238,7 +238,7 @@ INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \
 
 ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
 
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \
+INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada \
 	-I$(fsrcdir)/../include -I$(fsrcdir)
 ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
 
@@ -473,8 +473,9 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
 
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-osinte.adb<s-osinte-vxworks-rtp.adb \
-    s-osinte.ads<s-osinte-vxworks6.ads \
+    s-osinte.adb<s-osinte-vxworks.adb \
+    s-vxwext.ads<s-vxwext-rtp.ads \
+    s-vxwext.adb<s-vxwext-rtp.adb \
     s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \
     system.ads<system-vxworks-ppc-rtp.ads
 
@@ -487,12 +488,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
 
     ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      s-osinte.ads<s-osinte-vxworks6.ads \
-      s-osinte.adb<s-osinte-vxworks-kernel.adb
-    else
-      LIBGNAT_TARGET_PAIRS += \
-      s-osinte.ads<s-osinte-vxworks.ads \
-      s-osinte.adb<s-osinte-vxworks.adb
+      s-vxwext.ads<s-vxwext-kernel.ads
     endif
 
     EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-vxwexc.o
@@ -627,8 +623,9 @@ ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),)
 
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
     LIBGNAT_TARGET_PAIRS += \
-    s-osinte.adb<s-osinte-vxworks-rtp.adb \
-    s-osinte.ads<s-osinte-vxworks6.ads \
+    s-osinte.adb<s-osinte-vxworks.adb \
+    s-vxwext.ads<s-vxwext-rtp.ads \
+    s-vxwext.adb<s-vxwext-rtp.adb \
     s-tpopsp.adb<s-tpopsp-vxworks-rtp.adb \
     system.ads<system-vxworks-x86-rtp.ads
 
@@ -641,12 +638,7 @@ ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),)
 
     ifeq ($(strip $(filter-out kernel,$(THREAD_KIND))),)
       LIBGNAT_TARGET_PAIRS += \
-      s-osinte.ads<s-osinte-vxworks6.ads \
-      s-osinte.adb<s-osinte-vxworks-kernel.adb
-    else
-      LIBGNAT_TARGET_PAIRS += \
-      s-osinte.ads<s-osinte-vxworks.ads \
-      s-osinte.adb<s-osinte-vxworks.adb
+      s-vxwext.ads<s-vxwext-kernel.ads
     endif
 
     EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-vxwexc.o
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 62ffb1b1b31..feb2f4a35ec 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -48,6 +48,7 @@
 #include "tree-dump.h"
 #include "pointer-set.h"
 #include "langhooks.h"
+#include "rtl.h"
 
 #include "ada.h"
 #include "types.h"
@@ -1633,11 +1634,8 @@ process_attributes (tree decl, struct attrib *attr_list)
 	break;
 
       case ATTR_THREAD_LOCAL_STORAGE:
-	if (targetm.have_tls)
-	  DECL_TLS_MODEL (decl) = decl_default_tls_model (decl);
-	else
-	  post_error ("thread-local storage not supported for this target",
-		      attr_list->error_point);
+	DECL_TLS_MODEL (decl) = decl_default_tls_model (decl);
+	DECL_COMMON (decl) = 0;
 	break;
       }
 }
-- 
2.30.2