Page MenuHomeFreeBSD
Files F163642682

D34315.id102930.diff
No OneTemporary
Actions

D34315.id102930.diff
View Options

Index: contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
===================================================================
--- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -63,9 +63,11 @@
#ifdef __powerpc64__
# define LG_VADDR 64
# define LG_SIZEOF_PTR 3
+# define JEMALLOC_TLS_MODEL __attribute__((tls_model("initial-exec")))
#elif defined(__powerpc__)
# define LG_VADDR 32
# define LG_SIZEOF_PTR 2
+# define JEMALLOC_TLS_MODEL __attribute__((tls_model("initial-exec")))
#endif
#ifdef __riscv
# define LG_VADDR 48
Index: lib/libc/Makefile
===================================================================
--- lib/libc/Makefile
+++ lib/libc/Makefile
@@ -32,7 +32,7 @@
LIB=c
SHLIB_MAJOR= 7
.if ${MK_SSP} != "no" && \
- (${LIBC_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "")
+ (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
SHLIB_LDSCRIPT=libc.ldscript
.else
SHLIB_LDSCRIPT=libc_nossp.ldscript
@@ -57,7 +57,8 @@
# Use a more efficient TLS model for libc since we can reasonably assume that
# it will be loaded during program startup.
.if ${LIBC_ARCH} == "aarch64" || ${LIBC_ARCH} == "amd64" || \
- ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "riscv"
+ ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "riscv" || \
+ ${LIBC_ARCH:Mpowerpc*} != ""
CFLAGS+= -ftls-model=initial-exec
.endif
@@ -68,7 +69,7 @@
LIBADD+= compiler_rt
.if ${MK_SSP} != "no" && \
- (${LIBC_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "")
+ (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
LIBADD+= ssp_nonshared
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 26, 2:59 AM (19 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35510854
Default Alt Text
D34315.id102930.diff (1 KB)

Event Timeline