aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Ivchenko <alexander.ivchenko@intel.com>2014-08-12 17:16:33 +0400
committerAlexander Ivchenko <alexander.ivchenko@intel.com>2014-08-12 17:16:33 +0400
commit0e7aea5bd1e8387cb668ea6977eb35798cfbd056 (patch)
tree324c1861a1d816bb7faae4725d18c47619a46f00
parent38a8aecfb882072900434499696b5c32a2274515 (diff)
downloadtoolchain_gcc-0e7aea5bd1e8387cb668ea6977eb35798cfbd056.tar.gz
toolchain_gcc-0e7aea5bd1e8387cb668ea6977eb35798cfbd056.tar.bz2
toolchain_gcc-0e7aea5bd1e8387cb668ea6977eb35798cfbd056.zip
[4.9] Disable compiler.h fixinclude fix.
Backport from trunk: 2014-08-04 Alexander Ivchenko <alexander.ivchenko@intel.com> * inclhack.def (complier_h_tradcpp): Remove. * fixincl.x: Regenerate. * tests/base/linux/compiler.h: Remove. Also, please refer to: b.android.com/73728. Change-Id: I1ea579ca36f1fe0b8878fa74e753eb2333da85cd
-rw-r--r--gcc-4.9/fixincludes/fixincl.x51
-rw-r--r--gcc-4.9/fixincludes/inclhack.def14
-rw-r--r--gcc-4.9/fixincludes/tests/base/linux/compiler.h14
3 files changed, 5 insertions, 74 deletions
diff --git a/gcc-4.9/fixincludes/fixincl.x b/gcc-4.9/fixincludes/fixincl.x
index 10b4061f3..75df492bc 100644
--- a/gcc-4.9/fixincludes/fixincl.x
+++ b/gcc-4.9/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed December 8, 2013 at 12:24:14 PM by AutoGen 5.18.2
+ * It has been AutoGen-ed August 12, 2014 at 05:02:39 PM by AutoGen 5.18
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Dec 8 12:24:14 PST 2013
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Aug 12 17:02:39 MSK 2014
*
* 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 229 fixup descriptions.
+ * This file contains 228 fixup descriptions.
*
* See README for more information.
*
@@ -2111,41 +2111,6 @@ int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * 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
*/
tSCC zCtrl_Quotes_DefName[] =
@@ -9403,9 +9368,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 268
+#define REGEX_COUNT 267
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 229
+#define FIX_COUNT 228
/*
* Enumerate the fixes
@@ -9458,7 +9423,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,
@@ -9878,11 +9842,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,
diff --git a/gcc-4.9/fixincludes/inclhack.def b/gcc-4.9/fixincludes/inclhack.def
index 411300fb2..0a6fb80b1 100644
--- a/gcc-4.9/fixincludes/inclhack.def
+++ b/gcc-4.9/fixincludes/inclhack.def
@@ -1140,20 +1140,6 @@ fix = {
};
/*
- * 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:
*
diff --git a/gcc-4.9/fixincludes/tests/base/linux/compiler.h b/gcc-4.9/fixincludes/tests/base/linux/compiler.h
deleted file mode 100644
index 713527644..000000000
--- a/gcc-4.9/fixincludes/tests/base/linux/compiler.h
+++ /dev/null
@@ -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 */