# define i386Architecture
# undef i386
# endif
+# ifdef __amd64__
+# define AMD64BsdArchitecture
+# define AMD64Architecture
+# undef amd64
+# endif
#endif /* __FreeBSD__ */
#ifdef AMOEBA
# undef __arm__
# define ARMArchitecture
# endif
+# if defined(__sparc__) || defined(sparc)
+# define SparcArchitecture
+# undef sparc
+# endif
#endif /* linux */
#ifdef __uxp__