diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-07-08 07:03:07 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-07-08 07:03:07 +0000 |
| commit | 4a00783e8e07d7487bce5041d0f9b22247268346 (patch) | |
| tree | 9378fcf00ca8e0c03bb99ddb4e23a84e18fec300 | |
| parent | a6f75881406e540517fd96a8ad28ec997c2127fa (diff) | |
| download | emacs-4a00783e8e07d7487bce5041d0f9b22247268346.tar.gz | |
Use __sparc__ rather than sparc. (Bug#507.)
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 2 | ||||
| -rw-r--r-- | src/ecrt0.c | 4 | ||||
| -rw-r--r-- | src/m/sparc.h | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7766bc78032..e8700d4e049 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-07-08 Glenn Morris <rgm@gnu.org> + + * m/sparc.h: Define __sparc__ rather than sparc. (Bug#507.) + * alloc.c, ecrt0.c: Use __sparc__ rather than sparc. + 2008-07-07 Chong Yidong <cyd@stupidchicken.com> * frame.c (Qinhibit_face_set_after_frame_default): Var deleted. diff --git a/src/alloc.c b/src/alloc.c index 797b385fbd2..b942e7a6e01 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4487,7 +4487,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 4c4f297c9ca..7ef066ef22f 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -200,7 +200,7 @@ start1 (ignore, argc, xargv) #endif /* not CRT0_DUMMIES */ -#ifdef sparc +#ifdef __sparc__ asm (".global __start"); asm (".text"); asm ("__start:"); @@ -218,7 +218,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 35103e560dc..7113b8b1fce 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -36,10 +36,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 */ |