svn commit: r205677 - in user/jmallett/octeon/gnu/lib: . libgomp

[Juli Mallett]

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