From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Mon, 26 Oct 2015 10:35:52 +0000 (+0100)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-6.1.0~3680
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9fdbccb850f3f81ea9c7dcb31e34c1f22a39ac4;p=thirdparty%2Fgcc.git

[multiple changes]

2015-10-26  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Do not set
	Box_Present when the formal part is (others => <>) even though
	it is equivalent to a formal part (<>), because ASIS tools depend
	on the syntactic setting of this flag.

2015-10-26  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch13.adb: Minor reformatting.
	* einfo.ads: Minor typo.

2015-10-26  Joel Brobecker  <brobecker@adacore.com brobecker>

	* adaint.c (__gnat_open_new_temp): Use mkstemp on Android.

From-SVN: r229318
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d0f3e5f8dac7..1bb4fdc06fd4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,19 @@
+2015-10-26  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Do not set
+	Box_Present when the formal part is (others => <>) even though
+	it is equivalent to a formal part (<>), because ASIS tools depend
+	on the syntactic setting of this flag.
+
+2015-10-26  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch13.adb: Minor reformatting.
+	* einfo.ads: Minor typo.
+
+2015-10-26  Joel Brobecker  <brobecker@adacore.com brobecker>
+
+	* adaint.c (__gnat_open_new_temp): Use mkstemp on Android.
+
 2015-10-26  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Code clean up.
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 6849cd1c16c2..cb3e82cc8367 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -983,8 +983,8 @@ __gnat_open_new_temp (char *path, int fmode)
   strcpy (path, "GNAT-XXXXXX");
 
 #if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) \
-  || defined (__linux__) || defined (__GLIBC__)) && !defined (__vxworks) \
-  || defined (__DragonFly__)
+  || defined (__linux__) || defined (__GLIBC__) || defined (__ANDROID__) \
+  || defined (__DragonFly__)) && !defined (__vxworks)
   return mkstemp (path);
 #elif defined (__Lynx__)
   mktemp (path);
diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads
index 201da87738a7..e2a236ad5088 100644
--- a/gcc/ada/einfo.ads
+++ b/gcc/ada/einfo.ads
@@ -3899,7 +3899,7 @@ package Einfo is
 --    Requires_Overriding (Flag213)
 --       Defined in all subprograms and entries. Set for subprograms that
 --       require overriding as defined by RM-2005-3.9.3(6/2). Note that this
---       is True only for implicitly declare subprograms; it is not set on the
+--       is True only for implicitly declared subprograms; it is not set on the
 --       parent type's subprogram. See also Is_Abstract_Subprogram.
 
 --    Return_Present (Flag54)
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index fea90d11d64f..e3b6bf71276e 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -4014,8 +4014,7 @@ package body Sem_Ch13 is
 
                else
                   Illegal_Indexing
-                    ("indexing function already inherited "
-                     & "from parent type");
+                    ("indexing function already inherited from parent type");
                   Error_Msg_NE
                     ("!override & instead",
                      N, Entity (Expression (Inherited)));