From: Philippe Waroquiers Date: Sat, 10 Mar 2018 12:54:24 +0000 (+0100) Subject: remove obsolete/non working ways to modify CFLAGS in memcheck/Makefile.am X-Git-Tag: VALGRIND_3_14_0~147 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eaff3bbd731c3a09506e8dbaf20b2bfea4c1d0b;p=thirdparty%2Fvalgrind.git remove obsolete/non working ways to modify CFLAGS in memcheck/Makefile.am memcheck/Makefile.am contains 2 CFLAGS modifications lines that are not working. Remove these confusing lines. (I have checked that the proper flags are still used for the 2 involved files) --- diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 476bc70dfa..721cb21eb0 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -69,11 +69,6 @@ memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ $(memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif -# mc_main.c contains the helper function for memcheck that get called -# all the time. To maximise performance compile with -fomit-frame-pointer -# Primary beneficiary is x86. -mc_main.o: CFLAGS += -fomit-frame-pointer - #---------------------------------------------------------------------------- # vgpreload_memcheck-.so #---------------------------------------------------------------------------- @@ -87,6 +82,8 @@ if VGCONF_OS_IS_DARWIN noinst_DSYMS = $(noinst_PROGRAMS) endif +# mc_replace_strmem.c runs on the simulated CPU, and is built with +# AM_CFLAGS_PSO_* (see $(top_srcdir)/Makefile.all.am). VGPRELOAD_MEMCHECK_SOURCES_COMMON = mc_replace_strmem.c vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ @@ -115,10 +112,3 @@ vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) endif -# mc_replace_strmem.c runs on the simulated CPU, and it often appears -# in stack traces shown to the user. It is built with -# -fno-omit-frame-pointer so as to guarantee robust backtraces on x86, -# on which CFI based unwinding is not the "normal" case and so is -# sometimes fragile. -mc_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer -