diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1acb38cc06..25bf376c0c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-24  Adam Fedor  <fedor@gnu.org>
+
+	* objc-lang.c (FETCH_ARGUMENT, CONVERT_FUNCPTR): Remove 
+	architecture dependant compilation and mark as unimplemented
+	(until they get put in the gdbarch vector).
+
 2003-04-23  David Carlton  <carlton@bactrian.org>
 
 	* cp-support.c (cp_find_first_component): Accept 'operator' in
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index c8524cc25b..c27fb22106 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1752,6 +1752,19 @@ _initialize_objc_language (void)
   add_com_alias ("po", "print-object", class_vars, 1);
 }
 
+#if 1
+/* Disable these functions until we put them in the gdbarch vector.  */
+static unsigned long FETCH_ARGUMENT (int i)
+{
+  internal_error (__FILE__, __LINE__, "FETCH_ARGUMENT not implemented");
+  return 0;
+}
+static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc)
+{
+  internal_error (__FILE__, __LINE__, "CONVERT_FUNCPTR not implemented");
+  return pc;
+}
+#else
 #if defined (__powerpc__) || defined (__ppc__)
 static unsigned long FETCH_ARGUMENT (int i)
 {
@@ -1791,6 +1804,7 @@ static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc)
   return pc;
 }
 #endif
+#endif
 
 static void 
 read_objc_method (CORE_ADDR addr, struct objc_method *method)