# 2013-02-07  Stefan Teleman <[email protected]>

# Starting with S11.2, Solaris Standard C Library header files

# are compliant with C++2003 and C++2011. Therefore the fixinclude

# hacks provided below are no longer necessary.

--- gcc-4.8.2/fixincludes/inclhack.def	2013-05-31 04:43:36.000000000 -0700

+++ gcc-4.8.2/fixincludes/inclhack.def	2013-10-17 11:13:57.773623647 -0700

@@ -317,63 +317,6 @@

 	_EndOfHeader_;

 };

-

-/*

- * Solaris <sys/varargs.h> is a DDK (aka kernel-land) header providing

- * the same interface as <stdarg.h>.  No idea why they couldn't have just

- * used the standard header.

- */

-fix = {

-    hackname = AAB_solaris_sys_varargs_h;

-    files    = "sys/varargs.h";

-    mach     = '*-*-solaris*';

-    replace  = <<-  _EndOfHeader_

-	#ifdef __STDC__

-	  #include <stdarg.h>

-	#else

-	  #include <varargs.h>

-	#endif

-	_EndOfHeader_;

-};

-

-

-/*

- *  Fix non-ANSI memcpy declaration that conflicts with gcc's builtin

- *  declaration on Sun OS 4.x.  We must only fix this on Sun OS 4.x, because

- *  many other systems have similar text but correct versions of the file.

- *  To ensure only Sun's is fixed, we grep for a likely unique string.

- *  Fix also on sysV68 R3V7.1 (head/memory.h\t50.1\t )

- */

-fix = {

-    hackname = AAB_sun_memcpy;

-    files    = memory.h;

-    select   = "/\\*\t@\\(#\\)"

-             "(head/memory.h\t50.1\t "

-             "|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";

-

-    replace = <<-  _EndOfHeader_

-	/* This file was generated by fixincludes */

-	#ifndef __memory_h__

-	  #define __memory_h__

-

-	  #ifdef __STDC__

-	    extern void *memccpy();

-	    extern void *memchr();

-	    extern void *memcpy();

-	    extern void *memset();

-	  #else

-	    extern char *memccpy();

-	    extern char *memchr();

-	    extern char *memcpy();

-	    extern char *memset();

-	  #endif /* __STDC__ */

-

-	  extern int memcmp();

-

-	#endif /* __memory_h__ */

-	_EndOfHeader_;

-};

-

 /*

  * Fix assert.h on VxWorks:

  */

@@ -1774,35 +1717,6 @@

 };

 /*

- * Fix these files to use the types we think they should for

- * ptrdiff_t, size_t, and wchar_t.

- *

- * This defines the types in terms of macros predefined by our 'cpp'.

- * This is supposedly necessary for glibc's handling of these types.

- * It's probably not necessary for anyone else, but it doesn't hurt.

- */

-fix = {

-    hackname  = gnu_types;

-    files  = "sys/types.h";

-    files  = "stdlib.h";

-    files  = "sys/stdtypes.h";

-    files  = "stddef.h";

-    files  = "memory.h";

-    files  = "unistd.h";

-    bypass    = '_GCC_(PTRDIFF|SIZE|WCHAR)_T';

-    select    = "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";

-    c_fix     = gnu_type;

-    /* The Solaris 10 headers already define these types correctly.  */

-    mach   = '*-*-solaris2.1[0-9]*';

-    not_machine = true;

-

-    test_text = "typedef long int ptrdiff_t; /* long int */\n"

-                "typedef uint_t size_t; /* uint_t */\n"

-                "typedef ushort_t wchar_t; /* ushort_t */";

-};

-

-

-/*

  *  Fix HP & Sony's use of "../machine/xxx.h"

  *  to refer to:  <machine/xxx.h>

  */

@@ -2667,39 +2581,6 @@

 /*

- *  Some math.h files define struct exception (it's in the System V

- *  Interface Definition), which conflicts with the class exception defined

- *  in the C++ file std/stdexcept.h.  We redefine it to __math_exception.

- *  This is not a great fix, but I haven't been able to think of anything

- *  better.

- */

