@@ -1,9 +1,9 @@
 /* Sample prototype for a trampoline. */
 
 /*
- * Copyright 1995-1998 Bruno Haible, <bruno@clisp.org>
+ * Copyright 1995-2006 Bruno Haible, <bruno@clisp.org>
  *
  * This is free software distributed under the GNU General Public Licence
  * described in the file COPYING. Contact the author if you don't have this
  * or can't live with it. There is ABSOLUTELY NO WARRANTY, explicit or implied,
  * on this software.
@@ -14,11 +14,15 @@
 
 #ifdef __i386__
 register void* env __asm__("%ecx");
 #endif
 #ifdef __m68k__
+#ifdef __NetBSD__
+register void* env __asm__("a1");
+#else
 register void* env __asm__("a0");
+#endif
 #endif
 #if defined(__mips__) || defined(__mipsn32__) || defined(__mips64__)
 register void* env __asm__("$2");
 #endif
 #ifdef __sparc__
@@ -31,12 +35,16 @@
 register void* env __asm__("%r29");
 #endif
 #ifdef __arm__
 register void* env __asm__("r12");
 #endif
-#ifdef __rs6000__
+#ifdef __powerpc__
+#ifdef __NetBSD__
+register void* env __asm__("r13");
+#else
 register void* env __asm__("r11");
+#endif
 #endif
 #ifdef __m88k__
 register void* env __asm__("r11");
 #endif
 #ifdef __convex__