[src/trunk]: src/compat build compat versions of libgomp for everything excep...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ed642cd32c4a
branches:  trunk
changeset: 769780:ed642cd32c4a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Sep 23 06:44:36 2011 +0000

description:
build compat versions of libgomp for everything except mips N64 (for now.)

diffstat:

 compat/amd64/i386/bsd.i386.mk     |  3 ++-
 compat/mips64/64/bsd.64.mk        |  7 ++++++-
 compat/mips64/o32/bsd.o32.mk      |  4 +++-
 compat/sparc64/sparc/bsd.sparc.mk |  3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 9cbf9f0f3cab -r ed642cd32c4a compat/amd64/i386/bsd.i386.mk
--- a/compat/amd64/i386/bsd.i386.mk     Fri Sep 23 06:43:46 2011 +0000
+++ b/compat/amd64/i386/bsd.i386.mk     Fri Sep 23 06:44:36 2011 +0000
@@ -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"
diff -r 9cbf9f0f3cab -r ed642cd32c4a compat/mips64/64/bsd.64.mk
--- a/compat/mips64/64/bsd.64.mk        Fri Sep 23 06:43:46 2011 +0000
+++ b/compat/mips64/64/bsd.64.mk        Fri Sep 23 06:44:36 2011 +0000
@@ -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
diff -r 9cbf9f0f3cab -r ed642cd32c4a compat/mips64/o32/bsd.o32.mk
--- a/compat/mips64/o32/bsd.o32.mk      Fri Sep 23 06:43:46 2011 +0000
+++ b/compat/mips64/o32/bsd.o32.mk      Fri Sep 23 06:44:36 2011 +0000
@@ -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
diff -r 9cbf9f0f3cab -r ed642cd32c4a compat/sparc64/sparc/bsd.sparc.mk
--- a/compat/sparc64/sparc/bsd.sparc.mk Fri Sep 23 06:43:46 2011 +0000
+++ b/compat/sparc64/sparc/bsd.sparc.mk Fri Sep 23 06:44:36 2011 +0000
@@ -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"