Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hackaround a problem on mips64 in soft-fp between libgcc and our libc.

Browse Source 
i'm not 100% sure how this should work (matt?), as now we have some
functions coming from libc and some from libgcc, but this at least
builds now.
This commit is contained in:
mrg 2016-03-23 05:28:01 +00:00
parent 4773cc203b
commit 017e647d1f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
external/gpl3/gcc/lib/libgcc/libgcc/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2016/03/23 00:20:18 mrg Exp $
# $NetBSD: Makefile,v 1.25 2016/03/23 05:28:01 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -22,8 +22,15 @@ LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
${GNUHOSTDIST}/gcc/config/floatunsisf.c
.endif
# XXXGCC5 GCC 5.3 has all these in libgcc and we have them in libc.
.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
LIB2ADD_EDITED= ${G_LIB2ADD:T:Nfloatsisf.c:Nfloatunsisf.c:Nfloatsidf.c:Nfloatunsidf.c:Nfixsfsi.c:Nextendsfdf2.c:Naddsf3.c:Nmulsf3.c:Ndivsf3.c:Nadddf3.c:Nsubdf3.c:Nmuldf3.c:Ndivdf3.c:Nfixdfsi.c:S/.asm/.S/}
.else
LIB2ADD_EDITED= ${G_LIB2ADD:T:S/.asm/.S/}
.endif
SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
${G_LIB2ADD:T:S/.asm/.S/} \
${LIB2ADD_EDITED} \
${LIB2ADD_HACK:T:S/.asm/.S/} \
${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"

11
external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2016/03/23 00:20:18 mrg Exp $
# $NetBSD: Makefile,v 1.13 2016/03/23 05:28:01 mrg Exp $
USE_SHLIBDIR= yes
REQUIRETOOLS= yes
@ -28,8 +28,15 @@ LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
${GNUHOSTDIST}/gcc/config/floatunsisf.c
.endif
# XXXGCC5 GCC 5.3 has all these in libgcc and we have them in libc.
.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
LIB2ADD_EDITED= ${G_LIB2ADD:T:Nfloatsisf.c:Nfloatunsisf.c:Nfloatsidf.c:Nfloatunsidf.c:Nfixsfsi.c:Nextendsfdf2.c:Naddsf3.c:Nmulsf3.c:Ndivsf3.c:Nadddf3.c:Nsubdf3.c:Nmuldf3.c:Ndivdf3.c:Nfixdfsi.c:S/.asm/.S/}
.else
LIB2ADD_EDITED= ${G_LIB2ADD:T:S/.asm/.S/}
.endif
SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} ${LIB2_EHASM} \
${G_LIB2ADD:T:S/.asm/.S/} \
${LIB2ADD_EDITED} \
${LIB2ADD_HACK:T:S/.asm/.S/} \
${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS}