OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/28190 (libjava bootstrap failure on IRIX 6.5: stdint.h misdetection) 

PR libgcj/28190
	* inclhack.def (irix_stdint_c99): New fix.
	* fixincl.x: Regenerate.
	* tests/base/stdint.h: New test.

From-SVN: r126377
This commit is contained in:
Rainer Orth 2007-07-05 18:43:16 +00:00 committed by Rainer Orth
parent bd76921050
commit 8919fa4a77
4 changed files with 96 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fixincludes/ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-05 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
PR libgcj/28190
* inclhack.def (irix_stdint_c99): New fix.
* fixincl.x: Regenerate.
* tests/base/stdint.h: New test.
2007-06-06 Steve Ellcey <sje@cup.hp.com>
PR testsuite/31828

66
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Tuesday June 5, 2007 at 02:48:40 PM PDT
* It has been AutoGen-ed Friday June 29, 2007 at 06:59:26 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jun 5 14:48:40 PDT 2007
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 29 18:59:26 MEST 2007
*
* 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 209 fixup descriptions.
* This file contains 210 fixup descriptions.
*
* See README for more information.
*
@ -26,8 +26,7 @@
*
* You may redistribute it and/or modify it under the terms of the
* GNU General Public License, as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
* Foundation; either version 2, or (at your option) any later version.
*
* inclhack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -35,10 +34,10 @@
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with inclhack. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
* along with inclhack. See the file "COPYING". If not,
* write to: The Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@ -3918,6 +3917,45 @@ typedef int socklen_t;\n\
#endif /* _NO_XOPEN4 && _NO_XOPEN5 */",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Irix_Stdint_C99 fix
*/
tSCC zIrix_Stdint_C99Name[] =
"irix_stdint_c99";
/*
* File name selection pattern
*/
tSCC zIrix_Stdint_C99List[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
tSCC* apzIrix_Stdint_C99Machs[] = {
"mips-sgi-irix6.5",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zIrix_Stdint_C99Select0[] =
"(#ifndef __c99\n\
)(#error This header file is to be used only for c99 mode compilations)";
#define IRIX_STDINT_C99_TEST_CT 1
static tTestDesc aIrix_Stdint_C99Tests[] = {
{ TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Irix_Stdint_C99
*/
static const char* apzIrix_Stdint_C99Patch[] = {
"format",
"#if 0\n\
%2",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Irix_Stdio_Va_List fix
@ -8518,9 +8556,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 254
#define REGEX_COUNT 255
#define MACH_LIST_SIZE_LIMIT 261
#define FIX_COUNT 209
#define FIX_COUNT 210
/*
* Enumerate the fixes
@ -8619,6 +8657,7 @@ typedef enum {
IRIX_ASM_APOSTROPHE_FIXIDX,
IRIX_LIMITS_CONST_FIXIDX,
IRIX_SOCKLEN_T_FIXIDX,
IRIX_STDINT_C99_FIXIDX,
IRIX_STDIO_VA_LIST_FIXIDX,
IRIX_WCSFTIME_FIXIDX,
ISC_FMOD_FIXIDX,
@ -9203,6 +9242,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 },
{ zIrix_Stdint_C99Name, zIrix_Stdint_C99List,
apzIrix_Stdint_C99Machs,
IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 },
{ zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList,
apzIrix_Stdio_Va_ListMachs,
IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

18
fixincludes/inclhack.def
View File

@ -2210,6 +2210,24 @@ fix = {
test_text = "#define _SOCKLEN_T\ntypedef u_int32_t socklen_t;";
};
/*
* IRIX 6.5 <stdint.h> only works with ISO C99 and errors out
* otherwise.
*/
fix = {
hackname = irix_stdint_c99;
files = stdint.h;
select = "(#ifndef __c99\n)(#error This header file is to be used only for c99 mode compilations)";
mach = "mips-sgi-irix6.5";
c_fix = format;
c_fix_arg = "#if 0\n"
"%2";
test_text =
"#ifndef __c99\n#error This header file is to be used only for c99 mode compilations\n#else";
};
/*
* IRIX 5.x's stdio.h and IRIX 6.5's internal/stdio_core.h declare
* some functions that take a va_list as

16
fixincludes/tests/base/stdint.h Normal file
View File

@ -0,0 +1,16 @@
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/stdint.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( IRIX_STDINT_C99_CHECK )
#if 0
#error This header file is to be used only for c99 mode compilations
#else
#endif /* IRIX_STDINT_C99_CHECK */