Commit 553cba65 by Rainer Orth Committed by Rainer Orth

inclhack.def (svr4_profil): Don't apply on IRIX 5/6.

	* fixinc/inclhack.def (svr4_profil): Don't apply on IRIX 5/6.
	* fixinc/fixincl.x: Regenerate.

From-SVN: r81437
parent 1ab2888d
2004-05-03 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* fixinc/inclhack.def (svr4_profil): Don't apply on IRIX 5/6.
* fixinc/fixincl.x: Regenerate.
2004-05-03 Uros Bizjak <uros@kss-loka.si> 2004-05-03 Uros Bizjak <uros@kss-loka.si>
* config/i386/i386.md (*fyl2x_sfxf3, *fyl2x_dfxf3): Remove insn * config/i386/i386.md (*fyl2x_sfxf3, *fyl2x_dfxf3): Remove insn
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Friday April 23, 2004 at 06:53:51 AM MDT * It has been AutoGen-ed Monday May 3, 2004 at 05:17:48 PM MEST
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Apr 23 06:53:51 MDT 2004 /* DO NOT CVS-MERGE THIS FILE, EITHER Mon May 3 17:17:49 MEST 2004
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
...@@ -5382,8 +5382,15 @@ tSCC zSvr4_ProfilList[] = ...@@ -5382,8 +5382,15 @@ tSCC zSvr4_ProfilList[] =
tSCC zSvr4_ProfilSelect0[] = tSCC zSvr4_ProfilSelect0[] =
"profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)"; "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
#define SVR4_PROFIL_TEST_CT 1 /*
* content bypass pattern - skip fix if pattern found
*/
tSCC zSvr4_ProfilBypass0[] =
"Silicon Graphics";
#define SVR4_PROFIL_TEST_CT 2
static tTestDesc aSvr4_ProfilTests[] = { static tTestDesc aSvr4_ProfilTests[] = {
{ TT_NEGREP, zSvr4_ProfilBypass0, (regex_t*)NULL },
{ TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, }; { TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, };
/* /*
...@@ -6929,7 +6936,7 @@ static const char* apzX11_SprintfPatch[] = { ...@@ -6929,7 +6936,7 @@ static const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 196 #define REGEX_COUNT 197
#define MACH_LIST_SIZE_LIMIT 261 #define MACH_LIST_SIZE_LIMIT 261
#define FIX_COUNT 175 #define FIX_COUNT 175
......
...@@ -3161,6 +3161,9 @@ fix = { ...@@ -3161,6 +3161,9 @@ fix = {
select = select =
'profil\(unsigned short \*, unsigned int, unsigned int, unsigned int\)'; 'profil\(unsigned short \*, unsigned int, unsigned int, unsigned int\)';
/* The fix is wrong on IRIX 5/6 and creates a conflict with another
prototype in <sys/profil.h>. */
bypass = 'Silicon Graphics';
c_fix = format; c_fix = format;
c_fix_arg = 'profil(unsigned short *, size_t, int, unsigned int)'; c_fix_arg = 'profil(unsigned short *, size_t, int, unsigned int)';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment