Commit cf23bb76 authored by Andrei Elkin's avatar Andrei Elkin

merge from 5.1 repo.

parents 0a31d4f4 d9ccd370
...@@ -460,22 +460,23 @@ AC_DEFUN([MYSQL_STACK_DIRECTION], ...@@ -460,22 +460,23 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
#if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux) #if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux)
#pragma noinline #pragma noinline
#endif #endif
int find_stack_direction () /* Check stack direction (-1 down, 1 up) */
int f(int *a)
{ {
static char *addr = 0; int b;
auto char dummy; return(&b > a)?1:-1;
if (addr == 0)
{
addr = &dummy;
return find_stack_direction ();
}
else
return (&dummy > addr) ? 1 : -1;
} }
int main () /*
Prevent compiler optimizations by calling function
through pointer.
*/
volatile int (*ptr_f)(int *) = f;
int main()
{ {
exit (find_stack_direction() < 0); int a;
}], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, exit(ptr_f(&a) < 0);
}
], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
ac_cv_c_stack_direction=)]) ac_cv_c_stack_direction=)])
AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
])dnl ])dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment