--- OLD/xc/config/cf/Imake.cf	Thu Jan  1 00:00:00 1970
+++ NEW/xc/config/cf/Imake.cf	Thu Jan  1 00:00:00 1970
@@ -65,6 +65,34 @@
 #  define SparcArchitecture
 #  undef sparc
 # endif
+# if defined(__sparc64__) || defined(sparc64)
+#  define Sparc64Architecture
+#  undef sparc64
+# endif
+# if defined(__sun3__) || defined(sun3)
+#  define Sun3Architecture
+#  undef sun3
+# endif
+# if defined(__next68k__) || defined(next68k)
+#  define NeXT68kArchitecture
+#  undef next68k
+# endif
+# if defined(__hpcmips__) || defined(hpcmips)
+#  define MipsArchitecture
+#  undef hpcmips
+# endif
+# if defined(__alpha__) || defined(alpha)
+#  define AlphaArchitecture
+#  undef alpha
+# endif
+# if defined(__amd64__) || defined(amd64)
+#  define AMD64Architecture
+#  undef amd64
+# endif
+# if defined(__sparc64__) || defined(sparc64)
+#  define Sparc64Architecture
+#  undef sparc64
+# endif
 #endif /* NetBSD */
 
 #ifdef __FreeBSD__