-fix = {

-    hackname  = math_exception;

-    files     = math.h;

-    select    = "struct exception";

-    /*

-     * This should be bypassed on __cplusplus, but some supposedly C++

-     * aware headers, such as Solaris 8 and 9, don't wrap their struct

-     * exception either.  So currently we bypass only for glibc, based on a

-     * comment in the fixed glibc header.  Ick.

-     */

-    bypass    = 'We have a problem when using C\+\+|for C\+\+, '

-		'_[a-z0-9A-Z_]+_exception; for C, exception';

-    c_fix     = wrap;

-

-    c_fix_arg = "#ifdef __cplusplus\n"

-                "#define exception __math_exception\n"

-                "#endif\n";

-

-    c_fix_arg = "#ifdef __cplusplus\n"

-                "#undef exception\n"

-                "#endif\n";

-

-    test_text = "typedef struct exception t_math_exception;";

-};

-

-

-/*

  *  This looks pretty broken to me.  ``dbl_max_def'' will contain

  *  "define DBL_MAX " at the start, when what we really want is just

  *  the value portion.  Can't figure out how to write a test case

@@ -3164,653 +3045,6 @@

 /*

- *  Solaris 10+ <sys/feature_tests.h> defines _RESTRICT_KYWD as restrict

- *  for C99.  This is wrong for C++, which needs many C99 features, but

- *  only supports __restrict.

- */

-fix = {

-    hackname  = solaris___restrict;

-    files     = sys/feature_tests.h;

-    select    = "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";

-    mach      = "*-*-solaris2*";

-    c_fix     = format;

-    c_fix_arg = "#ifdef __cplusplus\n#define\t_RESTRICT_KYWD\t__restrict\n"

-    	        "#else\n%0\n#endif";

-    test_text = "#define	_RESTRICT_KYWD	restrict";

-};

-

-

-/*

- * Solaris 10+ complex.h defines _Complex_I and _Imaginary_I in terms of

- * themselves, which are Sun Studio compiler intrinsics.  Remove _Imaginary_I

- * and imaginary definitions which are not supported by GCC.

- */

-fix = {

-    hackname  = solaris_complex;

-    mach      = "*-*-solaris2.*";

-    files     = complex.h;

-    select    = "#define[ \t]_Complex_I[ \t]_Complex_I";

-    sed	      = "s/#define[ \t]_Complex_I[ \t]_Complex_I/"

-		"#define\t_Complex_I\t(__extension__ 1.0iF)/";

-    sed	      = "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d";

-    sed	      = "/#define[ \t]imaginary[ \t]_Imaginary/d";

-    sed       = "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/";

-    test_text = "#define	_Complex_I	_Complex_I\n"

-    		"#define	complex		_Complex\n"

-		"#define	_Imaginary_I	_Imaginary_I\n"

-		"#define	imaginary	_Imaginary\n"

-		"#undef	I\n"

-		"#define	I		_Imaginary_I";

-};

-

-

-/*

- * Solaris 10+ <complex.h> is wrapped in #ifndef __cplusplus.  Wrap in

- * extern "C" instead so libstdc++ can use it.

- */

-fix = {

-    hackname  = solaris_complex_cxx;

-    mach      = "*-*-solaris2.*";

-    files     = complex.h;

-    sed	      = "/#if[ \t]*!defined(__cplusplus)/c\\\n"

-    		"#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif";

-    sed	      = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n"

-		"#ifdef\t__cplusplus\\\n}\\\n#endif";

-    test_text = "#if !defined(__cplusplus)\n"

-		"#endif	/* !defined(__cplusplus) */";

-};

-

-

-/*

- *  g++ rejects functions declared with both C and C++ linkage.

- */

-fix = {

-    hackname  = solaris_cxx_linkage;

-    mach      = '*-*-solaris2*';

-    files     = "iso/stdlib_iso.h";

-    select    = "(#if __cplusplus >= 199711L)\n"

-	        "(extern \"C\\+\\+\" \\{\n)"

-	        "(.*(bsearch|qsort).*)";

-    c_fix     = format;

-    c_fix_arg = "%1 && !__GNUG__\n%2%3";

-

-    test_text =

-    "#if __cplusplus >= 199711L\n"

-    "extern \"C++\" {\n"

-    "	void *bsearch(const void *, const void *, size_t, size_t,";

-};

-

-

-/*

- *  Solaris <iso/stdio_iso.h> doesn't declare getc for C++ with

- *  _STRICT_STDC, but uses it.

- */

-fix = {

-    hackname  = solaris_getc_strict_stdc;

-    mach      = "*-*-solaris2*";

-    files     = "iso/stdio_iso.h";

-    select    = "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";

-    c_fix     = format;

-    c_fix_arg = "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2";

-

-    test_text =

-    "#if	!defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC)";

-};

-

-

-/*

- *  Before Solaris 10, <iso/setjmp_iso.h> doesn't mark longjump noreturn.

- */

-fix = {

-    hackname  = solaris_longjmp_noreturn;

-    mach      = "*-*-solaris2*";

-    files     = "iso/setjmp_iso.h";

-    bypass    = "__NORETURN";

-    select    = "(.*longjmp\\(jmp_buf.*[^)]+\\));";

-    c_fix     = format;

-    c_fix_arg = "%1 __attribute__ ((__noreturn__));";

-

-    test_text = "extern void longjmp(jmp_buf, int);";

-};

-

-

-/*

- * Sun Solaris 10 defines several C99 math macros in terms of

- * builtins specific to the Studio compiler, in particular not

- * compatible with the GNU compiler.

- */

-fix = {

-    hackname = solaris_math_1;

-    select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\tHUGE_VA%1\t(__builtin_huge_va%2())";

-    c_fix_arg = "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)";

-    test_text =

-    '#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"'"\n"

-    "#undef	HUGE_VAL\n"

-    "#define	HUGE_VAL	__builtin_huge_val\n"

-    "#undef	HUGE_VALF\n"

-    "#define	HUGE_VALF	__builtin_huge_valf\n"

-    "#undef	HUGE_VALL\n"

-    "#define	HUGE_VALL	__builtin_huge_vall";

-};

-

-fix = {

-    hackname = solaris_math_2;

-    select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\tINFINITY\t(__builtin_inff())";

-    c_fix_arg = "^#define[ \t]+INFINITY[ \t]+__builtin_infinity";

-    test_text =

-    '#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"'"\n"

-    "#undef	INFINITY\n"

-    "#define	INFINITY	__builtin_infinity";

-};

-

-fix = {

-    hackname = solaris_math_3;

-    select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\tNAN\t\t(__builtin_nanf(\"\"))";

-    c_fix_arg = "^#define[ \t]+NAN[ \t]+__builtin_nan";

-    test_text =

-    '#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"'"\n"

-    "#undef	NAN\n"

-    "#define	NAN	__builtin_nan";

-};

-

-fix = {

-    hackname = solaris_math_4;

-    select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\tfpclassify(x) \\\n"

-                "  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))";

-    c_fix_arg = "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)";

-    test_text =

-    '#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"'"\n"

-    "#undef	fpclassify\n"

-    "#define	fpclassify(x)	__builtin_fpclassify(x)";

-};

-

-fix = {

-    hackname = solaris_math_8;

-    select = '@\(#\)math_c99\.h' "[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n"

-                "\t\t\t   ? __builtin_signbitf(x) \\\n"

-                "\t\t\t   : sizeof(x) == sizeof(long double) \\\n"

-                "\t\t\t     ? __builtin_signbitl(x) \\\n"

-                "\t\t\t     : __builtin_signbit(x))";

-    c_fix_arg = "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)";

-    test_text = <<- _EOText_

-	#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"

-	#undef	signbit

-	#define	signbit(x)	__builtin_signbit(x)

-	_EOText_;

-};

-

-fix = {

-    hackname = solaris_math_9;

-    select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    bypass = "__GNUC__";

-    files = iso/math_c99.h;

-    c_fix = format;

-    c_fix_arg = "#define\t%1(x, y)%2__builtin_%1(x, y)";

-    c_fix_arg = "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)";

-    test_text =

-    '#ident	"@(#)math_c99.h	1.9	04/11/01 SMI"'"\n"

-    "#undef	isgreater\n"

-    "#define	isgreater(x, y)		((x) __builtin_isgreater(y))\n"

-    "#undef	isgreaterequal\n"

-    "#define	isgreaterequal(x, y)	((x) __builtin_isgreaterequal(y))\n"

-    "#undef	isless\n"

-    "#define	isless(x, y)		((x) __builtin_isless(y))\n"

-    "#undef	islessequal\n"

-    "#define	islessequal(x, y)	((x) __builtin_islessequal(y))\n"

-    "#undef	islessgreater\n"

-    "#define	islessgreater(x, y)	((x) __builtin_islessgreater(y))\n"

-    "#undef	isunordered\n"

-    "#define	isunordered(x, y)	((x) __builtin_isunordered(y))";

-};

-

-/*

- * On Solaris 11, if you do isinf(NaN) you'll get a floating point

- * exception.  Provide an alternative using GCC's builtin.

- */

-

-fix = {

-    hackname  = solaris_math_10;

-    select    = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    files     = iso/math_c99.h;

-    c_fix     = format;

-    c_fix_arg = "#define\tisinf(x) __builtin_isinf(x)";

-    c_fix_arg = "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n"

-                "[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n"

-                "[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n"

-                "[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)";

-    test_text =

-    '#pragma ident	"@(#)math_c99.h	1.12	07/01/21 SMI"'"\n"

-    "#undef	isinf\n"

-    "#define	isinf(x)	__extension__( \\\\\n"

-    "			{ __typeof(x) __x_i = (x); \\\\\n"

-    "			__x_i == (__typeof(__x_i)) INFINITY || \\\\\n"

-    "			__x_i == (__typeof(__x_i)) (-INFINITY); })";

-};

-

-/*

- * Sun Solaris defines PTHREAD_MUTEX_INITIALIZER with a trailing

- * "0" for the last field of the pthread_mutex_t structure, which is

- * of type upad64_t, which itself is typedef'd to int64_t, but with

- * __STDC__ defined (e.g. by -ansi) it is a union. So change the

- * initializer to "{0}" instead

- */

-fix = {

-    hackname = solaris_mutex_init_2;

-    select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    files = pthread.h;

-    /*

-     * On Solaris 10, this fix is unnecessary because upad64_t is

-     * always defined correctly regardless of the definition of the

-     * __STDC__ macro.  The first "mach" pattern matches up to

-     * solaris9.  The second "mach" pattern will not match any two (or

-     * more) digit solaris version, but it will match e.g. 2.5.1.

-     */

-    mach = '*-*-solaris2.[0-9]', '*-*-solaris2.[0-9][!0-9]*';

-    c_fix = format;

-    c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"

-                "%0\n"

-                "#else\n"

-                "%1, {0}}%4\n"

-                "#endif";

-    c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+"

-                "(|/\*.*\*/[ \t]*\\\\\n[ \t]*)\\{.*)"

-                ",[ \t]*0\\}" "(|[ \t].*)$";

-    test_text =

-    '#ident "@(#)pthread.h  1.26  98/04/12 SMI"'"\n"

-    "#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n"

-    "#define PTHREAD_COND_INITIALIZER\t{{{0}, 0}, 0}\t/* DEFAULTCV */\n"

-    "#define	PTHREAD_MUTEX_INITIALIZER		/* = DEFAULTMUTEX */	\\\\\n"

-    "	{{0, 0, 0, DEFAULT_TYPE, _MUTEX_MAGIC}, {{{0}}}, 0}\n"

-    "#define	PTHREAD_COND_INITIALIZER		/* = DEFAULTCV */	\\\\\n"

-    "	{{{0, 0, 0, 0}, DEFAULT_TYPE, _COND_MAGIC}, 0}";

-};

-

-

-/*

- *  The pow overloads with int were removed in C++ 2011 DR 550.

- */

-fix = {

-    hackname  = solaris_pow_int_overload;

-    mach      = '*-*-solaris2*';

-    files     = "iso/math_iso.h";

-    select    = "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\)"

-		" *\\{[^{}]*\n[^{}]*\\}";

-    c_fix     = format;

-    c_fix_arg = "#if __cplusplus < 201103L\n%0\n#endif";

-

-    test_text =

-    "	inline long double pow(long double __X, int __Y) { return\n"

-    "		__powl(__X, (long double) (__Y)); }";

-};

-

-

-/*

- * Sun Solaris defines PTHREAD_RWLOCK_INITIALIZER with a "0" for some

- *  fields of the pthread_rwlock_t structure, which are of type

- *  upad64_t, which itself is typedef'd to int64_t, but with __STDC__

- *  defined (e.g. by -ansi) it is a union. So change the initializer

- *  to "{0}" instead.

- */

-fix = {

-    hackname = solaris_rwlock_init_1;

-    select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    files = pthread.h;

-    mach = '*-*-solaris*';

-    c_fix = format;

-    c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"

-                "%0\n"

-                "#else\n"

-                "%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n"

-                "#endif";

-    c_fix_arg = "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)"

-                "\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$";

-

-    test_text =

-    '#ident "@(#)pthread.h  1.26  98/04/12 SMI"'"\n"

-    "#define PTHREAD_RWLOCK_INITIALIZER\t{0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}}";

-};

-

-

-/*

- * Sun Solaris defines PTHREAD_ONCE_INIT as an array containing a

- * structure.  As such, it need two levels of brackets, but only

- * contains one.  Wrap the macro definition in an extra layer.

- */

-fix = {

-    hackname = solaris_once_init_1;

-    select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    files = pthread.h;

-    mach = '*-*-solaris*';

-    c_fix = format;

-    c_fix_arg = "%1{%2}%3";

-    c_fix_arg = "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$";

-    test_text =

-    '#pragma ident	"@(#)pthread.h	1.37	04/09/28 SMI"'"\n"

-    "#define PTHREAD_ONCE_INIT\t{0, 0, 0, PTHREAD_ONCE_NOTDONE}";

-};

-

-

-/*

- * Sun Solaris defines PTHREAD_ONCE_INIT with a "0" for some

- *  fields of the pthread_once_t structure, which are of type

- *  upad64_t, which itself is typedef'd to int64_t, but with __STDC__

- *  defined (e.g. by -ansi) it is a union. So change the initializer

- *  to "{0}" instead.  This test relies on solaris_once_init_1.

- */

-fix = {

-    hackname = solaris_once_init_2;

-    select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";

-    files = pthread.h;

-    /*

-     * On Solaris 10, this fix is unnecessary because upad64_t is

-     * always defined correctly regardless of the definition of the

-     * __STDC__ macro.  The first "mach" pattern matches up to

-     * solaris9.  The second "mach" pattern will not match any two (or

-     * more) digit solaris version, but it will match e.g. 2.5.1.

-     */

-    mach = '*-*-solaris2.[0-9]', '*-*-solaris2.[0-9][!0-9]*';

-    c_fix = format;

-    c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n"

-                "%0\n"

-                "#else\n"

-                "%1{0}, {0}, {0}, {%3}%4\n"

-                "#endif";

-    c_fix_arg = "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)"

-                "(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$";

-    test_text =

-    '#ident "@(#)pthread.h  1.26  98/04/12 SMI"'"\n"

-    "#define PTHREAD_ONCE_INIT\t{{0, 0, 0, PTHREAD_ONCE_NOTDONE}}\n";

-};

-

-