<internal/stdio_core.h> too.
(stdio_va_list): Apply to IRIX 6.5 <internal/stdio_core.h> and
<internal/wchar_core.h> too.
Substitute va_list uses in inline definition.
* fixinc/fixincl.x: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68811
138bc75d-0d04-0410-961f-
82ee72b054a4
2003-07-02 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+ * fixinc/inclhack.def (irix_stdio_va_list): Apply to IRIX 6.5
+ <internal/stdio_core.h> too.
+ (stdio_va_list): Apply to IRIX 6.5 <internal/stdio_core.h> and
+ <internal/wchar_core.h> too.
+ Substitute va_list uses in inline definition.
+ * fixinc/fixincl.x: Regenerate.
+
+2003-07-02 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
* config/mips/iris5.h (SET_FILE_NUMBER): Moved here from iris3.h.
Undef before redefinition.
(LABEL_AFTER_LOC): Likewise.
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Wednesday May 28, 2003 at 12:55:57 AM CDT
+ * It has been AutoGen-ed Wednesday July 2, 2003 at 03:26:19 AM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Wed May 28 00:55:57 CDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul 2 03:26:20 MEST 2003
*
* You must regenerate it. Use the ./genfixes script.
*
* File name selection pattern
*/
tSCC zIrix_Stdio_Va_ListList[] =
- "|stdio.h|";
+ "|stdio.h|internal/stdio_core.h|";
/*
* Machine/OS name selection pattern
*/
* File name selection pattern
*/
tSCC zStdio_Va_ListList[] =
- "|stdio.h|";
+ "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|";
/*
* Machine/OS name selection pattern
*/
static const char* apzStdio_Va_ListPatch[] = { "sed",
"-e", "s@ va_list @ __gnuc_va_list @\n\
s@ va_list)@ __gnuc_va_list)@\n\
+s@va_list _ap;@__gnuc_va_list _ap;@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
s@ _VA_LIST_));@ __gnuc_va_list));@\n\
s@ __VA_LIST__));@ __gnuc_va_list));@\n\
s@ va_list@ __not_va_list__@\n\
};
/*
- * IRIX 5.x's stdio.h declares some functions that take a va_list as
+ * IRIX 5.x's stdio.h and IRIX 6.5's internal/stdio_core.h declare
+ * some functions that take a va_list as
* taking char *. However, GCC uses void * for va_list, so
* calling vfprintf with a va_list fails in C++. */
fix = {
hackname = irix_stdio_va_list;
files = stdio.h;
+ files = internal/stdio_core.h;
select = '(printf\(.*), /\* va_list \*/ char \*';
c_fix = format;
* presence of __gnuc_va_list, __DJ_va_list, or _G_va_list is taken
* to indicate that the header knows what it's doing -- under SUSv2,
* stdio.h is required to define va_list, and we shouldn't break that.
+ * On IRIX 6.5, internal/wchar_core.h used to get its definition of
+ * va_list from stdio.h. Since this doesn't happen any longer, use
+ * __gnuc_va_list there, too.
*/
fix = {
hackname = stdio_va_list;
files = stdio.h;
+ files = internal/stdio_core.h;
+ files = internal/wchar_core.h;
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
/*
*/
sed = "s@ va_list @ __gnuc_va_list @\n"
"s@ va_list)@ __gnuc_va_list)@\n"
+ "s@va_list _ap;@__gnuc_va_list _ap;@\n"
+ "s@(va_list)&@(__gnuc_va_list)\\&@\n"
"s@ _VA_LIST_));@ __gnuc_va_list));@\n"
"s@ __VA_LIST__));@ __gnuc_va_list));@\n"
"s@ va_list@ __not_va_list__@\n"