commit 2e1347c6a010c51c9ec80fd312465c1c23666ab2
author Ying Wang <wangying@google.com> Thu Sep 02 09:45:11 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 02 09:45:11 2010 -0700
tree f02b4ef744455f808f7399bc9880f604b41944ed
parent eba22a05cbf119a59018801f54c7a2d17e34b5e9
parent fb644881b6083aa0d9d15e7aad8bfa5a429b1c37

am fb644881: Disable new longjmp in glibc 2.11 and later.

Merge commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp

* commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
  Disable new longjmp in glibc 2.11 and later.

core/combo/HOST_linux-x86.mk

diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 26052d6..fa2dfe3 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -37,4 +37,7 @@
 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