From: Paul Floyd Date: Thu, 1 Feb 2024 12:55:59 +0000 (+0100) Subject: regtest: some missing AM_CFLAGS and AM_CXXFLAGS X-Git-Tag: VALGRIND_3_23_0~190 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e128c329ba7a72fca76384b04904b279273d65c;p=thirdparty%2Fvalgrind.git regtest: some missing AM_CFLAGS and AM_CXXFLAGS In all cases, these caused problems for 32on64 builds. In a few cases extra CFLAGS were needed but AM_CFLAGS not used. And it seems as though autoconf needs explicit else branches. So if FOO test_CFLAGS = ${AM_CFLAGS} -hide-some-warnings endif doesn't set test_CFLAGS to the default when FOO is false. (I'm sure I've seen that before, and forgotten). --- diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 1caca9e59b..4f70ec2ab6 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -636,7 +636,7 @@ bug340392_CFLAGS = $(AM_CFLAGS) -O3 @FLAG_W_NO_MAYBE_UNINITIALIZED@ if HAVE_ALIGNED_CXX_ALLOC cxx17_aligned_new_SOURCES = cxx17_aligned_new.cpp -cxx17_aligned_new_CXXFLAGS = -std=c++17 @FLAG_W_NO_MISMATCHED_NEW_DELETE@ +cxx17_aligned_new_CXXFLAGS = ${AM_CXXFLAGS} -std=c++17 @FLAG_W_NO_MISMATCHED_NEW_DELETE@ new_aligned_delete_default_SOURCES = new_aligned_delete_default.cpp new_aligned_delete_default_CXXFLAGS = ${AM_CXXFLAGS} -std=c++17 sized_aligned_new_delete_args_SOURCES = sized_aligned_new_delete_args.cpp diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 2d71d668bb..e13a0493bc 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -314,6 +314,13 @@ fdleak_cmsg_LDADD = -lsocket -lnsl fdleak_ipv4_LDADD = -lsocket -lnsl fdleak_creat_LDADD = -lsocket -lnsl fdleak_socketpair_LDADD = -lsocket -lnsl +else +fcntl_setown_LDADD = $(AL_LDFLAGS) +fdleak_cmsg_CFLAGS = $(AM_CFLAGS) +fdleak_cmsg_LDADD = $(AM_LDFLAGS) +fdleak_ipv4_LDADD = $(AM_LDFLAGS) +fdleak_creat_LDADD = $(AM_LDFLAGS) +fdleak_socketpair_LDADD = $(AM_LDFLAGS) endif floored_LDADD = -lm ifunc_CFLAGS = $(AM_CFLAGS) -Wno-unused-function @@ -372,7 +379,7 @@ thread_exits_LDADD = -lpthread threaded_fork_LDADD = -lpthread threadederrno_CFLAGS = $(AM_CFLAGS) threadederrno_LDADD = -lpthread -timestamp_CFLAGS = @FLAG_W_NO_USE_AFTER_FREE@ +timestamp_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_USE_AFTER_FREE@ tls_SOURCES = tls.c tls2.c tls_DEPENDENCIES = tls.so tls2.so tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests