Skip to content

Commit

Permalink
fixincludes/
Browse files Browse the repository at this point in the history
	* inclhack.def (complier_h_tradcpp): Remove.
	* fixincl.x: Regenerate.
	* tests/base/linux/compiler.h: Remove.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213853 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
kyukhin committed Aug 12, 2014
1 parent 1f788a0 commit 7a093de
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 74 deletions.
6 changes: 6 additions & 0 deletions fixincludes/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2014-08-04 Alexander Ivchenko <[email protected]>

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

2014-04-22 Rainer Orth <[email protected]>

* inclhack.def (math_exception): Bypass on *-*-solaris2.1[0-9]*.
Expand Down
51 changes: 5 additions & 46 deletions fixincludes/fixincl.x
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
*
* 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
* 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.
*
Expand All @@ -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 224 fixup descriptions.
* This file contains 223 fixup descriptions.
*
* See README for more information.
*
Expand Down Expand Up @@ -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\");",
(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
Expand Down Expand Up @@ -9187,9 +9152,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 261
#define REGEX_COUNT 260
#define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 224
#define FIX_COUNT 223

/*
* Enumerate the fixes
Expand Down Expand Up @@ -9242,7 +9207,6 @@ typedef enum {
BROKEN_CABS_FIXIDX,
BROKEN_NAN_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
COMPLIER_H_TRADCPP_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
Expand Down Expand Up @@ -9657,11 +9621,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
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,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
Expand Down
14 changes: 0 additions & 14 deletions fixincludes/inclhack.def
Original file line number Diff line number Diff line change
Expand Up @@ -1139,20 +1139,6 @@ fix = {
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.
* The traditional syntax was:
Expand Down
14 changes: 0 additions & 14 deletions fixincludes/tests/base/linux/compiler.h

This file was deleted.

0 comments on commit 7a093de

Please sign in to comment.