# HG changeset patch
# Parent 8b946d3b0b1ff1d40660db201feee5925260f9ee
Only declare gets for C++ < 2014 on Solaris (PR libstdc++/78979)
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed November 20, 2016 at 12:02:46 PM by AutoGen 5.16.2
+ * It has been AutoGen-ed January 4, 2017 at 03:58:48 PM by AutoGen 5.16.2
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Nov 20 12:02:47 MET 2016
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jan 4 15:58:48 2017
*
* 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 242 fixup descriptions.
+ * This file contains 245 fixup descriptions.
*
* See README for more information.
*
@@ -7068,6 +7068,84 @@ static const char* apzSolaris_Getc_Stric
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Gets_C11 fix
+ */
+tSCC zSolaris_Gets_C11Name[] =
+ "solaris_gets_c11";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Gets_C11List[] =
+ "iso/stdio_iso.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Gets_C11Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Gets_C11Select0[] =
+ "(extern char[ \t]*\\*gets\\(char \\*\\));";
+
+#define SOLARIS_GETS_C11_TEST_CT 1
+static tTestDesc aSolaris_Gets_C11Tests[] = {
+ { TT_EGREP, zSolaris_Gets_C11Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Gets_C11
+ */
+static const char* apzSolaris_Gets_C11Patch[] = {
+ "format",
+ "#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L\n\
+%1 __attribute__((__deprecated__));\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Gets_Cxx14 fix
+ */
+tSCC zSolaris_Gets_Cxx14Name[] =
+ "solaris_gets_cxx14";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Gets_Cxx14List[] =
+ "iso/stdio_iso.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Gets_Cxx14Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Gets_Cxx14Select0[] =
+ "(#if __STDC_VERSION__ < 201112L)\n\
+(extern char\t\\*gets\\(char \\*\\) __ATTR_DEPRECATED;)";
+
+#define SOLARIS_GETS_CXX14_TEST_CT 1
+static tTestDesc aSolaris_Gets_Cxx14Tests[] = {
+ { TT_EGREP, zSolaris_Gets_Cxx14Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Gets_Cxx14
+ */
+static const char* apzSolaris_Gets_Cxx14Patch[] = {
+ "format",
+ "%1 && __cplusplus < 201402L\n\
+%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Solaris_Int_Const fix
*/
tSCC zSolaris_Int_ConstName[] =
@@ -7820,6 +7898,45 @@ using std::__flsbuf;\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Std_Gets_Cxx14 fix
+ */
+tSCC zSolaris_Std_Gets_Cxx14Name[] =
+ "solaris_std_gets_cxx14";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Std_Gets_Cxx14List[] =
+ "stdio.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Std_Gets_Cxx14Machs[] = {
+ "*-*-solaris2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Std_Gets_Cxx14Select0[] =
+ "using std::gets;";
+
+#define SOLARIS_STD_GETS_CXX14_TEST_CT 1
+static tTestDesc aSolaris_Std_Gets_Cxx14Tests[] = {
+ { TT_EGREP, zSolaris_Std_Gets_Cxx14Select0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Std_Gets_Cxx14
+ */
+static const char* apzSolaris_Std_Gets_Cxx14Patch[] = {
+ "format",
+ "#if __cplusplus < 201402L\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Solaris_Stdio_Tag fix
*/
tSCC zSolaris_Stdio_TagName[] =
@@ -9908,9 +10025,9 @@ static const char* apzX11_SprintfPatch[]
*
* List of all fixes
*/
-#define REGEX_COUNT 279
+#define REGEX_COUNT 282
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 242
+#define FIX_COUNT 245
/*
* Enumerate the fixes
@@ -10087,6 +10204,8 @@ typedef enum {
SOLARIS_COMPLEX_CXX_FIXIDX,
SOLARIS_CXX_LINKAGE_FIXIDX,
SOLARIS_GETC_STRICT_STDC_FIXIDX,
+ SOLARIS_GETS_C11_FIXIDX,
+ SOLARIS_GETS_CXX14_FIXIDX,
SOLARIS_INT_CONST_FIXIDX,
SOLARIS_INT_LIMITS_1_FIXIDX,
SOLARIS_INT_LIMITS_2_FIXIDX,
@@ -10105,6 +10224,7 @@ typedef enum {
SOLARIS_POW_INT_OVERLOAD_FIXIDX,
SOLARIS_RWLOCK_INIT_1_FIXIDX,
SOLARIS_STD___FILBUF_FIXIDX,
+ SOLARIS_STD_GETS_CXX14_FIXIDX,
SOLARIS_STDIO_TAG_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
@@ -11016,6 +11136,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_GETC_STRICT_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Getc_Strict_StdcTests, apzSolaris_Getc_Strict_StdcPatch, 0 },
+ { zSolaris_Gets_C11Name, zSolaris_Gets_C11List,
+ apzSolaris_Gets_C11Machs,
+ SOLARIS_GETS_C11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Gets_C11Tests, apzSolaris_Gets_C11Patch, 0 },
+
+ { zSolaris_Gets_Cxx14Name, zSolaris_Gets_Cxx14List,
+ apzSolaris_Gets_Cxx14Machs,
+ SOLARIS_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Gets_Cxx14Tests, apzSolaris_Gets_Cxx14Patch, 0 },
+
{ zSolaris_Int_ConstName, zSolaris_Int_ConstList,
apzSolaris_Int_ConstMachs,
SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -11106,6 +11236,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_STD___FILBUF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Std___FilbufTests, apzSolaris_Std___FilbufPatch, 0 },
+ { zSolaris_Std_Gets_Cxx14Name, zSolaris_Std_Gets_Cxx14List,
+ apzSolaris_Std_Gets_Cxx14Machs,
+ SOLARIS_STD_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_Std_Gets_Cxx14Tests, apzSolaris_Std_Gets_Cxx14Patch, 0 },
+
{ zSolaris_Stdio_TagName, zSolaris_Stdio_TagList,
apzSolaris_Stdio_TagMachs,
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
@@ -3593,6 +3593,43 @@ fix = {
};
/*
+ * Solaris <iso/stdio_iso.h> should deprecate gets before C11.
+ */
+fix = {
+ hackname = solaris_gets_c11;
+ mach = "*-*-solaris2*";
+ files = "iso/stdio_iso.h";
+ select = "(extern char[ \t]*\\*gets\\(char \\*\\));";
+
+ c_fix = format;
+ c_fix_arg = "#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L\n"
+ "%1 __attribute__((__deprecated__));\n"
+ "#endif";
+
+ test_text = "extern char *gets(char *);";
+};
+
+/*
+ * Solaris <iso/stdio_iso.h> shouldn't declare gets for C++14.
+ */
+fix = {
+ hackname = solaris_gets_cxx14;
+ mach = "*-*-solaris2*";
+ files = "iso/stdio_iso.h";
+ select = <<- _EOSelect_
+(#if __STDC_VERSION__ < 201112L)
+(extern char \*gets\(char \*\) __ATTR_DEPRECATED;)
+_EOSelect_;
+ c_fix = format;
+ c_fix_arg = "%1 && __cplusplus < 201402L\n%2";
+
+ test_text = <<- _EOText_
+#if __STDC_VERSION__ < 201112L
+extern char *gets(char *) __ATTR_DEPRECATED;
+_EOText_;
+};
+
+/*
* Sun Solaris 2 has a version of sys/int_const.h that defines
* UINT8_C and UINT16_C to unsigned constants.
*/
@@ -3982,6 +4019,21 @@ fix = {
};
/*
+ * Solaris <stdio.h> shouldn't use std::gets for C++14.
+ */
+fix = {
+ hackname = solaris_std_gets_cxx14;
+ mach = "*-*-solaris2*";
+ files = "stdio.h";
+ select = "using std::gets;";
+
+ c_fix = format;
+ c_fix_arg = "#if __cplusplus < 201402L\n%0\n#endif";
+
+ test_text = "using std::gets;";
+};
+
+/*
* Sun Solaris 8 has what appears to be some gross workaround for
* some old version of their c++ compiler. G++ doesn't want it
* either, but doesn't want to be tied to SunPRO version numbers.
@@ -12,3 +12,16 @@
#if defined( SOLARIS_GETC_STRICT_STDC_CHECK )
#if !defined(_REENTRANT) && !defined(_LP64) && (!defined(_STRICT_STDC) || (__cplusplus >= 199711L))
#endif /* SOLARIS_GETC_STRICT_STDC_CHECK */
+
+
+#if defined( SOLARIS_GETS_C11_CHECK )
+#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L
+extern char *gets(char *) __attribute__((__deprecated__));
+#endif
+#endif /* SOLARIS_GETS_C11_CHECK */
+
+
+#if defined( SOLARIS_GETS_CXX14_CHECK )
+#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L
+extern char *gets(char *) __ATTR_DEPRECATED;
+#endif /* SOLARIS_GETS_CXX14_CHECK */
@@ -90,6 +90,13 @@ using std::__flsbuf;
#endif /* SOLARIS_STD___FILBUF_CHECK */
+#if defined( SOLARIS_STD_GETS_CXX14_CHECK )
+#if __cplusplus < 201402L
+using std::gets;
+#endif
+#endif /* SOLARIS_STD_GETS_CXX14_CHECK */
+
+
#if defined( STDIO_STDARG_H_CHECK )
#endif /* STDIO_STDARG_H_CHECK */
While investigating PR libstdc++/78979, it turns out that Solaris <stdio.h> incorrectly declares std::gets even for C++14 where it's been removed. This patch fixes that by adding an additional __cplusplus < 201402L guard via fixincludes. This works for Solaris 12 (and 11), but Solaris 10 declares the function unconditionally (i.e. without the __STDC_VERSION__ < 201112L guard and the deprecated attribute), so another fix adds both to handle that version, too. With this in place, the std::gets declaration in <stdio.h> needs a guard, too. While testing this patch together with https://gcc.gnu.org/ml/gcc-patches/2017-01/msg00288.html it turned out another fix is needed which I'm throwing in here, too: <iso/stdlib_c99.h> declares #if defined(_STDC_C11) extern _Noreturn void quick_exit(int); #else extern void quick_exit(int) __NORETURN; #endif /* _STDC_C11 */ and the first one now breaks badly with __STDC_VERSION__ defined to the C11 value: /usr/include/iso/stdlib_c99.h:83:8: error: '_Noreturn' does not name a type extern _Noreturn void quick_exit(int); ^~~~~~~~~ To avoid this, I've changed to C11-only _Noreturn to __attribute__((__noreturn__)). Bootstrapped without regressions on i386-pc-solaris2.1[02] and sparc-sun-solaris2.12 and fixing FAIL: 27_io/headers/cstdio/functions_neg.cc (test for errors, line 24) as designed. fixincludes make check, passes, too. Ok for mainline now? I'd like to backport the patch to the gcc-5 and gcc-6 branches which are equally affected. Thanks. Rainer