gcc-6.1.0gcc-6.1.0

7 files changed, 97 insertions, 29 deletions

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 4e0a4c6b17..a44e1308c5 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,11 +1,15 @@
-2015-12-04  Release Manager
+2016-04-27  Release Manager
 
-	* GCC 5.3.0 released.
+	* GCC 6.1.0 released.
 
-2015-08-14  David Edelsohn  <dje.gcc@gmail.com>
+2016-01-31  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR target/68741
+	* inclhack.def (hpux_vsscanf): New fix.
+	* fixincl.x: Regenerated.
+	* tests/base/stdio.h [HPUX_VSSCANF_CHECK]: New test.
 
-	Backport from mainline.
-	2015-08-14  David Edelsohn  <dje.gcc@gmail.com>
+2015-08-14  David Edelsohn  <dje.gcc@gmail.com>
 
 	* inclhack.def (aix_stdio_inline): New fix.
 	(aix_strtof_const): Limit to *-*-aix*.
@@ -15,14 +19,11 @@
 	* fixincl.x: Regenerated.
 	* test/base/stdio.h [AIX_STDIO_INLINE]: New test.
 
-2015-07-16  Release Manager
+2015-07-28  Eric Gallager  <egall@gwmail.gwu.edu>
 
-	* GCC 5.2.0 released.
+	* check.tpl: Ignore .DS_Store directories.
 
-2015-05-22  David Edelsohn  <dje.gcc@gmail.com>
-
-	Backport from mainline.
-	2015-05-21  David Edelsohn  <dje.gcc@gmail.com>
+2015-05-21  David Edelsohn  <dje.gcc@gmail.com>
 
 	* inclhack.def (aix_externc): New fix.
 	(aix_externcpp[12]): New fix.
@@ -31,9 +32,13 @@
 	* test/base/sys/socket.h [AIX_EXTERNCPP[12]_CHECK]: New test.
 	* test/base/fcntl.h: New file.
 
-2015-04-22  Release Manager
+2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
+
+	* aclocal.m4: Regenerated with automake-1.11.6.
+
+2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
 
-	* GCC 5.1.0 released.
+	* mkfixinc.sh: Add *-musl* with no fixes.
 
 2015-03-28  John David Anglin  <danglin@gcc.gnu.org>
 
diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4
index 7237922aa9..7092c90021 100644
--- a/fixincludes/aclocal.m4
+++ b/fixincludes/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/fixincludes/check.tpl b/fixincludes/check.tpl
index 0d1f44431f..ffd2b66c7f 100644
--- a/fixincludes/check.tpl
+++ b/fixincludes/check.tpl
@@ -141,9 +141,8 @@ echo $exitok`
 
 cd $TESTBASE
 
-find * -type f -print | \
-fgrep -v 'CVS/' | \
-fgrep -v '.svn/' > ${TESTDIR}/LIST
+find * -type f ! -name .DS_Store ! -name CVS ! -name .svn -print \
+> ${TESTDIR}/LIST
 
 exitok=`
 exec < ${TESTDIR}/LIST
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 79af6d10f5..3833811769 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -1,12 +1,12 @@
 /*  -*- buffer-read-only: t -*- vi: set ro:
- *
- *DO NOT EDIT THIS FILE   (fixincl.x)
- *
- *It has been AutoGen-ed  August 13, 2015 at 05:25:50 PM by AutoGen 5.18.3
- *From the definitions    inclhack.def
- *and the template file   fixincl
+ * 
+ * DO NOT EDIT THIS FILE   (fixincl.x)
+ * 
+ * It has been AutoGen-ed  Sunday January 31, 2016 at 07:52:05 PM EST
+ * From the definitions    inclhack.def
+ * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 13 17:25:50 UTC 2015
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun 31 Jan 2016 19:52:05 EST
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 230 fixup descriptions.
+ * This file contains 231 fixup descriptions.
  *
  * See README for more information.
  *
@@ -4326,6 +4326,43 @@ static const char* apzHpux11_VsnprintfPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux_Vsscanf fix
+ */
+tSCC zHpux_VsscanfName[] =
+     "hpux_vsscanf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_VsscanfList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_VsscanfMachs[] = {
+        "*-*-hpux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_VsscanfSelect0[] =
+       "(extern int vsscanf\\()char";
+
+#define    HPUX_VSSCANF_TEST_CT  1
+static tTestDesc aHpux_VsscanfTests[] = {
+  { TT_EGREP,    zHpux_VsscanfSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Vsscanf
+ */
+static const char* apzHpux_VsscanfPatch[] = {
+    "format",
+    "%1const char",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux8_Bogus_Inlines fix
  */
 tSCC zHpux8_Bogus_InlinesName[] =
@@ -9448,9 +9485,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          267
+#define REGEX_COUNT          268
 #define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT            230
+#define FIX_COUNT            231
 
 /*
  *  Enumerate the fixes
@@ -9556,6 +9593,7 @@ typedef enum {
     HPUX11_SIZE_T_FIXIDX,
     HPUX11_SNPRINTF_FIXIDX,
     HPUX11_VSNPRINTF_FIXIDX,
+    HPUX_VSSCANF_FIXIDX,
     HPUX8_BOGUS_INLINES_FIXIDX,
     HPUX_C99_INTPTR_FIXIDX,
     HPUX_C99_INTTYPES_FIXIDX,
@@ -10189,6 +10227,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_VsnprintfTests,   apzHpux11_VsnprintfPatch, 0 },
 
+  {  zHpux_VsscanfName,    zHpux_VsscanfList,
+     apzHpux_VsscanfMachs,
+     HPUX_VSSCANF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_VsscanfTests,   apzHpux_VsscanfPatch, 0 },
+
   {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
      apzHpux8_Bogus_InlinesMachs,
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index fc72add35d..8b6d1fe3a1 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2273,6 +2273,20 @@ fix = {
 };
 
 /*
+ *  Fix missing const in hpux vsscanf declaration
+ */
+fix = {
+    hackname = hpux_vsscanf;
+    mach    = "*-*-hpux*";
+    files   = stdio.h;
+    select  = '(extern int vsscanf\()char';
+    c_fix   = format;
+    c_fix_arg = "%1const char";
+
+    test_text = 'extern int vsscanf(char *, const char *, __va_list);';
+};
+
+/*
  *  get rid of bogus inline definitions in HP-UX 8.0
  */
 fix = {
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
index 6653fedb6e..0d96c8ca87 100755
--- a/fixincludes/mkfixinc.sh
+++ b/fixincludes/mkfixinc.sh
@@ -19,7 +19,8 @@ case $machine in
     powerpc-*-eabi*    | \
     powerpc-*-rtems*   | \
     powerpcle-*-eabisim* | \
-    powerpcle-*-eabi* )
+    powerpcle-*-eabi* | \
+    *-musl* )
 	#  IF there is no include fixing,
 	#  THEN create a no-op fixer and exit
 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/fixincludes/tests/base/stdio.h b/fixincludes/tests/base/stdio.h
index 275931c52c..4ca4fafeb9 100644
--- a/fixincludes/tests/base/stdio.h
+++ b/fixincludes/tests/base/stdio.h
@@ -59,6 +59,11 @@ extern int vsnprintf(char *, _hpux_size_t, const char *, __gnuc_va_list);
 #endif  /* HPUX11_VSNPRINTF_CHECK */
 
 
+#if defined( HPUX_VSSCANF_CHECK )
+extern int vsscanf(const char *, const char *, __gnuc_va_list);
+#endif  /* HPUX_VSSCANF_CHECK */
+
+
 #if defined( IRIX_STDIO_DUMMY_VA_LIST_CHECK )
 extern int printf( const char *, __gnuc_va_list );
 #endif  /* IRIX_STDIO_DUMMY_VA_LIST_CHECK */