# HG changeset patch # User Glenn Morris # Date 1215500587 0 # Node ID 4cb0e945175dde8e417f83e986308db66339dd35 # Parent b90ccb2627a7f39efce3efc6f06023b8edabda39 Use __sparc__ rather than sparc. (Bug#507.) diff -r b90ccb2627a7 -r 4cb0e945175d src/ChangeLog --- a/src/ChangeLog Mon Jul 07 20:39:00 2008 +0000 +++ b/src/ChangeLog Tue Jul 08 07:03:07 2008 +0000 @@ -1,3 +1,8 @@ +2008-07-08 Glenn Morris + + * m/sparc.h: Define __sparc__ rather than sparc. (Bug#507.) + * alloc.c, ecrt0.c: Use __sparc__ rather than sparc. + 2008-07-07 Chong Yidong * frame.c (Qinhibit_face_set_after_frame_default): Var deleted. diff -r b90ccb2627a7 -r 4cb0e945175d src/alloc.c --- a/src/alloc.c Mon Jul 07 20:39:00 2008 +0000 +++ b/src/alloc.c Tue Jul 08 07:03:07 2008 +0000 @@ -4487,7 +4487,7 @@ /* 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 -r b90ccb2627a7 -r 4cb0e945175d src/ecrt0.c --- a/src/ecrt0.c Mon Jul 07 20:39:00 2008 +0000 +++ b/src/ecrt0.c Tue Jul 08 07:03:07 2008 +0000 @@ -200,7 +200,7 @@ #endif /* not CRT0_DUMMIES */ -#ifdef sparc +#ifdef __sparc__ asm (".global __start"); asm (".text"); asm ("__start:"); @@ -218,7 +218,7 @@ asm (" call __exit"); asm (" nop"); -#endif /* sparc */ +#endif /* __sparc__ */ #if __FreeBSD__ == 2 char *__progname; diff -r b90ccb2627a7 -r 4cb0e945175d src/m/sparc.h --- a/src/m/sparc.h Mon Jul 07 20:39:00 2008 +0000 +++ b/src/m/sparc.h Tue Jul 08 07:03:07 2008 +0000 @@ -36,10 +36,10 @@ #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 */