Mercurial > emacs
changeset 80696:acd89d089f05
Use __sparc__ rather than sparc.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 10 Aug 2008 02:40:17 +0000 |
| parents | 61b1294ba30e |
| children | b2894e827edc |
| files | src/ChangeLog src/alloc.c src/ecrt0.c src/m/sparc.h src/unexsunos4.c |
| diffstat | 5 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 10 02:35:40 2008 +0000 +++ b/src/ChangeLog Sun Aug 10 02:40:17 2008 +0000 @@ -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
--- a/src/alloc.c Sun Aug 10 02:35:40 2008 +0000 +++ b/src/alloc.c Sun Aug 10 02:40:17 2008 +0000 @@ -4572,7 +4572,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
--- a/src/ecrt0.c Sun Aug 10 02:35:40 2008 +0000 +++ b/src/ecrt0.c Sun Aug 10 02:40:17 2008 +0000 @@ -582,7 +582,7 @@ #endif /* elxsi */ -#ifdef sparc +#ifdef __sparc__ asm (".global __start"); asm (".text"); asm ("__start:"); @@ -600,7 +600,7 @@ asm (" call __exit"); asm (" nop"); -#endif /* sparc */ +#endif /* __sparc__ */ #if __FreeBSD__ == 2 char *__progname;
--- a/src/m/sparc.h Sun Aug 10 02:35:40 2008 +0000 +++ b/src/m/sparc.h Sun Aug 10 02:40:17 2008 +0000 @@ -38,10 +38,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 */
--- a/src/unexsunos4.c Sun Aug 10 02:35:40 2008 +0000 +++ b/src/unexsunos4.c Sun Aug 10 02:40:17 2008 +0000 @@ -236,11 +236,11 @@ #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__)