diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/s/gnu-linux.h | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index b54bd985e6b..c1233c0e6ce 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -146,9 +146,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 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 | 148 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 149 | #ifdef __mc68000__ | ||
| 150 | #define GC_LISP_OBJECT_ALIGNMENT 2 | ||
| 151 | #endif | ||
| 152 | #ifdef __ia64__ | 149 | #ifdef __ia64__ |
| 153 | #define GC_MARK_SECONDARY_STACK() \ | 150 | #define GC_MARK_SECONDARY_STACK() \ |
| 154 | do { \ | 151 | do { \ |