git: c913dce86e7b - main - lib/msun: centralize addition of the arch-specific symbol map files

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=c913dce86e7b6ff9c0c3265631529586aaf8520a

commit c913dce86e7b6ff9c0c3265631529586aaf8520a
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-04-06 17:46:45 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-04-08 14:32:00 +0000

    lib/msun: centralize addition of the arch-specific symbol map files
    
    This also adds the aarch64 symbols, exporting them.
    
    Reported and tested by: fluffy
    Reviewed by:    emaste
    Fixes:  3a01e1e1a50cb9a9594aac2148dc920a6b295428
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D56283
---
 lib/msun/Makefile             | 1 +
 lib/msun/amd64/Makefile.inc   | 1 -
 lib/msun/arm/Makefile.inc     | 1 -
 lib/msun/i387/Makefile.inc    | 1 -
 lib/msun/powerpc/Makefile.inc | 1 -
 lib/msun/riscv/Makefile.inc   | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 5112337f6297..4a0ff1ad92b6 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -115,6 +115,7 @@ LIBC_ARCH=${MACHINE_CPUARCH}
 CFLAGS+=	-I${.CURDIR}/src -I${LIBC_SRCTOP}/include \
 		-I${LIBC_SRCTOP}/${LIBC_ARCH}
 SYM_MAPS+=	${.CURDIR}/Symbol.map
+SYM_MAPS+=	${.CURDIR}/${ARCH_SUBDIR}/Symbol.map
 
 VERSION_DEF=	${LIBC_SRCTOP}/Versions.def
 SYMBOL_MAPS=	${SYM_MAPS}
diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc
index dcdc2495d690..f1e6aef552ca 100644
--- a/lib/msun/amd64/Makefile.inc
+++ b/lib/msun/amd64/Makefile.inc
@@ -6,4 +6,3 @@ ARCH_SRCS = e_fmod.S e_fmodf.S e_fmodl.S \
 	    s_remquo.S s_remquof.S s_remquol.S \
 	    s_rintl.S s_scalbn.S s_scalbnf.S s_scalbnl.S
 LDBL_PREC = 64
-SYM_MAPS += ${.CURDIR}/amd64/Symbol.map
diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc
index 6e3ddb351dd3..e155f1a2cae4 100644
--- a/lib/msun/arm/Makefile.inc
+++ b/lib/msun/arm/Makefile.inc
@@ -1,5 +1,4 @@
 LDBL_PREC = 53
-SYM_MAPS += ${.CURDIR}/arm/Symbol.map
 
 .if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
 ARCH_SRCS = fenv-softfp.c fenv-vfp.c
diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc
index 73feb52de6a2..f70c6b1bb569 100644
--- a/lib/msun/i387/Makefile.inc
+++ b/lib/msun/i387/Makefile.inc
@@ -17,4 +17,3 @@ ARCH_SRCS+= e_fmodl.S \
 	    s_logbl.S s_lrintl.S s_remquol.S s_rintl.S s_scalbnl.S s_truncl.S
 
 LDBL_PREC = 64	# XXX 64-bit format, but truncated to 53 bits
-SYM_MAPS += ${.CURDIR}/i387/Symbol.map
diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc
index 35747abb7087..2ae9bacdaab0 100644
--- a/lib/msun/powerpc/Makefile.inc
+++ b/lib/msun/powerpc/Makefile.inc
@@ -1,2 +1 @@
 LDBL_PREC = 53
-SYM_MAPS += ${.CURDIR}/powerpc/Symbol.map
diff --git a/lib/msun/riscv/Makefile.inc b/lib/msun/riscv/Makefile.inc
index 6262cfd6981e..ee32db47286d 100644
--- a/lib/msun/riscv/Makefile.inc
+++ b/lib/msun/riscv/Makefile.inc
@@ -1,2 +1 @@
 LDBL_PREC = 113
-SYM_MAPS += ${.CURDIR}/riscv/Symbol.map