am fc5185a5: am cabf610d: am d29f10cd: Merge "Fix build break due to unknown pragma (on gcc)."

* commit 'fc5185a578afde905a16b84c01845616f40f8007':
  Fix build break due to unknown pragma (on gcc).
This commit is contained in:
Stephen Hines 2015-10-01 06:55:30 +00:00 committed by Android Git Automerger
commit 69aaf71ef9
1 changed files with 4 additions and 0 deletions

View File

@ -51,8 +51,10 @@ __attribute__ ((noinline)) static int smash_stack(volatile int* plen) {
return 0;
}
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winfinite-recursion"
#endif
static void* global = 0; // So GCC doesn't optimize the tail recursion out of overflow_stack.
@ -63,7 +65,9 @@ __attribute__((noinline)) static void overflow_stack(void* p) {
overflow_stack(&buf);
}
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
static void *noisy(void *x)
{