+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
/* 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
#endif /* elxsi */
-#ifdef sparc
+#ifdef __sparc__
asm (".global __start");
asm (".text");
asm ("__start:");
asm (" call __exit");
asm (" nop");
-#endif /* sparc */
+#endif /* __sparc__ */
#if __FreeBSD__ == 2
char *__progname;
#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 */
#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__)