diff options
| author | gingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-17 08:00:15 +0000 |
|---|---|---|
| committer | gingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-17 08:00:15 +0000 |
| commit | 521cb37054b169c029be41b44b48d4cdc10bf561 (patch) | |
| tree | ae166794158958dd01fbc27332f10104019b1592 /fixincludes | |
| parent | feb218cb025538998a3e00481081c2a5a2683cb6 (diff) | |
| download | gcc-521cb37054b169c029be41b44b48d4cdc10bf561.tar.gz | |
2011-05-17 Tristan Gingold <gingold@adacore.com>
* inclhack.def (solaris_complex_cxx): Fix syntax.
* fixincl.x: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173818 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 5 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 10 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index aba71a8c1d7..4a5e1660db9 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,5 +1,10 @@ 2011-05-17 Tristan Gingold <gingold@adacore.com> + * inclhack.def (solaris_complex_cxx): Fix syntax. + * fixincl.x: Regenerate. + +2011-05-17 Tristan Gingold <gingold@adacore.com> + * check.tpl: Shell-quote testing file. 2011-03-22 Joseph Myers <joseph@codesourcery.com> diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index d9117d8e3fd..d9d6f6bfed1 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Monday November 8, 2010 at 08:33:47 PM MET + * It has been AutoGen-ed May 16, 2011 at 02:55:35 PM by AutoGen 5.11.1 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Nov 8 20:33:47 MET 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon May 16 14:55:35 CEST 2011 * * You must regenerate it. Use the ./genfixes script. * @@ -6256,10 +6256,12 @@ tSCC* apzSolaris_Complex_CxxMachs[] = { * Fix Command Arguments for Solaris_Complex_Cxx */ static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z, - "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\ + "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\ +#ifdef\t__cplusplus\\\n\ extern \"C\" {\\\n\ #endif", - "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\ + "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\ +#ifdef\t__cplusplus\\\n\ }\\\n\ #endif", (char*)NULL }; diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index ac8f795834b..a20ab9d79a5 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -3315,9 +3315,9 @@ fix = { hackname = solaris_complex_cxx; mach = "*-*-solaris2.*"; files = complex.h; - sed = "/#if[ \t]*!defined(__cplusplus)/c" + sed = "/#if[ \t]*!defined(__cplusplus)/c\\\n" "#ifdef\t__cplusplus\\\nextern \"C\" {\\\n#endif"; - sed = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c" + sed = "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n" "#ifdef\t__cplusplus\\\n}\\\n#endif"; test_text = "#if !defined(__cplusplus)\n" "#endif /* !defined(__cplusplus) */"; |