From owner-svn-src-user@FreeBSD.ORG  Fri Mar 26 08:05:31 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45718106564A;
	Fri, 26 Mar 2010 08:05:31 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A1178FC0C;
	Fri, 26 Mar 2010 08:05:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2Q85Vji084971;
	Fri, 26 Mar 2010 08:05:31 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q85Uf7084968;
	Fri, 26 Mar 2010 08:05:30 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003260805.o2Q85Uf7084968@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 26 Mar 2010 08:05:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205677 - in user/jmallett/octeon/gnu/lib: . libgomp
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 08:05:31 -0000

Author: jmallett
Date: Fri Mar 26 08:05:30 2010
New Revision: 205677
URL: http://svn.freebsd.org/changeset/base/205677

Log:
  Now that we're setting the right defines, we can build libgomp for n64.

Modified:
  user/jmallett/octeon/gnu/lib/Makefile
  user/jmallett/octeon/gnu/lib/libgomp/Makefile

Modified: user/jmallett/octeon/gnu/lib/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/lib/Makefile	Fri Mar 26 07:51:09 2010	(r205676)
+++ user/jmallett/octeon/gnu/lib/Makefile	Fri Mar 26 08:05:30 2010	(r205677)
@@ -2,16 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= csu libgcc libgcov libdialog libregex libreadline libssp
-
-# XXX/juli
-# The values to substitute for libgomp are elusive for MIPS N64.  Using the
-# definitions used by other LP64 architectures does not seem to work.  It seems
-# that not building it is the best available choice for now.  Will run the
-# configure script and see what it comes up with on a running system.
-.if ${MACHINE_ARCH} != "mips" || !defined(TARGET_ABI) || ${TARGET_ABI} != "n64"
-SUBDIR+= libgomp
-.endif
+SUBDIR= csu libgcc libgcov libgomp libdialog libregex libreadline libssp
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.

Modified: user/jmallett/octeon/gnu/lib/libgomp/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/lib/libgomp/Makefile	Fri Mar 26 07:51:09 2010	(r205676)
+++ user/jmallett/octeon/gnu/lib/libgomp/Makefile	Fri Mar 26 08:05:30 2010	(r205677)
@@ -23,9 +23,9 @@ CFLAGS+= -I${.CURDIR} -I. -I${SRCDIR} -I
 VERSION_MAP=	${SRCDIR}/libgomp.map
 
 # Target-specific OpenMP configuration
-# XXX/juli Need to handle different MIPS ABIs here properly.
 .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \
-    ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc
+    ${MACHINE_ARCH} == powerpc || \
+    (${MACHINE_ARCH} == mips && (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64"))
 OMP_LOCK_ALIGN	=	4
 OMP_LOCK_KIND=		4
 OMP_LOCK_SIZE=		4