From: Julian Seward Date: Fri, 5 Sep 2014 20:00:22 +0000 (+0000) Subject: Be more careful to separate build flags for the preload shared objects X-Git-Tag: svn/VALGRIND_3_10_0~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f0bb05e7eeedc699787617c9c903e463d92afe;p=thirdparty%2Fvalgrind.git Be more careful to separate build flags for the preload shared objects as opposed to the valgrind code proper. In particular, make sure that -mpreferred-stack-boundary=2 does not get used for the preload shared objects, since that can cause the stack to become misaligned and leads to segfaults. Modified version of a patch from Matthias Schwarzott (zzam@gentoo.org). Fixes #324050. Also, fix the configure check in configure.ac for -mpreferred-stack-boundary=2 so that it checks whether this is allowable for 32-bit code generation even on 64-bit (x86) hosts. This check was wrong before now and led to 32-bit builds on 64-bit hosts generating poorer code for speed critical helper functions (eg helperc_LOADV32le) than on 32-bit builds on 32-bit hosts. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14471 --- diff --git a/Makefile.all.am b/Makefile.all.am index 52f5261b73..ef216c3f3a 100644 --- a/Makefile.all.am +++ b/Makefile.all.am @@ -109,17 +109,20 @@ AM_CFLAGS_BASE = \ -fno-strict-aliasing \ -fno-builtin -# These flags are used for building the preload shared objects. +# These flags are used for building the preload shared objects (PSOs). # The aim is to give reasonable performance but also to have good # stack traces, since users often see stack traces extending -# into (and through) the preloads. +# into (and through) the preloads. Also, we must use any +# -mpreferred-stack-boundary flag to build the preload shared +# objects, since that risks misaligning the client's stack and +# results in segfaults like (eg) #324050. if VGCONF_OS_IS_DARWIN -AM_CFLAGS_PIC = -dynamic -O -g -fno-omit-frame-pointer -fno-strict-aliasing \ - -fpic -fPIC \ - -fno-builtin +AM_CFLAGS_PSO_BASE = -dynamic \ + -O -g -fno-omit-frame-pointer -fno-strict-aliasing \ + -fpic -fPIC -fno-builtin else -AM_CFLAGS_PIC = -fpic -O -g -fno-omit-frame-pointer -fno-strict-aliasing \ - -fno-builtin +AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \ + -fpic -fno-builtin endif @@ -150,35 +153,43 @@ AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ = \ endif AM_FLAG_M3264_X86_LINUX = @FLAG_M32@ -AM_CFLAGS_X86_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ +AM_CFLAGS_X86_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY_2@ \ $(AM_CFLAGS_BASE) -fomit-frame-pointer +AM_CFLAGS_PSO_X86_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_X86_LINUX = @FLAG_M32@ -g AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@ -AM_CFLAGS_AMD64_LINUX = @FLAG_M64@ @PREFERRED_STACK_BOUNDARY@ \ +AM_CFLAGS_AMD64_LINUX = @FLAG_M64@ \ $(AM_CFLAGS_BASE) -fomit-frame-pointer +AM_CFLAGS_PSO_AMD64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_AMD64_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@ AM_CFLAGS_PPC32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PSO_PPC32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_PPC32_LINUX = @FLAG_M32@ -g AM_FLAG_M3264_PPC64BE_LINUX = @FLAG_M64@ AM_CFLAGS_PPC64BE_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PSO_PPC64BE_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_PPC64BE_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_PPC64LE_LINUX = @FLAG_M64@ AM_CFLAGS_PPC64LE_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PSO_PPC64LE_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ -AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ +AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 +AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ + -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ -marm -mcpu=cortex-a8 -g AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PSO_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_ARM64_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_X86_DARWIN = -arch i386 @@ -186,23 +197,30 @@ AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 \ -fno-stack-protector -fno-pic -fno-PIC +AM_CFLAGS_PSO_X86_DARWIN = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_X86_DARWIN = -arch i386 -g AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64 AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 -fno-stack-protector +AM_CFLAGS_PSO_AMD64_DARWIN = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_AMD64_DARWIN = -arch x86_64 -g AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@ AM_CFLAGS_S390X_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -fomit-frame-pointer +AM_CFLAGS_PSO_S390X_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_S390X_LINUX = @FLAG_M64@ -g -mzarch -march=z900 AM_FLAG_M3264_MIPS32_LINUX = @FLAG_M32@ AM_CFLAGS_MIPS32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) @FLAG_MIPS32@ +AM_CFLAGS_PSO_MIPS32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) @FLAG_MIPS32@ \ + $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_MIPS32_LINUX = @FLAG_M32@ -g @FLAG_MIPS32@ AM_FLAG_M3264_MIPS64_LINUX = @FLAG_M64@ AM_CFLAGS_MIPS64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) @FLAG_MIPS64@ +AM_CFLAGS_PSO_MIPS64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) @FLAG_MIPS64@ \ + $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_MIPS64_LINUX = @FLAG_M64@ -g @FLAG_MIPS64@ # Flags for the primary target. These must be used to build the diff --git a/configure.ac b/configure.ac index 878d37d75c..e2ebcfecfe 100644 --- a/configure.ac +++ b/configure.ac @@ -1707,24 +1707,29 @@ CFLAGS=$safe_CFLAGS AC_SUBST(FLAG_MSSE) -# does this compiler support -mpreferred-stack-boundary=2 ? -AC_MSG_CHECKING([if gcc accepts -mpreferred-stack-boundary=2]) +# does this compiler support -mpreferred-stack-boundary=2 when +# generating code for a 32-bit target? Note that we only care about +# this when generating code for (32-bit) x86, so if the compiler +# doesn't recognise -m32 it's no big deal. We'll just get code for +# the Memcheck and other helper functions, that is a bit slower than +# it could be, on x86; and no difference at all on any other platform. +AC_MSG_CHECKING([if gcc accepts -mpreferred-stack-boundary=2 -m32]) safe_CFLAGS=$CFLAGS -CFLAGS="-mpreferred-stack-boundary=2" +CFLAGS="-mpreferred-stack-boundary=2 -m32" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])], [ -PREFERRED_STACK_BOUNDARY="-mpreferred-stack-boundary=2" +PREFERRED_STACK_BOUNDARY_2="-mpreferred-stack-boundary=2" AC_MSG_RESULT([yes]) ], [ -PREFERRED_STACK_BOUNDARY="" +PREFERRED_STACK_BOUNDARY_2="" AC_MSG_RESULT([no]) ]) CFLAGS=$safe_CFLAGS -AC_SUBST(PREFERRED_STACK_BOUNDARY) +AC_SUBST(PREFERRED_STACK_BOUNDARY_2) # Convenience function to check whether GCC supports a particular diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index 91ac84fcca..361bd73f75 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -470,14 +470,14 @@ libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) if VGCONF_HAVE_PLATFORM_SEC libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) endif #---------------------------------------------------------------------------- @@ -497,7 +497,7 @@ vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) if VGCONF_HAVE_PLATFORM_SEC @@ -505,7 +505,7 @@ vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) endif diff --git a/docs/internals/porting-to-ARM.txt b/docs/internals/porting-to-ARM.txt index 4e54d2476f..0f68110714 100644 --- a/docs/internals/porting-to-ARM.txt +++ b/docs/internals/porting-to-ARM.txt @@ -40,8 +40,8 @@ You'll need to: AC_MSG_RESULT([ok (${host_cpu})]) VG_ARCH="arm" KICKSTART_BASE="0xb0000000" - ARCH_CORE_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@" - ARCH_TOOL_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@" + ARCH_CORE_AM_CFLAGS="-fomit-frame-pointer" + ARCH_TOOL_AM_CFLAGS="-fomit-frame-pointer" ARCH_CORE_AM_CCASFLAGS="" ;; diff --git a/drd/Makefile.am b/drd/Makefile.am index 4ead4ecb8f..3b0771b125 100644 --- a/drd/Makefile.am +++ b/drd/Makefile.am @@ -136,7 +136,7 @@ vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) $(DRD_CFLAGS) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) $(DRD_CFLAGS) vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -149,7 +149,7 @@ vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) $(DRD_CFLAGS) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) $(DRD_CFLAGS) vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ diff --git a/exp-dhat/Makefile.am b/exp-dhat/Makefile.am index 9ee6497d7d..647b72bb28 100644 --- a/exp-dhat/Makefile.am +++ b/exp-dhat/Makefile.am @@ -78,7 +78,7 @@ vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -90,7 +90,7 @@ vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ diff --git a/exp-sgcheck/Makefile.am b/exp-sgcheck/Makefile.am index a1c5d897b0..211a5ffadd 100644 --- a/exp-sgcheck/Makefile.am +++ b/exp-sgcheck/Makefile.am @@ -86,7 +86,7 @@ vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2 + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) -O2 vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -99,7 +99,7 @@ vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2 + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) -O2 vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index bda77162e8..b6f1b894bb 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -97,7 +97,7 @@ vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -110,7 +110,7 @@ vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ diff --git a/massif/Makefile.am b/massif/Makefile.am index 6c26780c12..29334035d4 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -78,7 +78,7 @@ vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -90,7 +90,7 @@ vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 172fe41429..476bc70dfa 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -94,7 +94,7 @@ vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2 + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) -O2 vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -107,7 +107,7 @@ vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2 + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) -O2 vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \