From fb644881b6083aa0d9d15e7aad8bfa5a429b1c37 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 1 Sep 2010 16:39:11 -0700
Subject: [PATCH] Disable new longjmp in glibc 2.11 and later.

Bug: 2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
---
 core/combo/HOST_linux-x86.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 26052d6b2..fa2dfe31c 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -37,4 +37,7 @@ HOST_GLOBAL_CFLAGS += -fPIC
 HOST_GLOBAL_CFLAGS += \
 	-include $(call select-android-config-h,linux-x86)
 
+# Disable new longjmp in glibc 2.11 and later. See bug 2967937.
+HOST_GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=0
+
 HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined