Page MenuHomeFreeBSD
Files F131842459

D41661.id126710.diff
No OneTemporary
Actions

D41661.id126710.diff
View Options

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -11,8 +11,11 @@
# named MACHINE_CPUARCH, but some ABIs are different enough to require
# their own libc, so allow a directory named MACHINE_ARCH to override this.
-.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH:S/powerpc64le/powerpc64/})
-LIBC_ARCH=${MACHINE_ARCH:S/powerpc64le/powerpc64/}
+# Powerpc is weird, some is shared (via a copy), and powerp64
+# shares with powerpc64le.
+M=${MACHINE_ARCH:S/powerpc64le/powerpc64/}
+.if exists(${LIBC_SRCTOP}/${M})
+LIBC_ARCH=${M}
.else
LIBC_ARCH=${MACHINE_CPUARCH}
.endif
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -97,17 +97,25 @@
s_sinpi.c s_sinpif.c \
s_tanpi.c s_tanpif.c
+# LIBCSRCDIR is defined lazily, so can't be used for exists() below
+LIBC_SRCTOP=${SRCTOP}/lib/libc
# Location of fpmath.h and _fpmath.h
-.if exists(${LIBCSRCDIR}/${MACHINE_ARCH})
-LIBC_ARCH=${MACHINE_ARCH}
+
+# Powerpc is weird, some is shared (via a copy), and powerp64
+# shares with powerpc64le. Elsewhere in the tree they also
+# share with powerpc, but not here.
+M=${MACHINE_ARCH:S/powerpc64le/powerpc64/}
+.if exists(${LIBC_SRCTOP}/${M})
+LIBC_ARCH=${M}
.else
LIBC_ARCH=${MACHINE_CPUARCH}
.endif
-CFLAGS+= -I${.CURDIR}/src -I${LIBCSRCDIR}/include \
- -I${LIBCSRCDIR}/${LIBC_ARCH}
+
+CFLAGS+= -I${.CURDIR}/src -I${LIBC_SRCTOP}/include \
+ -I${LIBC_SRCTOP}/${LIBC_ARCH}
SYM_MAPS+= ${.CURDIR}/Symbol.map
-VERSION_DEF= ${LIBCSRCDIR}/Versions.def
+VERSION_DEF= ${LIBC_SRCTOP}/Versions.def
SYMBOL_MAPS= ${SYM_MAPS}
# C99 long double functions

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 12, 3:26 PM (14 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23628471
Default Alt Text
D41661.id126710.diff (1 KB)

Event Timeline