summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2013-04-20 14:44:28 +0000
committered <ed@FreeBSD.org>2013-04-20 14:44:28 +0000
commit7b4c44c92865858fbb16d131ebf521c36a681137 (patch)
treecd60867daeedcd43aa3d2f89b1fad88c3a4cbcfa
parent125013a8784018597f6f937283665372e2c36af9 (diff)
downloadFreeBSD-src-7b4c44c92865858fbb16d131ebf521c36a681137.zip
FreeBSD-src-7b4c44c92865858fbb16d131ebf521c36a681137.tar.gz
Enable libcompiler-rt on MIPS.
Originally we disabled libcompiler-rt on MIPS and SPARC64, because of an issue where __clzdi2 and __ctzdi2 would cause endless recursion. This bug has been fixed in r230021 already, but for some reason we only switched to libcompiler-rt on SPARC64 -- not MIPS. This means we can finally use <stdatomic.h> on all our architectures.
-rw-r--r--gnu/lib/libgcc/Makefile4
-rw-r--r--lib/libcompiler_rt/Makefile8
2 files changed, 3 insertions, 9 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index a06daa7..092e321 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -19,10 +19,6 @@ MK_SSP= no
CFLAGS+= -DTARGET_ARM_EABI
.endif
-.if ${TARGET_CPUARCH} == "mips"
-LIB= gcc
-.endif
-
.PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR}
CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index a9daada..2e869cc 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -196,13 +196,11 @@ SRCS+= aeabi_idivmod.S \
aeabi_uldivmod.S
.endif
-.if ${MACHINE_CPUARCH} != "mips"
-. if ${MK_INSTALLLIB} != "no"
+.if ${MK_INSTALLLIB} != "no"
SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a
-. endif
-. if ${MK_PROFILE} != "no"
+.endif
+.if ${MK_PROFILE} != "no"
SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
-. endif
.endif
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
OpenPOWER on IntegriCloud