Merge "Remove arm-specific -Wno-psabi" am: ce9b6cab53

am: 6377ca3210

* commit '6377ca3210553af8f75c87343f6cac21b745e480':
  Remove arm-specific -Wno-psabi

Change-Id: I168e11dd2011ade4d2e5a4108e3fa6ba3c45a9ff
This commit is contained in:
Dan Willemsen 2016-05-09 04:51:21 +00:00 committed by android-build-merger
commit 11e6daf789
2 changed files with 0 additions and 20 deletions

View file

@ -119,16 +119,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -fno-builtin-sin \
-fno-strict-volatile-bitfields -fno-strict-volatile-bitfields
endif endif
# This is to avoid the dreaded warning compiler message:
# note: the mangling of 'va_list' has changed in GCC 4.4
#
# The fact that the mangling changed does not affect the NDK ABI
# very fortunately (since none of the exposed APIs used va_list
# in their exported C++ functions). Also, GCC 4.5 has already
# removed the warning from the compiler.
#
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -Wno-psabi
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \
-Wl,-z,noexecstack \ -Wl,-z,noexecstack \
-Wl,-z,relro \ -Wl,-z,relro \

View file

@ -95,16 +95,6 @@ TARGET_GLOBAL_CFLAGS += \
TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields
# This is to avoid the dreaded warning compiler message:
# note: the mangling of 'va_list' has changed in GCC 4.4
#
# The fact that the mangling changed does not affect the NDK ABI
# very fortunately (since none of the exposed APIs used va_list
# in their exported C++ functions). Also, GCC 4.5 has already
# removed the warning from the compiler.
#
TARGET_GLOBAL_CFLAGS += -Wno-psabi
TARGET_GLOBAL_LDFLAGS += \ TARGET_GLOBAL_LDFLAGS += \
-Wl,-z,noexecstack \ -Wl,-z,noexecstack \
-Wl,-z,relro \ -Wl,-z,relro \