inclhack.def (complier_h_tradcpp): Remove.

fixincludes/
	* inclhack.def (complier_h_tradcpp): Remove.
	* fixincl.x: Regenerate.
	* tests/base/linux/compiler.h: Remove.

From-SVN: r213853
This commit is contained in:
Alexander Ivchenko 2014-08-12 11:05:24 +00:00 committed by Kirill Yukhin
parent 63a4184f75
commit 5435176b31
4 changed files with 11 additions and 74 deletions

View File

@ -1,3 +1,9 @@
2014-08-04 Alexander Ivchenko <alexander.ivchenko@intel.com>
* inclhack.def (complier_h_tradcpp): Remove.
* fixincl.x: Regenerate.
* tests/base/linux/compiler.h: Remove.
2014-04-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2014-04-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (math_exception): Bypass on *-*-solaris2.1[0-9]*. * inclhack.def (math_exception): Bypass on *-*-solaris2.1[0-9]*.

View File

@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Tuesday January 7, 2014 at 12:02:54 PM MET * It has been AutoGen-ed August 12, 2014 at 02:09:58 PM by AutoGen 5.12
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jan 7 12:02:54 MET 2014 /* DO NOT SVN-MERGE THIS FILE, EITHER Tue Aug 12 14:09:58 MSK 2014
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work * 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. * correctly with ANSI C and placed in a directory that GNU C will search.
* *
* This file contains 224 fixup descriptions. * This file contains 223 fixup descriptions.
* *
* See README for more information. * See README for more information.
* *
@ -2109,41 +2109,6 @@ static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");", int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Complier_H_Tradcpp fix
*/
tSCC zComplier_H_TradcppName[] =
"complier_h_tradcpp";
/*
* File name selection pattern
*/
tSCC zComplier_H_TradcppList[] =
"linux/compiler.h\0";
/*
* Machine/OS name selection pattern
*/
#define apzComplier_H_TradcppMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zComplier_H_TradcppSelect0[] =
"#define __builtin_warning\\(x, y\\.\\.\\.\\) \\(1\\)";
#define COMPLIER_H_TRADCPP_TEST_CT 1
static tTestDesc aComplier_H_TradcppTests[] = {
{ TT_EGREP, zComplier_H_TradcppSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Complier_H_Tradcpp
*/
static const char* apzComplier_H_TradcppPatch[] = {
"format",
"/* __builtin_warning(x, y...) is obsolete */",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description of Ctrl_Quotes_Def fix * Description of Ctrl_Quotes_Def fix
@ -9187,9 +9152,9 @@ static const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 261 #define REGEX_COUNT 260
#define MACH_LIST_SIZE_LIMIT 187 #define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 224 #define FIX_COUNT 223
/* /*
* Enumerate the fixes * Enumerate the fixes
@ -9242,7 +9207,6 @@ typedef enum {
BROKEN_CABS_FIXIDX, BROKEN_CABS_FIXIDX,
BROKEN_NAN_FIXIDX, BROKEN_NAN_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX, BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
COMPLIER_H_TRADCPP_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX, CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX, CXX_UNREADY_FIXIDX,
@ -9657,11 +9621,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 }, aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
{ zComplier_H_TradcppName, zComplier_H_TradcppList,
apzComplier_H_TradcppMachs,
COMPLIER_H_TRADCPP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aComplier_H_TradcppTests, apzComplier_H_TradcppPatch, 0 },
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList, { zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs, apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

View File

@ -1139,20 +1139,6 @@ fix = {
test_text = '#define vfscanf __svfscanf'; test_text = '#define vfscanf __svfscanf';
}; };
/*
* Old Linux kernel's <compiler.h> header breaks Traditional CPP
*/
fix = {
hackname = complier_h_tradcpp;
files = linux/compiler.h;
select = "#define __builtin_warning\\(x, y\\.\\.\\.\\) \\(1\\)";
c_fix = format;
c_fix_arg = "/* __builtin_warning(x, y...) is obsolete */";
test_text = "#define __builtin_warning(x, y...) (1)";
};
/* /*
* Fix various macros used to define ioctl numbers. * Fix various macros used to define ioctl numbers.
* The traditional syntax was: * The traditional syntax was:

View File

@ -1,14 +0,0 @@
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/linux/compiler.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( COMPLIER_H_TRADCPP_CHECK )
/* __builtin_warning(x, y...) is obsolete */
#endif /* COMPLIER_H_TRADCPP_CHECK */