Sun May 30 02:26:51 2021 UTC ()
Drop explicit -msecure-plt, it's the default for both clang and gcc.


(joerg)
diff -r1.11 -r1.12 src/tests/libexec/ld.elf_so/Makefile
diff -r1.2 -r1.3 src/tests/libexec/ld.elf_so/Makefile.inc
cvs diff -r1.11 -r1.12 src/tests/libexec/ld.elf_so/Makefile (switch to unified diff)

--- src/tests/libexec/ld.elf_so/Makefile 2020/09/22 01:09:32 1.11
+++ src/tests/libexec/ld.elf_so/Makefile 2021/05/30 02:26:51 1.12
@@ -1,73 +1,72 @@ @@ -1,73 +1,72 @@
1# $NetBSD: Makefile,v 1.11 2020/09/22 01:09:32 kamil Exp $ 1# $NetBSD: Makefile,v 1.12 2021/05/30 02:26:51 joerg Exp $
2# 2#
3 3
4NOMAN= # defined 4NOMAN= # defined
5 5
6.include "Makefile.inc" 
7.include <bsd.own.mk> 6.include <bsd.own.mk>
8 7
9.if ${MKPIC} != "no" 8.if ${MKPIC} != "no"
10 9
11SUBDIR+= helper_dso1 helper_dso3 .WAIT helper_dso2 .WAIT \ 10SUBDIR+= helper_dso1 helper_dso3 .WAIT helper_dso2 .WAIT \
12 helper_ifunc_dso \ 11 helper_ifunc_dso \
13 helper_symver_dso0 .WAIT helper_symver_dso1 .WAIT \ 12 helper_symver_dso0 .WAIT helper_symver_dso1 .WAIT \
14 helper_symver_dso2 .WAIT \ 13 helper_symver_dso2 .WAIT \
15 data 14 data
16 15
17TESTSDIR= ${TESTSBASE}/libexec/ld.elf_so 16TESTSDIR= ${TESTSBASE}/libexec/ld.elf_so
18 17
19TESTS_C+= t_dlerror-cleared t_dlerror-false t_dlinfo t_dlvsym t_ifunc 18TESTS_C+= t_dlerror-cleared t_dlerror-false t_dlinfo t_dlvsym t_ifunc
20TESTS_C+= t_rtld_r_debug 19TESTS_C+= t_rtld_r_debug
21 20
22COPTS.t_rtld_r_debug.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :} 21COPTS.t_rtld_r_debug.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
23 22
24LDADD.t_dlerror-false= -Wl,-rpath,/var/nonexistent/lib 23LDADD.t_dlerror-false= -Wl,-rpath,/var/nonexistent/lib
25LDADD.t_dlvsym= -Wl,-rpath,${TESTSDIR}/h_helper_symver_dso2 24LDADD.t_dlvsym= -Wl,-rpath,${TESTSDIR}/h_helper_symver_dso2
26LDADD.t_ifunc= -Wl,-rpath,${TESTSDIR} -lutil 25LDADD.t_ifunc= -Wl,-rpath,${TESTSDIR} -lutil
27DPADD.t_ifunc= ${LIBUTIL} 26DPADD.t_ifunc= ${LIBUTIL}
28 27
29TESTS_SH+= t_df_1_noopen t_dl_symver t_thread_local_dtor 28TESTS_SH+= t_df_1_noopen t_dl_symver t_thread_local_dtor
30 29
31BINDIR= ${TESTSDIR} 30BINDIR= ${TESTSDIR}
32PROGS+= h_df_1_noopen1 31PROGS+= h_df_1_noopen1
33SRCS.h_df_1_noopen1= h_df_1_noopen.c 32SRCS.h_df_1_noopen1= h_df_1_noopen.c
34 33
35PROGS+= h_df_1_noopen2 34PROGS+= h_df_1_noopen2
36SRCS.h_df_1_noopen2= h_df_1_noopen.c 35SRCS.h_df_1_noopen2= h_df_1_noopen.c
37LDADD.h_df_1_noopen2= -lpthread 36LDADD.h_df_1_noopen2= -lpthread
38 37
39PROGS+= h_thread_local_dtor 38PROGS+= h_thread_local_dtor
40LDADD.h_thread_local_dtor= -Wl,-rpath,${TESTSDIR} -lpthread 39LDADD.h_thread_local_dtor= -Wl,-rpath,${TESTSDIR} -lpthread
41 40
42PROGS+= h_ifunc 41PROGS+= h_ifunc
43SRCS.h_ifunc= h_ifunc.c 42SRCS.h_ifunc= h_ifunc.c
44IFUNCDIR!= cd ${.CURDIR}/helper_ifunc_dso && ${PRINTOBJDIR} 43IFUNCDIR!= cd ${.CURDIR}/helper_ifunc_dso && ${PRINTOBJDIR}
45LDADD.h_ifunc= -Wl,-rpath,${TESTSDIR} -L${IFUNCDIR} -lh_helper_ifunc_dso 44LDADD.h_ifunc= -Wl,-rpath,${TESTSDIR} -L${IFUNCDIR} -lh_helper_ifunc_dso
46 45
47PROGS+= h_locking 46PROGS+= h_locking
48SRCS.h_locking= h_locking.c 47SRCS.h_locking= h_locking.c
49LDADD.h_locking= -lpthread -Wl,--export-dynamic -Wl,-rpath,${TESTSDIR} 48LDADD.h_locking= -lpthread -Wl,--export-dynamic -Wl,-rpath,${TESTSDIR}
50 49
51PROGS+= h_dl_symver_v0 50PROGS+= h_dl_symver_v0
52SRCS.h_dl_symver_v0= h_dl_symver.c 51SRCS.h_dl_symver_v0= h_dl_symver.c
53V0ODIR!= cd ${.CURDIR}/helper_symver_dso0 && ${PRINTOBJDIR} 52V0ODIR!= cd ${.CURDIR}/helper_symver_dso0 && ${PRINTOBJDIR}
54LDADD.h_dl_symver_v0= -L${V0ODIR} -lh_helper_symver_dso 53LDADD.h_dl_symver_v0= -L${V0ODIR} -lh_helper_symver_dso
55 54
56PROGS+= h_dl_symver_v1 55PROGS+= h_dl_symver_v1
57SRCS.h_dl_symver_v1= h_dl_symver.c 56SRCS.h_dl_symver_v1= h_dl_symver.c
58V1ODIR!= cd ${.CURDIR}/helper_symver_dso1 && ${PRINTOBJDIR} 57V1ODIR!= cd ${.CURDIR}/helper_symver_dso1 && ${PRINTOBJDIR}
59LDADD.h_dl_symver_v1= -L${V1ODIR} -lh_helper_symver_dso 58LDADD.h_dl_symver_v1= -L${V1ODIR} -lh_helper_symver_dso
60 59
61PROGS+= h_dl_symver_v2 60PROGS+= h_dl_symver_v2
62SRCS.h_dl_symver_v2= h_dl_symver.c 61SRCS.h_dl_symver_v2= h_dl_symver.c
63V2ODIR!= cd ${.CURDIR}/helper_symver_dso2 && ${PRINTOBJDIR} 62V2ODIR!= cd ${.CURDIR}/helper_symver_dso2 && ${PRINTOBJDIR}
64LDADD.h_dl_symver_v2= -L${V2ODIR} -lh_helper_symver_dso 63LDADD.h_dl_symver_v2= -L${V2ODIR} -lh_helper_symver_dso
65 64
66.include <bsd.test.mk> 65.include <bsd.test.mk>
67 66
68.else 67.else
69 68
70NOPROG= # defined 69NOPROG= # defined
71.include <bsd.prog.mk> 70.include <bsd.prog.mk>
72 71
73.endif 72.endif
cvs diff -r1.2 -r1.3 src/tests/libexec/ld.elf_so/Makefile.inc (switch to unified diff)

--- src/tests/libexec/ld.elf_so/Makefile.inc 2019/05/14 19:07:07 1.2
+++ src/tests/libexec/ld.elf_so/Makefile.inc 2021/05/30 02:26:51 1.3