From 10044cf0cd83dce7f5e9e6ea6d47ff5bf888f840 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
Date: Wed, 20 Apr 2016 09:54:41 +0200
Subject: [PATCH] [profiler] Remove unused OProfile stuff from the build
 system.

---
 configure.ac              | 19 -------------------
 mono/profiler/Makefile.am |  4 ----
 winconfig.h               |  3 ---
 3 files changed, 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index 966bd503915..ee3a9666ecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3558,20 +3558,6 @@ AC_ARG_WITH(bitcode,         [  --with-bitcode=yes,no           If bitcode is en
 AC_ARG_WITH(xammac,          [  --with-xammac=yes,no            If you want to build the Xamarin.Mac assemblies (defaults to no)],    [], [with_xammac=no])
 AC_ARG_WITH(mobile_static,   [  --with-mobile_static=yes,no     If you want to build the mobile_static assemblies (defaults to no)],  [], [with_mobile_static=no])
 
-OPROFILE=no
-AC_ARG_WITH(oprofile,[  --with-oprofile=no,<oprofile install dir>   Enable oprofile support (defaults to no)],[
-	if test x$with_oprofile != xno; then
-	    oprofile_include=$with_oprofile/include
-	    if test ! -f $oprofile_include/opagent.h; then
-	   	  AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
-		fi
-	    OPROFILE=yes
-		OPROFILE_CFLAGS="-I$oprofile_include"
-	    OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
-	    AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
-	fi
-])
-
 MALLOC_MEMPOOLS=no
 AC_ARG_WITH(malloc_mempools,[  --with-malloc-mempools=yes,no  Use malloc for each single mempool allocation (only for runtime debugging, defaults to no)],[
 	if test x$with_malloc_mempools = xyes; then
@@ -3681,10 +3667,6 @@ AC_SUBST(docs_dir)
 ## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
 AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
 
-AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
-AC_SUBST(OPROFILE_CFLAGS)
-AC_SUBST(OPROFILE_LIBS)
-
 libmono_ldflags="$libmono_ldflags $LIBS"
 
 AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = xyes])
@@ -4106,7 +4088,6 @@ echo "
 	TLS:           $with_tls
 	SIGALTSTACK:   $with_sigaltstack
 	Engine:        $jit_status
-	oprofile:      $OPROFILE
 	BigArrays:     $enable_big_arrays
 	DTrace:        $enable_dtrace
 	LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 6ae3d2556e9..41f9d4ab16a 100644
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -35,10 +35,6 @@ endif
 endif
 endif
 
-if HAVE_OPROFILE
-# Do something that uses OPROFILE_CFLAGS and OPROFILE_LIBS
-endif
-
 if SUPPORT_BOEHM
 if DISABLE_EXECUTABLES
 LIBMONO=$(top_builddir)/mono/mini/$(LIBMONO_LA)
diff --git a/winconfig.h b/winconfig.h
index 2a49fea8b19..a6daf8b0528 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -299,9 +299,6 @@
 /* No GC support. */
 /* #undef HAVE_NULL_GC */
 
-/* Have oprofile support */
-/* #undef HAVE_OPROFILE */
-
 /* Define to 1 if you have the `poll' function. */
 /* #undef HAVE_POLL */
 
-- 
2.25.1