diff --git a/src/hppa/Gget_proc_name-hppa.c b/src/hppa/Gget_proc_name-hppa.c
index e69de29b..cab4f11e 100644
--- a/src/hppa/Gget_proc_name-hppa.c
+++ b/src/hppa/Gget_proc_name-hppa.c
@@ -0,0 +1,35 @@
+/* libunwind - a platform-independent unwind library
+   Copyright (C) 2003 Hewlett-Packard Co
+	Contributed by ...
+
+This file is part of libunwind.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+
+#include "unwind_i.h"
+
+int
+unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len)
+{
+  struct cursor *c = (struct cursor *) cursor;
+
+  return unwi_get_proc_name (c->as, c->ip,
+			     buf, buf_len, c->as_arg);
+}
diff --git a/src/ia64/Gget_proc_name-ia64.c b/src/ia64/Gget_proc_name-ia64.c
index 8ff1e2e6..2bd007bd 100644
--- a/src/ia64/Gget_proc_name-ia64.c
+++ b/src/ia64/Gget_proc_name-ia64.c
@@ -32,6 +32,5 @@ unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len,
   struct cursor *c = (struct cursor *) cursor;
 
   return unwi_get_proc_name (c->as, c->ip,
-			     c->as == unw_local_addr_space,
 			     buf, buf_len, offp, c->as_arg);
 }
diff --git a/src/x86/Gget_proc_name-x86.c b/src/x86/Gget_proc_name-x86.c
index e69de29b..e8e833cb 100644
--- a/src/x86/Gget_proc_name-x86.c
+++ b/src/x86/Gget_proc_name-x86.c
@@ -0,0 +1,34 @@
+/* libunwind - a platform-independent unwind library
+   Copyright (C) 2002-2003 Hewlett-Packard Co
+	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+This file is part of libunwind.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+
+#include "unwind_i.h"
+
+int
+unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len)
+{
+  struct cursor *c = (struct cursor *) cursor;
+
+  return unwi_get_proc_name (c->as, c->eip, buf, buf_len, c->as_arg);
+}