Index: llvm-toolchain-snapshot_3.7~svn241915/configure
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/configure
+++ llvm-toolchain-snapshot_3.7~svn241915/configure
@@ -10115,7 +10115,7 @@ if test "${with_oprofile+set}" = set; th
       case $llvm_cv_os_type in
         Linux)
           if test -n "$llvm_cv_oppath" ; then
-            LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
+            #LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
                                                             { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
 echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
 if test "${ac_cv_search_bfd_init+set}" = set; then
@@ -10211,7 +10211,7 @@ fi
 echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
 ac_res=$ac_cv_search_bfd_init
 if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  test "$ac_res" = "none required" || true
 
 fi
 
@@ -10247,8 +10247,8 @@ for ac_lib in '' opagent; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed"
+    LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS"
   fi
   rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"