diff options
| author | mrg <mrg@NetBSD.org> | 2011-09-23 06:44:36 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2011-09-23 06:44:36 +0000 |
| commit | f0e1e8045f7465ab08745ddad5667cc7fdd0ff57 (patch) | |
| tree | be685714ec1f3242e88c0d07a9a1a028475b26d7 | |
| parent | 6e7662dd218464ade8575c0dba02b8971ae956d0 (diff) | |
build compat versions of libgomp for everything except mips N64 (for now.)
| -rw-r--r-- | compat/amd64/i386/bsd.i386.mk | 3 | ||||
| -rw-r--r-- | compat/mips64/64/bsd.64.mk | 7 | ||||
| -rw-r--r-- | compat/mips64/o32/bsd.o32.mk | 4 | ||||
| -rw-r--r-- | compat/sparc64/sparc/bsd.sparc.mk | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/compat/amd64/i386/bsd.i386.mk b/compat/amd64/i386/bsd.i386.mk index 69c9367c607..9a4331ea51a 100644 --- a/compat/amd64/i386/bsd.i386.mk +++ b/compat/amd64/i386/bsd.i386.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.i386.mk,v 1.4 2011/07/21 03:13:30 mrg Exp $ +# $NetBSD: bsd.i386.mk,v 1.5 2011/09/23 06:44:36 mrg Exp $ LD+= -m elf_i386 MLIBDIR= i386 @@ -10,5 +10,6 @@ BFD_MACHINE_ARCH= ${MLIBDIR} CSU_MACHINE_ARCH= ${MLIBDIR} CRYPTO_MACHINE_CPU= ${MLIBDIR} LDELFSO_MACHINE_CPU= ${MLIBDIR} +GOMP_MACHINE_ARCH= ${MLIBDIR} .include "${.PARSEDIR}/../../m32.mk" diff --git a/compat/mips64/64/bsd.64.mk b/compat/mips64/64/bsd.64.mk index d07aa7d41b6..00626fe5cf2 100644 --- a/compat/mips64/64/bsd.64.mk +++ b/compat/mips64/64/bsd.64.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.64.mk,v 1.8 2011/07/21 03:13:30 mrg Exp $ +# $NetBSD: bsd.64.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $ .if ${MACHINE_ARCH} == "mips64eb" LD+= -m elf64btsmip @@ -7,6 +7,11 @@ LD+= -m elf64ltsmip .endif MLIBDIR= 64 +# XXX +# GCC 4.5 libgomp wants a different omp.h installed for the 64 bit +# version of it, and we don't have a way of doing that yet. +NO_LIBGOMP= 1 + COPTS+= -mabi=64 CPUFLAGS+= -mabi=64 LDADD+= -mabi=64 diff --git a/compat/mips64/o32/bsd.o32.mk b/compat/mips64/o32/bsd.o32.mk index 5853ef8e55e..74bfc1fbad9 100644 --- a/compat/mips64/o32/bsd.o32.mk +++ b/compat/mips64/o32/bsd.o32.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.o32.mk,v 1.8 2011/07/21 03:13:31 mrg Exp $ +# $NetBSD: bsd.o32.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $ .if ${MACHINE_ARCH} == "mips64eb" LD+= -m elf32btsmip @@ -7,6 +7,8 @@ LD+= -m elf32ltsmip .endif MLIBDIR= o32 +GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//} + COPTS+= -mabi=32 -march=mips3 CPUFLAGS+= -mabi=32 -march=mips3 LDADD+= -mabi=32 -march=mips3 diff --git a/compat/sparc64/sparc/bsd.sparc.mk b/compat/sparc64/sparc/bsd.sparc.mk index 58716b85569..fe6f9480c86 100644 --- a/compat/sparc64/sparc/bsd.sparc.mk +++ b/compat/sparc64/sparc/bsd.sparc.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.sparc.mk,v 1.4 2011/07/21 03:13:31 mrg Exp $ +# $NetBSD: bsd.sparc.mk,v 1.5 2011/09/23 06:44:37 mrg Exp $ LD+= -m elf32_sparc MLIBDIR= sparc @@ -10,5 +10,6 @@ BFD_MACHINE_ARCH= ${MLIBDIR} CSU_MACHINE_ARCH= ${MLIBDIR} CRYPTO_MACHINE_CPU= ${MLIBDIR} LDELFSO_MACHINE_CPU= ${MLIBDIR} +GOMP_MACHINE_ARCH= ${MLIBDIR} .include "${.PARSEDIR}/../../m32.mk" |
