diff options
| author | Paul Eggert | 2012-04-13 23:38:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-13 23:38:33 -0700 |
| commit | 3078ffdd457776d0b44b40a9581c36b56b780450 (patch) | |
| tree | 7c3dc826c9e27693bd95f44e985ac65a212c30c0 /src/s/gnu-linux.h | |
| parent | 3bace81626cc6ecdffc7901f3d03aa051d18c0af (diff) | |
| parent | b948ce8b0244181c9e08d6bfc635ead24b4e9742 (diff) | |
| download | emacs-3078ffdd457776d0b44b40a9581c36b56b780450.tar.gz emacs-3078ffdd457776d0b44b40a9581c36b56b780450.zip | |
Merge from trunk.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index c1233c0e6ce..d04ea33068a 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -145,7 +145,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 145 | || defined __arm__ || defined __powerpc__ || defined __amd64__ \ | 145 | || defined __arm__ || defined __powerpc__ || defined __amd64__ \ |
| 146 | || defined __ia64__ || defined __sh__ | 146 | || defined __ia64__ || defined __sh__ |
| 147 | #define GC_SETJMP_WORKS 1 | 147 | #define GC_SETJMP_WORKS 1 |
| 148 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | ||
| 149 | #ifdef __ia64__ | 148 | #ifdef __ia64__ |
| 150 | #define GC_MARK_SECONDARY_STACK() \ | 149 | #define GC_MARK_SECONDARY_STACK() \ |
| 151 | do { \ | 150 | do { \ |
| @@ -155,4 +154,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 155 | __builtin_ia64_bsp ()); \ | 154 | __builtin_ia64_bsp ()); \ |
| 156 | } while (0) | 155 | } while (0) |
| 157 | #endif | 156 | #endif |
| 157 | #else | ||
| 158 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE | ||
| 158 | #endif | 159 | #endif |