diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
| commit | 7ca49db57cc4b1831587b764c3a1beb086a90f0c (patch) | |
| tree | bcf5936909c9a45ffd35c91138ff74a53a585496 /config/ac-macros | |
| parent | 9ae909643d2819fe139e389ca60f9f3076b37861 (diff) | |
| parent | 37155bf74a29a57829cc13947ac346b0f2c8fd28 (diff) | |
| download | mariadb-git-7ca49db57cc4b1831587b764c3a1beb086a90f0c.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'config/ac-macros')
| -rw-r--r-- | config/ac-macros/misc.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 996ac62e025..53d0fed273a 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -456,10 +456,8 @@ fi AC_DEFUN([MYSQL_STACK_DIRECTION], [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, [AC_TRY_RUN([#include <stdlib.h> - /* Prevent compiler optimization by HP's compiler, see bug#42213 */ -#if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux) -#pragma noinline -#endif + /* Prevent compiler inline optimization, see bug#42213 */ + int (volatile *ptr_f)(); int find_stack_direction () { static char *addr = 0; @@ -467,14 +465,15 @@ AC_DEFUN([MYSQL_STACK_DIRECTION], if (addr == 0) { addr = &dummy; - return find_stack_direction (); + return (*prt_f) (); } else return (&dummy > addr) ? 1 : -1; } int main () { - exit (find_stack_direction() < 0); + ptr_f = find_stack_direction; + exit ((*ptr_f)() < 0); }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, ac_cv_c_stack_direction=)]) AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) |