diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cedfc01f78ad1a8a4f8d58db7343e4a56501f457..747b2118eb43ff784cf055b4984d4a0aa7e213cd 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 38ee399539be91089aabd454bb14122378e75f6c..d82190d5ac848f2af783e5cda86e478d89a45f6b 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2001,6 +2001,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
  */