diff options
Diffstat (limited to 'debug/Makefile')
| -rw-r--r-- | debug/Makefile | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/debug/Makefile b/debug/Makefile index f29bd20..4f7ac04 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -184,12 +184,20 @@ CPPFLAGS-tst-chk-cancel.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 CFLAGS-tst-sprintf-fortify-rdonly.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 CFLAGS-tst-sprintf-fortify-rdonly-mod.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 CFLAGS-tst-sprintf-fortify-rdonly-dlopen.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 +CFLAGS-tst-sprintf-fortify-rdonly-static.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 CFLAGS-tst-fortify-syslog.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 CFLAGS-tst-fortify-wide.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2 - -$(objpfx)tst-sprintf-fortify-rdonly: \ - $(objpfx)tst-sprintf-fortify-rdonly-mod.so \ - $(objpfx)tst-sprintf-fortify-rdonly-dlopen.so +LDFLAGS-tst-sprintf-fortify-rdonly-static += $(relro-LDFLAGS) + +$(objpfx)tst-sprintf-fortify-rdonly: $(objpfx)tst-sprintf-fortify-rdonly-mod.so +$(objpfx)tst-sprintf-fortify-rdonly.out: \ + $(objpfx)tst-sprintf-fortify-rdonly-dlopen.so +$(objpfx)tst-sprintf-fortify-rdonly-static: \ + $(objpfx)tst-sprintf-fortify-rdonly-dlopen.o +$(objpfx)tst-sprintf-fortify-rdonly-static.out: \ + $(objpfx)tst-sprintf-fortify-rdonly-dlopen.so +tst-sprintf-fortify-rdonly-static-ENV = \ + LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)/elf # _FORTIFY_SOURCE tests. # Auto-generate tests for _FORTIFY_SOURCE for different levels, compilers and @@ -278,23 +286,28 @@ LDFLAGS-tst-backtrace4 = -rdynamic LDFLAGS-tst-backtrace5 = -rdynamic LDFLAGS-tst-backtrace6 = -rdynamic +$(objpfx)tst-backtrace1: $(shared-thread-library) + # When SFrame is enabled, make sure the dwarf unwinder is also exercised. ifeq ($(enable-gsframe),yes) dw_unwind_pair := \ - tst-backtrace7:tst-backtrace2 \ - tst-backtrace8:tst-backtrace3 \ - tst-backtrace9:tst-backtrace4 \ - tst-backtrace10:tst-backtrace5 \ - tst-backtrace11:tst-backtrace6 + tst-backtrace1-nosframe:tst-backtrace1 \ + tst-backtrace2-nosframe:tst-backtrace2 \ + tst-backtrace3-nosframe:tst-backtrace3 \ + tst-backtrace4-nosframe:tst-backtrace4 \ + tst-backtrace5-nosframe:tst-backtrace5 \ + tst-backtrace6-nosframe:tst-backtrace6 first_column = $(foreach pair,$(dw_unwind_pair),$(word 1,$(subst :, ,$(pair)))) tests-dw-unwind = $(patsubst %,$(objpfx)%.out,$(first_column)) +ifeq ($(run-built-tests),yes) tests-special += $(tests-dw-unwind) endif +endif define make-strip-rule $(objpfx)$(word 1,$(subst :, ,$(1))): $(objpfx)$(word 2,$(subst :, ,$(1))) - strip --remove-section=.sframe $$< -o $$@ + $(STRIP) --remove-section=.sframe $$< -o $$@ endef $(foreach pair,$(dw_unwind_pair),$(eval $(call make-strip-rule,$(pair)))) @@ -317,6 +330,7 @@ tests = \ backtrace-tst \ test-stpcpy_chk \ test-strcpy_chk \ + tst-backtrace1 \ tst-backtrace2 \ tst-backtrace3 \ tst-backtrace4 \ @@ -328,9 +342,14 @@ tests = \ tst-longjmp_chk3 \ tst-realpath-chk \ tst-sprintf-fortify-rdonly \ + tst-sprintf-fortify-rdonly-static \ tst-sprintf-fortify-unchecked \ # tests +tests-static = \ + tst-sprintf-fortify-rdonly-static \ + # tests-static + tests-time64 += \ $(tests-all-time64-chk) \ # tests-time64 |