--- ../../j2se/make/common/Defs.gmk.orig	Tue Mar 11 11:27:27 2003
+++ ../../j2se/make/common/Defs.gmk	Tue Mar 11 11:27:06 2003
@@ -456,6 +456,12 @@
       JAVAH_CMD = $(BINDIR)/javah
     endif
   endif
+  # XXXBSD: Debug binaries are causing problems on early K6 processors
+  # and SMP machines.  Don't use javah_g, until above problems resolved.
+  # --phantom
+  ifeq ($(PLATFORM), bsd)
+    JAVAH_CMD = $(BINDIR)/javah
+  endif
   RMIC		= $(BINDIR)/rmic$(SUFFIX)
 endif