aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-08-26 22:55:39 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-08-26 22:55:39 +0000
commit228e7b6256a6d161aa9d45a0319cf7128ae7ad87 (patch)
tree72902ad70707a0625397a7b4bc76fc1815aab4e9 /gcc
parentdc3786d833bc642b1d7e481eb947c1247eebf6d9 (diff)
downloadgcc-228e7b6256a6d161aa9d45a0319cf7128ae7ad87.zip
gcc-228e7b6256a6d161aa9d45a0319cf7128ae7ad87.tar.gz
gcc-228e7b6256a6d161aa9d45a0319cf7128ae7ad87.tar.bz2
inclhack.def (ptx_sys_mc_param_h): New disabled fix, ported from fixinc.ptx.
* fixinc/inclhack.def (ptx_sys_mc_param_h): New disabled fix, ported from fixinc.ptx. From-SVN: r70827
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/fixinc/inclhack.def24
2 files changed, 29 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cedfc01..747b211 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-26 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * fixinc/inclhack.def (ptx_sys_mc_param_h): New disabled fix,
+ ported from fixinc.ptx.
+
2003-08-26 Per Bothner <pbothner@apple.com>
* cpplib.h (struct cpp_token): Change type of field line to fileline.
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 38ee399..d82190d 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2002,6 +2002,30 @@ fix = {
/*
+ * On DYNIX/ptx, sys/mc_param.h has an embedded asm for the cpuid instruction
+ * on the P5. This is not used by anything else so we ifdef it out.
+ * Current GCC doesn't seem to complain about the asm, though.
+ */
+#ifdef PTX
+fix = {
+ hackname = ptx_sys_mc_param_h;
+ files = sys/mc_param.h;
+ sed = "/__asm/,/}/{"
+ "/__asm/i\\\n"
+ "#if !defined (__GNUC__) && !defined (__GNUG__)\n"
+ "/}/a\\\n"
+ "#endif\n"
+ "}";
+ test_text = "__asm\n"
+ "int _CPUID()\n"
+ "{\n"
+ " non-GNU assembly here\n"
+ "}";
+};
+#endif
+
+
+/*
* Fix return type of fread and fwrite on sysV68
*/
fix = {