Module Name: src
Committed By: mrg
Date: Fri Sep 23 06:44:37 UTC 2011
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
Log Message:
build compat versions of libgomp for everything except mips N64 (for now.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.8 -r1.9 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/sparc64/sparc/bsd.sparc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.4 src/compat/amd64/i386/bsd.i386.mk:1.5
--- src/compat/amd64/i386/bsd.i386.mk:1.4 Thu Jul 21 03:13:30 2011
+++ src/compat/amd64/i386/bsd.i386.mk Fri Sep 23 06:44:36 2011
@@ -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 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.8 src/compat/mips64/64/bsd.64.mk:1.9
--- src/compat/mips64/64/bsd.64.mk:1.8 Thu Jul 21 03:13:30 2011
+++ src/compat/mips64/64/bsd.64.mk Fri Sep 23 06:44:37 2011
@@ -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 @@
.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
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.8 src/compat/mips64/o32/bsd.o32.mk:1.9
--- src/compat/mips64/o32/bsd.o32.mk:1.8 Thu Jul 21 03:13:31 2011
+++ src/compat/mips64/o32/bsd.o32.mk Fri Sep 23 06:44:37 2011
@@ -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 @@
.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
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.4 src/compat/sparc64/sparc/bsd.sparc.mk:1.5
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.4 Thu Jul 21 03:13:31 2011
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Sep 23 06:44:37 2011
@@ -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 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+GOMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
