From 3d0142227245250a28f138807d723b7a2e0dc244 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Mon, 24 Aug 2015 06:58:39 +0000 Subject: [PATCH] Revert "fix incompatibility with -fstack-protector-strong" Reports of devices not booting with a build range including this patch. Reverting while I investigate. This reverts commit 96dd2b6e85e03ca9ab2600c2031490c22d5626ad. Bug: 23470962 Change-Id: I056f1d8668f52d31412868975f2143249fc7e8f0 --- libc/Android.mk | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index d5252de14..de0bb4174 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -147,6 +147,7 @@ libc_bionic_ndk_src_files := \ bionic/lfs64_support.cpp \ bionic/__libc_current_sigrtmax.cpp \ bionic/__libc_current_sigrtmin.cpp \ + bionic/libc_init_common.cpp \ bionic/libc_logging.cpp \ bionic/libgen.cpp \ bionic/link.cpp \ @@ -671,30 +672,6 @@ $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) include $(BUILD_STATIC_LIBRARY) -# ======================================================== -# libc_init_common.a - common static/dynamic init code -# ======================================================== -# -# The initialization code needs to be compiled with -fno-stack-protector since -# it runs before TLS and initial guard value are set up. It takes the address -# of a stack variable, triggering protection with -fstack-protector-strong. - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := bionic/libc_init_common.cpp -LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -LOCAL_CONLYFLAGS := $(libc_common_conlyflags) -LOCAL_CPPFLAGS := $(libc_common_cppflags) -LOCAL_C_INCLUDES := $(libc_common_c_includes) -LOCAL_MODULE := libc_init_common -LOCAL_CLANG := $(use_clang) -LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) -LOCAL_SYSTEM_SHARED_LIBRARIES := - -$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) -include $(BUILD_STATIC_LIBRARY) - - # ======================================================== # libc_tzcode.a - upstream 'tzcode' code # ======================================================== @@ -985,7 +962,6 @@ LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := -LOCAL_WHOLE_STATIC_LIBRARIES := libc_init_common LOCAL_SANITIZE := never LOCAL_NATIVE_COVERAGE := $(bionic_coverage)