diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-01-30 23:43:20 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-01-30 23:43:20 +0000 |
| commit | 4d18a7a28e249a6335447047f5660282279d4468 (patch) | |
| tree | 62f82e5e87232fb6fcb032b467365b7a778e13fb | |
| parent | 38477befdc0478f33d52a543fa3236aab7459329 (diff) | |
| download | emacs-4d18a7a28e249a6335447047f5660282279d4468.tar.gz | |
(mark_stack): Properly conditionalize previous change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/alloc.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1ab6abe40c3..947afe32cd3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-01-30 Dan Nicolaescu <dann@ics.uci.edu> + + * alloc.c (mark_stack): Properly conditionalize previous change. + 2009-01-30 Juanma Barranquero <lekktu@gmail.com> * w32inevt.c (w32_console_read_socket) [SYNC_INPUT]: diff --git a/src/alloc.c b/src/alloc.c index 1be5e2b8f1d..c150157ee05 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4488,7 +4488,8 @@ mark_stack () needed on ia64 too. See mach_dep.c, where it also says inline assembler doesn't work with relevant proprietary compilers. */ #ifdef __sparc__ -#ifdef __sparc64__ +#if defined (__sparc64__) && defined (__FreeBSD__) + /* FreeBSD does not have a ta 3 handler. */ asm ("flushw"); #else asm ("ta 3"); |