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

Keep HP-UX headers from defining __size_t and leaving size_t undefined.

Browse Source 
From-SVN: r45572
This commit is contained in:
Josh Martin 2001-09-13 02:13:41 +00:00 committed by Bruce Korb
parent c1d4e7e179
commit 34b3b0f688
3 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2001-09-12 Josh Martin <josh.martin@abq.sc.philips.com>
* fixinc/inclhack.def(hpux11_size_t): Keep HP-UX headers from
defining __size_t and leaving size_t undefined.
2001-09-12 Diego Novillo <dnovillo@redhat.com>
* basic-block.h (expunge_block): Declare.

49
gcc/fixinc/fixincl.x
View File

@ -5,7 +5,7 @@
* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
* This file contains 144 fixup descriptions.
* This file contains 145 fixup descriptions.
*
* See README for more information.
*
@ -2066,6 +2066,43 @@ static const char* apzHpux11_FabsfPatch[] = {
#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux11_Size_T fix
*/
tSCC zHpux11_Size_TName[] =
"hpux11_size_t";
/*
* File name selection pattern
*/
#define zHpux11_Size_TList (char*)NULL
/*
* Machine/OS name selection pattern
*/
tSCC* apzHpux11_Size_TMachs[] = {
"*-hp-hpux*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux11_Size_TSelect0[] =
"^#define __size_t size_t";
#define HPUX11_SIZE_T_TEST_CT 1
static tTestDesc aHpux11_Size_TTests[] = {
{ TT_EGREP, zHpux11_Size_TSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux11_Size_T
*/
static const char* apzHpux11_Size_TPatch[] = {
"format",
"_hpux_size_t",
"__size_t",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux11_Uint32_C fix
@ -5614,9 +5651,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 151
#define REGEX_COUNT 152
#define MACH_LIST_SIZE_LIMIT 279
#define FIX_COUNT 144
#define FIX_COUNT 145
/*
* Enumerate the fixes
@ -5673,6 +5710,7 @@ typedef enum {
HPUX10_CPP_POW_INLINE_FIXIDX,
HPUX11_CPP_POW_INLINE_FIXIDX,
HPUX11_FABSF_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
HPUX11_UINT32_C_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
@ -6024,6 +6062,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 },
{ zHpux11_Size_TName, zHpux11_Size_TList,
apzHpux11_Size_TMachs,
HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_Size_TTests, apzHpux11_Size_TPatch, 0 },
{ zHpux11_Uint32_CName, zHpux11_Uint32_CList,
apzHpux11_Uint32_CMachs,
HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

20
gcc/fixinc/inclhack.def
View File

@ -1195,6 +1195,7 @@ fix = {
" }\n";
};
/*
* Keep HP-UX 11 from stomping on C++ math namespace
* with defines for fabsf.
@ -1215,6 +1216,25 @@ fix = {
};
/*
* Prevent HP-UX 11 from defining __size_t and preventing size_t from
* being defined by having it define _hpux_size_t instead.
*/
fix = {
hackname = hpux11_size_t;
mach = "*-hp-hpux*";
select = "^#define __size_t size_t";
c_fix = format;
c_fix_arg = "_hpux_size_t";
c_fix_arg = "__size_t";
test_text =
"#define __size_t size_t\n"
" extern int getpwuid_r( char *, __size_t, struct passwd **);\n";
};
/*
* In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition
* of UINT32_C has undefined behavior according to ISO/ANSI: