# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1394741817 -3600
# Node ID 41ecd18552b2231bf5e5eadfb68ac379bbeae96c
# Parent  756029dab703a2d7646a695d08ea0b4462abda3b# Parent  469e04960daa6fdc6790b3fd30a4c2f28fb8178b
Merge.

diff -r 469e04960daa -r 41ecd18552b2 make/bsd/makefiles/gcc.make
--- a/make/bsd/makefiles/gcc.make	Thu Mar 13 17:49:57 2014 +0100
+++ b/make/bsd/makefiles/gcc.make	Thu Mar 13 21:16:57 2014 +0100
@@ -377,19 +377,9 @@
 #------------------------------------------------------------------------
 # Linker flags
 
-# Ensure use libstdc++ on clang, not libc++
-ifeq ($(USE_CLANG), true)
-  LFLAGS += -stdlib=libstdc++
-endif
-
 # statically link libstdc++.so, work with gcc but ignored by g++
 STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
 
-# Ensure use libstdc++ on clang, not libc++
-ifeq ($(USE_CLANG), true)
-  LFLAGS += -stdlib=libstdc++
-endif
-
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
   ifneq ("${CC_VER_MAJOR}", "2")
diff -r 469e04960daa -r 41ecd18552b2 make/bsd/makefiles/top.make
--- a/make/bsd/makefiles/top.make	Thu Mar 13 17:49:57 2014 +0100
+++ b/make/bsd/makefiles/top.make	Thu Mar 13 21:16:57 2014 +0100
@@ -80,7 +80,7 @@
 	@echo All done.
 
 # This is an explicit dependency for the sake of parallel makes.
-vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff trace_stuff sa_stuff
+vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff trace_stuff sa_stuff dtrace_stuff
 	@# We need a null action here, so implicit rules don't get consulted.
 
 $(Cached_plat): $(Plat_File)