Use __sparc__ rather than sparc.

5 files changed, 16 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 566d19e1dc6..05e78765f9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-10  Glenn Morris  <rgm@gnu.org>
+
+        Sync from trunk 2008-07-08:
+        * m/sparc.h: Define __sparc__ rather than sparc.  (Bug#507.)
+        * alloc.c, ecrt0.c: Use __sparc__ rather than sparc.
+
+        * unexsunos4.c: Use __sparc__ rather than sparc.
+
 2008-08-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (move_it_to): When stopping at a charpos, check if
diff --git a/src/alloc.c b/src/alloc.c
index 46887bb332c..f37d74acaf4 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4572,7 +4572,7 @@ mark_stack ()
   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
      needed on ia64 too.  See mach_dep.c, where it also says inline
      assembler doesn't work with relevant proprietary compilers.  */
-#ifdef sparc
+#ifdef __sparc__
   asm ("ta 3");
 #endif
 
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 36f6caeceb9..d4e88c3c835 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -582,7 +582,7 @@ _start()
 #endif /* elxsi */
 
 
-#ifdef sparc
+#ifdef __sparc__
 asm (".global __start");
 asm (".text");
 asm ("__start:");
@@ -600,7 +600,7 @@ asm ("	sub	%sp, 24, %sp");
 asm ("  call    __exit");
 asm ("  nop");
 
-#endif /* sparc */
+#endif /* __sparc__ */
 
 #if __FreeBSD__ == 2
 char *__progname;
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 333d78863ad..236038883b8 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -38,10 +38,10 @@ NOTE-END  */
 
 #define NO_ARG_ARRAY
 
-/* Say this machine is a sparc */
+/* Say this machine is a sparc.  Probably already defined.  */
 
-#ifndef sparc
-#define sparc
+#ifndef __sparc__
+#define __sparc__
 #endif
 
 /* Use type int rather than a union, to represent Lisp_Object */
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 17f2b298e00..773f3b407dd 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -236,11 +236,11 @@ unexec (new_name, a_name, bndry, bss_start, entry)
 #else /* not SUNOS4_SHARED_LIBRARIES */
     rel = erel = 0;
 #endif /* not SUNOS4_SHARED_LIBRARIES */
-#ifdef sparc
+#ifdef __sparc__
 #define REL_INFO_TYPE           struct reloc_info_sparc
 #else
 #define REL_INFO_TYPE           struct relocation_info
-#endif /* sparc */
+#endif /* __sparc__ */
 #define REL_TARGET_ADDRESS(r)   (((REL_INFO_TYPE *)(r))->r_address)
 #endif /* SUNOS4 */
 #if defined (__FreeBSD__) || defined (__NetBSD__)