Sun Jul 30 09:19:19 2023 UTC ()
ld.elf_so: Sort SRCS.

No functional change intended.


(riastradh)
diff -r1.145 -r1.146 src/libexec/ld.elf_so/Makefile
cvs diff -r1.145 -r1.146 src/libexec/ld.elf_so/Makefile (expand / switch to unified diff)

--- src/libexec/ld.elf_so/Makefile 2023/07/30 09:19:10 1.145
+++ src/libexec/ld.elf_so/Makefile 2023/07/30 09:19:19 1.146
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.145 2023/07/30 09:19:10 riastradh Exp $ 1# $NetBSD: Makefile,v 1.146 2023/07/30 09:19:19 riastradh Exp $
2# 2#
3# NOTE: when changing ld.so, ensure that ldd still compiles. 3# NOTE: when changing ld.so, ensure that ldd still compiles.
4# 4#
5NOLIBCSANITIZER=# defined 5NOLIBCSANITIZER=# defined
6NOSANITIZER= # defined 6NOSANITIZER= # defined
7WARNS?=4 7WARNS?=4
8 8
9LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH} 9LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH}
10 10
11# This needs to be before bsd.init.mk 11# This needs to be before bsd.init.mk
12.if defined(BSD_MK_COMPAT_FILE) 12.if defined(BSD_MK_COMPAT_FILE)
13.include <${BSD_MK_COMPAT_FILE}> 13.include <${BSD_MK_COMPAT_FILE}>
14.endif 14.endif
@@ -62,42 +62,42 @@ COPTS+= -fvisibility=hidden @@ -62,42 +62,42 @@ COPTS+= -fvisibility=hidden
62 62
63# Support compat ld.elf_so. 63# Support compat ld.elf_so.
64.if defined(MLIBDIR) 64.if defined(MLIBDIR)
65PROG= ld.elf_so-${MLIBDIR} 65PROG= ld.elf_so-${MLIBDIR}
66CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\" 66CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
67. if ${MLIBDIR} == "o32" 67. if ${MLIBDIR} == "o32"
68. endif 68. endif
69.else 69.else
70PROG= ld.elf_so 70PROG= ld.elf_so
71.endif 71.endif
72 72
73CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR} 73CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
74 74
75SRCS+= rtld.c 75SRCS+= compat.c
76SRCS+= reloc.c 
77SRCS+= symbol.c 
78SRCS+= xmalloc.c 
79SRCS+= xprintf.c 
80SRCS+= debug.c 76SRCS+= debug.c
81SRCS+= map_object.c 77SRCS+= diagassert.c
82SRCS+= load.c 78SRCS+= expand.c
83SRCS+= search.c 
84SRCS+= headers.c 79SRCS+= headers.c
 80SRCS+= load.c
 81SRCS+= map_object.c
85SRCS+= paths.c 82SRCS+= paths.c
86SRCS+= expand.c 83SRCS+= reloc.c
87SRCS+= tls.c 84SRCS+= rtld.c
 85SRCS+= search.c
 86SRCS+= symbol.c
88SRCS+= symver.c 87SRCS+= symver.c
89SRCS+= diagassert.c 88SRCS+= tls.c
90SRCS+= compat.c 89SRCS+= xmalloc.c
 90SRCS+= xprintf.c
91 91
92.if ${USE_FORT} == "yes" 92.if ${USE_FORT} == "yes"
93.PATH.c: ${NETBSDSRCDIR}/lib/libc/misc 93.PATH.c: ${NETBSDSRCDIR}/lib/libc/misc
94SRCS+= stack_protector.c 94SRCS+= stack_protector.c
95.endif 95.endif
96 96
97.PATH.c: ${NETBSDSRCDIR}/lib/libc/stdlib 97.PATH.c: ${NETBSDSRCDIR}/lib/libc/stdlib
98SRCS+= exit.c 98SRCS+= exit.c
99 99
100errlist_concat.h: ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h 100errlist_concat.h: ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
101 ${TOOL_AWK} -v concat=1 -f ${.ALLSRC} > ${.TARGET}.tmp && \ 101 ${TOOL_AWK} -v concat=1 -f ${.ALLSRC} > ${.TARGET}.tmp && \
102 mv -f ${.TARGET}.tmp ${.TARGET} 102 mv -f ${.TARGET}.tmp ${.TARGET}
103 103