From 21dab901511bef83f3a299d7dd106f0b60a1d406 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Sun, 7 Jul 2024 11:02:14 +0200 Subject: [PATCH] Solaris regtest: warning clearup --- .gitignore | 2 +- configure.ac | 3 +++ memcheck/tests/Makefile.am | 1 + memcheck/tests/amd64-solaris/Makefile.am | 6 +++++- memcheck/tests/solaris/Makefile.am | 9 +++++++++ memcheck/tests/x86-solaris/Makefile.am | 8 +++++++- none/tests/amd64-solaris/Makefile.am | 1 + none/tests/solaris/Makefile.am | 5 +++-- none/tests/solaris/coredump_many_segments.c | 10 +++++----- .../solaris/{stack-overflow.c => stack_overflow.c} | 0 ...k-overflow.stderr.exp => stack_overflow.stderr.exp} | 2 +- .../{stack-overflow.vgtest => stack_overflow.vgtest} | 2 +- none/tests/x86-solaris/Makefile.am | 2 ++ 13 files changed, 39 insertions(+), 12 deletions(-) rename none/tests/solaris/{stack-overflow.c => stack_overflow.c} (100%) rename none/tests/solaris/{stack-overflow.stderr.exp => stack_overflow.stderr.exp} (92%) rename none/tests/solaris/{stack-overflow.vgtest => stack_overflow.vgtest} (53%) diff --git a/.gitignore b/.gitignore index 33e71c133f..08598edbff 100644 --- a/.gitignore +++ b/.gitignore @@ -2232,7 +2232,7 @@ /none/tests/solaris/reserve_sysstat_zone_addr /none/tests/solaris/resolv /none/tests/solaris/sigresend -/none/tests/solaris/stack-overflow +/none/tests/solaris/stack_overflow /none/tests/solaris/stack_prot /none/tests/solaris/threads_exitall diff --git a/configure.ac b/configure.ac index 7d3078ea6e..305f870b4a 100755 --- a/configure.ac +++ b/configure.ac @@ -2664,6 +2664,9 @@ AC_GCC_WARNING_SUBST_NO([builtin-memcpy-chk-size], [FLAG_W_NO_BUILTIN_MEMCPY_CHK AC_GCC_WARNING_SUBST_NO([incompatible-pointer-types-discards-qualifiers], [FLAG_W_NO_INCOMPATIBLE_POINTER_TYPES_DISCARDS_QUALIFIERS]) AC_GCC_WARNING_SUBST_NO([suspicious-bzero], [FLAG_W_NO_SUSPICIOUS_BZERO]) AC_GCC_WARNING_SUBST_NO([attributes], [FLAG_W_NO_ATTRIBUTES]) +AC_GCC_WARNING_SUBST_NO([unused-result], [FLAG_W_NO_UNUSED_RESULT]) +AC_GCC_WARNING_SUBST_NO([infinite-recursion], [FLAG_W_NO_INFINITE_RECURSION]) +AC_GCC_WARNING_SUBST_NO([deprecated], [FLAG_W_NO_DEPRECATED]) AC_GCC_WARNING_SUBST_NO_VAL([alloc-size-larger-than], [1677216], [FLAG_W_NO_ALLOC_SIZE_LARGER_THAN]) diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 67d4e69306..65f2dc6212 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -730,6 +730,7 @@ memalign_args_CFLAGS = $(AM_CFLAGS) -std=gnu11 memalign2_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NON_POWER_OF_TWO_ALIGNMENT@ if VGCONF_OS_IS_SOLARIS memalign2_CFLAGS += -D__EXTENSIONS__ +posix_memalign_CFLAGS = ${AM_CFLAGS} -D__EXTENSIONS__ endif memcmptest_CFLAGS = $(AM_CFLAGS) -fno-builtin-memcmp diff --git a/memcheck/tests/amd64-solaris/Makefile.am b/memcheck/tests/amd64-solaris/Makefile.am index 7ed2bc3f61..940706e22b 100644 --- a/memcheck/tests/amd64-solaris/Makefile.am +++ b/memcheck/tests/amd64-solaris/Makefile.am @@ -25,4 +25,8 @@ AM_CFLAGS += @FLAG_M64@ AM_CXXFLAGS += @FLAG_M64@ AM_CCASFLAGS += @FLAG_M64@ -scalar_CFLAGS = $(AM_CFLAGS) -I../solaris +context_fpu_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_gpr_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_rflags2_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_sse_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_CFLAGS = $(AM_CFLAGS) -I../solaris @FLAG_W_NO_UNINITIALIZED@ diff --git a/memcheck/tests/solaris/Makefile.am b/memcheck/tests/solaris/Makefile.am index f80a23448d..7cf1ac07ce 100644 --- a/memcheck/tests/solaris/Makefile.am +++ b/memcheck/tests/solaris/Makefile.am @@ -169,9 +169,18 @@ AM_CFLAGS += $(AM_FLAG_M3264_PRI) AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) door_kill_LDADD = -lpthread +name_service_door_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ ioctl_LDADD = -lsocket +ldynsym_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNUSED_RESULT@ ldynsym_LDFLAGS = -Wl,--strip-all pkcs11_LDADD = -lpkcs11 +scalar_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ @FLAG_W_NO_UNUSED_FUNCTION@ +scalar_ioctl_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_obsolete_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_auditon_stat_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_getrandom_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_lwp_kill_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_utimesys_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ sendfilev_LDADD = -lsendfile inlinfo_SOURCES = inlinfo.c diff --git a/memcheck/tests/x86-solaris/Makefile.am b/memcheck/tests/x86-solaris/Makefile.am index c5c2e68e3b..53991a8be5 100644 --- a/memcheck/tests/x86-solaris/Makefile.am +++ b/memcheck/tests/x86-solaris/Makefile.am @@ -30,4 +30,10 @@ AM_CFLAGS += @FLAG_M32@ AM_CXXFLAGS += @FLAG_M32@ AM_CCASFLAGS += @FLAG_M32@ -scalar_CFLAGS = $(AM_CFLAGS) -I../solaris +context_eflags2_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_fpu_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_gpr_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +context_sse_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNINITIALIZED@ +scalar_CFLAGS = $(AM_CFLAGS) -I../solaris @FLAG_W_NO_UNINITIALIZED@ +scalar_obsolete_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@ + diff --git a/none/tests/amd64-solaris/Makefile.am b/none/tests/amd64-solaris/Makefile.am index 0f5d80ab3a..5eb6905f58 100644 --- a/none/tests/amd64-solaris/Makefile.am +++ b/none/tests/amd64-solaris/Makefile.am @@ -24,3 +24,4 @@ AM_CFLAGS += @FLAG_M64@ AM_CXXFLAGS += @FLAG_M64@ AM_CCASFLAGS += @FLAG_M64@ +coredump_single_thread_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_DEPRECATED@ diff --git a/none/tests/solaris/Makefile.am b/none/tests/solaris/Makefile.am index 1860bf89d5..861c9ff562 100644 --- a/none/tests/solaris/Makefile.am +++ b/none/tests/solaris/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ reserve_sysstat_zone_addr.map reserve_sysstat_zone_addr.stderr.exp reserve_sysstat_zone_addr.vgtest \ resolv.stdout.exp resolv.stderr.exp resolv.vgtest \ sigresend.stderr.exp sigresend.stdout.exp sigresend.vgtest \ - stack-overflow.stderr.exp stack-overflow.vgtest \ + stack_overflow.stderr.exp stack_overflow.vgtest \ stack_prot.stderr.exp stack_prot.stdout.exp stack_prot.vgtest \ threads_exitall.stderr.exp threads_exitall.stdout.exp threads_exitall.vgtest @@ -49,7 +49,7 @@ check_PROGRAMS = \ pthread-stack \ resolv \ sigresend \ - stack-overflow \ + stack_overflow \ stack_prot \ threads_exitall @@ -58,6 +58,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) pthread_stack_LDADD = -lpthread resolv_LDADD = -lresolv +stack_overflow_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_INFINITE_RECURSION@ stack_prot_LDFLAGS = -Wl,-M,/usr/lib/ld/map.noexstk threads_exitall_LDADD = -lpthread diff --git a/none/tests/solaris/coredump_many_segments.c b/none/tests/solaris/coredump_many_segments.c index e5868e5faa..da3f4ae05a 100644 --- a/none/tests/solaris/coredump_many_segments.c +++ b/none/tests/solaris/coredump_many_segments.c @@ -81,15 +81,15 @@ static int process_map(const prmap_t *map, range_t **ranges_head, *ranges_tail = tail; } - if ((map->pr_vaddr < tail->start) || - (map->pr_vaddr - tail->start < 3 * page_size)) { + if (((uintptr_t)map->pr_vaddr < tail->start) || + ((uintptr_t)map->pr_vaddr - tail->start < 3 * page_size)) { DEBUG("last range at %p is too small, skipping it\n", tail->start); - tail->start = map->pr_vaddr + map->pr_size + page_size; + tail->start = (uintptr_t)map->pr_vaddr + map->pr_size + page_size; return 0; } - tail->end = map->pr_vaddr - page_size; + tail->end = (uintptr_t)map->pr_vaddr - page_size; tail->size = tail->end - tail->start; range_t *new_one = calloc(1, sizeof(range_t)); @@ -98,7 +98,7 @@ static int process_map(const prmap_t *map, range_t **ranges_head, return -1; } - new_one->start = map->pr_vaddr + map->pr_size + page_size; + new_one->start = (uintptr_t)map->pr_vaddr + map->pr_size + page_size; tail->next = new_one; *ranges_tail = new_one; return 0; diff --git a/none/tests/solaris/stack-overflow.c b/none/tests/solaris/stack_overflow.c similarity index 100% rename from none/tests/solaris/stack-overflow.c rename to none/tests/solaris/stack_overflow.c diff --git a/none/tests/solaris/stack-overflow.stderr.exp b/none/tests/solaris/stack_overflow.stderr.exp similarity index 92% rename from none/tests/solaris/stack-overflow.stderr.exp rename to none/tests/solaris/stack_overflow.stderr.exp index dd5e595153..9487451d9d 100644 --- a/none/tests/solaris/stack-overflow.stderr.exp +++ b/none/tests/solaris/stack_overflow.stderr.exp @@ -4,7 +4,7 @@ Stack overflow in thread #1: can't grow stack to 0x........ Process terminating with default action of signal 11 (SIGSEGV) Access not within mapped region at address 0x........ Stack overflow in thread #1: can't grow stack to 0x........ - at 0x........: main (stack-overflow.c:5) + at 0x........: main (stack_overflow.c:5) If you believe this happened as a result of a stack overflow in your program's main thread (unlikely but possible), you can try to increase the size of the diff --git a/none/tests/solaris/stack-overflow.vgtest b/none/tests/solaris/stack_overflow.vgtest similarity index 53% rename from none/tests/solaris/stack-overflow.vgtest rename to none/tests/solaris/stack_overflow.vgtest index e7b4f298a8..53a20a15cf 100644 --- a/none/tests/solaris/stack-overflow.vgtest +++ b/none/tests/solaris/stack_overflow.vgtest @@ -1,2 +1,2 @@ -prog: stack-overflow +prog: stack_overflow cleanup: rm -f vgcore.* diff --git a/none/tests/x86-solaris/Makefile.am b/none/tests/x86-solaris/Makefile.am index b81733c984..aecc7b7d36 100644 --- a/none/tests/x86-solaris/Makefile.am +++ b/none/tests/x86-solaris/Makefile.am @@ -25,3 +25,5 @@ AM_CFLAGS += @FLAG_M32@ AM_CXXFLAGS += @FLAG_M32@ AM_CCASFLAGS += @FLAG_M32@ +coredump_single_thread_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_DEPRECATED@ + -- 2.47.2