diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-11-26 22:00:51 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2004-11-26 22:00:51 +0000 |
| commit | 9fcc7481f804e1add6887c3c870f53343999da53 (patch) | |
| tree | 0bd62f15b29db4ef106e13e85814661a15a5f4d8 /fixincludes/inclhack.def | |
| parent | 44379973a5a46ef1180e7654f9af382f55b49cb2 (diff) | |
| download | gcc-9fcc7481f804e1add6887c3c870f53343999da53.zip gcc-9fcc7481f804e1add6887c3c870f53343999da53.tar.gz gcc-9fcc7481f804e1add6887c3c870f53343999da53.tar.bz2 | |
inclhack.def (gnu_types): Do not use on Solaris 2.1x.
2004-11-26 Mark Mitchell <mark@codesourcery.com>
* inclhack.def (gnu_types): Do not use on Solaris 2.1x.
(stdio_va_list): Likewise.
(stdio_stdarg.h): Likewise.
(solaris_stdio_tag): Add bypass.
* fixincl.x: Regenerated.
From-SVN: r91351
Diffstat (limited to 'fixincludes/inclhack.def')
| -rw-r--r-- | fixincludes/inclhack.def | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 8c012f7..28dbd46 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1177,6 +1177,9 @@ fix = { 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" @@ -2599,6 +2602,9 @@ fix = { files = stdio_tag.h; select = '__cplusplus < 54321L'; + /* In Solaris 10, the code in stdio_tag.h is conditionalized on + "!defined(__GNUC__)" so we no longer need to fix it. */ + bypass = '__GNUC__'; sed = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/'; test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)"; @@ -2664,6 +2670,12 @@ fix = { hackname = stdio_stdarg_h; files = stdio.h; bypass = "include.*(stdarg\.h|machine/ansi\.h)"; + /* + * On Solaris 10, this fix is unncessary; <stdio.h> includes + * <iso/stdio_iso.h>, which includes <sys/va_list.h>. + */ + mach = '*-*-solaris2.1[0-9]'; + not_machine = true; c_fix = wrap; @@ -2689,6 +2701,13 @@ fix = { files = internal/stdio_core.h; files = internal/wchar_core.h; bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list'; + /* + * On Solaris 10, the definition in + * <stdio.h> is guarded appropriately by the _XPG4 feature macro; + * there is therefore no need for this fix there. + */ + mach = '*-*-solaris2.1[0-9]'; + not_machine = true; /* * Use __gnuc_va_list in arg types in place of va_list. |