# HG changeset patch
# User cslag
# Date 1486686527 -3600
# Node ID 629cfbba5ba0a7fb40b2d0a58655e7126e7c6a06
# Parent  b11b0735b09f6140cd5800cd3a09e6ee9142457d
- sparc predef cleanup

diff -r b11b0735b09f -r 629cfbba5ba0 autovar/autovar_ARCH.h
--- a/autovar/autovar_ARCH.h	Fri Feb 10 01:07:12 2017 +0100
+++ b/autovar/autovar_ARCH.h	Fri Feb 10 01:28:47 2017 +0100
@@ -50,10 +50,12 @@
 # endif
 #elif defined(__sh__)
 # define ARCH_SH
-#elif defined(__sparcv9) || defined(__sparc64__) || ( defined(__sparc) && defined(__arch64__) ) 
-# define ARCH_SPARC64
-#elif defined(__sparc)
-# define ARCH_SPARC
+#elif defined(__sparc) || defined(__sparc__)
+# if defined(__sparcv9) || defined(__sparc_v9__) || defined(__sparc64__) || defined(__arch64__)
+#  define ARCH_SPARC64
+# else
+#  define ARCH_SPARC
+# endif
 #endif
 
 #endif /* AUTOVAR_ARCH_H */
diff -r b11b0735b09f -r 629cfbba5ba0 dyncall/dyncall_macros.h
--- a/dyncall/dyncall_macros.h	Fri Feb 10 01:07:12 2017 +0100
+++ b/dyncall/dyncall_macros.h	Fri Feb 10 01:28:47 2017 +0100
@@ -193,10 +193,12 @@
 # define DC__Arch_ARM64
 #elif defined(__sh__)
 # define DC__Arch_SuperH
-#elif defined(__sparcv9) || defined(__sparc64__) || ( defined(__sparc) && defined(__arch64__) ) 
-# define DC__Arch_Sparc64
-#elif defined(__sparc)
-# define DC__Arch_Sparc
+#elif defined(__sparc) || defined(__sparc__)
+# if defined(__sparcv9) || defined(__sparc_v9__) || defined(__sparc64__) || defined(__arch64__)
+#  define DC__Arch_Sparc64
+# else
+#  define DC__Arch_Sparc
+# endif
 #endif