diff options
| author | Andreas Schwab | 2010-07-11 10:38:22 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-11 10:38:22 +0200 |
| commit | a64df65010c90f1f4bad5a5076c8fbcba61ba6d8 (patch) | |
| tree | b7fff3c3f91442b0d557d7c2b4a232cad3bec804 | |
| parent | 3277c1ee3a17ed3102aad149e6ba7341d3e579b5 (diff) | |
| download | emacs-a64df65010c90f1f4bad5a5076c8fbcba61ba6d8.tar.gz emacs-a64df65010c90f1f4bad5a5076c8fbcba61ba6d8.zip | |
Remove obsolete noinline declaration
* eval.c (apply1, call2): Don't declare noinline.
* fns.c (concat): Likewise.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/eval.c | 8 | ||||
| -rw-r--r-- | src/fns.c | 10 |
3 files changed, 7 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5c4b04e88a..09250b09ac6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-07-11 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * eval.c: Remove obsolete noinline declaration. | ||
| 4 | * fns.c: Likewise. | ||
| 5 | |||
| 1 | 2010-07-11 Ken Raeburn <raeburn@raeburn.org> | 6 | 2010-07-11 Ken Raeburn <raeburn@raeburn.org> |
| 2 | 7 | ||
| 3 | * doprnt.c (doprnt): Take a va_list argument instead of count and | 8 | * doprnt.c (doprnt): Take a va_list argument instead of count and |
diff --git a/src/eval.c b/src/eval.c index 140ba85d789..7f686c045fb 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -172,14 +172,6 @@ extern Lisp_Object Qfunction; | |||
| 172 | 172 | ||
| 173 | static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*); | 173 | static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*); |
| 174 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; | 174 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; |
| 175 | |||
| 176 | #if __GNUC__ | ||
| 177 | /* "gcc -O3" enables automatic function inlining, which optimizes out | ||
| 178 | the arguments for the invocations of these functions, whereas they | ||
| 179 | expect these values on the stack. */ | ||
| 180 | Lisp_Object apply1 (Lisp_Object fn, Lisp_Object arg) __attribute__((noinline)); | ||
| 181 | Lisp_Object call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2) __attribute__((noinline)); | ||
| 182 | #endif | ||
| 183 | 175 | ||
| 184 | void | 176 | void |
| 185 | init_eval_once (void) | 177 | init_eval_once (void) |
| @@ -371,14 +371,8 @@ Symbols are also allowed; their print names are used instead. */) | |||
| 371 | return i1 < SCHARS (s2) ? Qt : Qnil; | 371 | return i1 < SCHARS (s2) ? Qt : Qnil; |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | #if __GNUC__ | 374 | static Lisp_Object concat (int nargs, Lisp_Object *args, |
| 375 | /* "gcc -O3" enables automatic function inlining, which optimizes out | 375 | enum Lisp_Type target_type, int last_special); |
| 376 | the arguments for the invocations of this function, whereas it | ||
| 377 | expects these values on the stack. */ | ||
| 378 | static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special) __attribute__((noinline)); | ||
| 379 | #else /* !__GNUC__ */ | ||
| 380 | static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special); | ||
| 381 | #endif | ||
| 382 | 376 | ||
| 383 | /* ARGSUSED */ | 377 | /* ARGSUSED */ |
| 384 | Lisp_Object | 378 | Lisp_Object |