[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 1f1a249720c0361375888160c9909d2e37bfcdda
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Nov 27 12:25:46 2009 +0200

    Disable oprofile support for now.

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index b078950..6299013 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -615,8 +615,8 @@ libllvmexecutionengine_la_SOURCES=\
  llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp\
  llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp\
  llvm/lib/ExecutionEngine/JIT/MacOSJITEventListener.cpp\
- llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp\
  llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
+# llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
 
 # Used only by make check
 
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 6d1befa..1dddc49 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -300,7 +300,6 @@ am_libllvmexecutionengine_la_OBJECTS =  \
 	libllvmexecutionengine_la-JITEmitter.lo \
 	libllvmexecutionengine_la-JITMemoryManager.lo \
 	libllvmexecutionengine_la-MacOSJITEventListener.lo \
-	libllvmexecutionengine_la-OProfileJITEventListener.lo \
 	libllvmexecutionengine_la-TargetSelect.lo
 libllvmexecutionengine_la_OBJECTS =  \
 	$(am_libllvmexecutionengine_la_OBJECTS)
@@ -1434,9 +1433,9 @@ libllvmexecutionengine_la_SOURCES = \
  llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp\
  llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp\
  llvm/lib/ExecutionEngine/JIT/MacOSJITEventListener.cpp\
- llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp\
  llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
 
+# llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
 
 # Used only by make check
 libllvmbitreader_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS)
@@ -1896,7 +1895,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvmexecutionengine_la-JITEmitter.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvmexecutionengine_la-JITMemoryManager.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvmexecutionengine_la-MacOSJITEventListener.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvmexecutionengine_la-OProfileJITEventListener.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvmexecutionengine_la-TargetSelect.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvminterpreter_la-Execution.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libllvminterpreter_la-ExternalFunctions.Plo at am__quote@
@@ -3361,14 +3359,6 @@ libllvmexecutionengine_la-MacOSJITEventListener.lo: llvm/lib/ExecutionEngine/JIT
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libllvmexecutionengine_la_CPPFLAGS) $(CPPFLAGS) $(libllvmexecutionengine_la_CXXFLAGS) $(CXXFLAGS) -c -o libllvmexecutionengine_la-MacOSJITEventListener.lo `test -f 'llvm/lib/ExecutionEngine/JIT/MacOSJITEventListener.cpp' || echo '$(srcdir)/'`llvm/lib/ExecutionEngine/JIT/MacOSJITEventListener.cpp
 
-libllvmexecutionengine_la-OProfileJITEventListener.lo: llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libllvmexecutionengine_la_CPPFLAGS) $(CPPFLAGS) $(libllvmexecutionengine_la_CXXFLAGS) $(CXXFLAGS) -MT libllvmexecutionengine_la-OProfileJITEventListener.lo -MD -MP -MF $(DEPDIR)/libllvmexecutionengine_la-OProfileJITEventListener.Tpo -c -o libllvmexecutionengine_la-OProfileJITEventListener.lo `test -f 'llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp' || echo '$(srcdir)/'`llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libllvmexecutionengine_la-OProfileJITEventListener.Tpo $(DEPDIR)/libllvmexecutionengine_la-OProfileJITEventListener.Plo
- at am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp' object='libllvmexecutionengine_la-OProfileJITEventListener.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libllvmexecutionengine_la_CPPFLAGS) $(CPPFLAGS) $(libllvmexecutionengine_la_CXXFLAGS) $(CXXFLAGS) -c -o libllvmexecutionengine_la-OProfileJITEventListener.lo `test -f 'llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp' || echo '$(srcdir)/'`llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
-
 libllvmexecutionengine_la-TargetSelect.lo: llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libllvmexecutionengine_la_CPPFLAGS) $(CPPFLAGS) $(libllvmexecutionengine_la_CXXFLAGS) $(CXXFLAGS) -MT libllvmexecutionengine_la-TargetSelect.lo -MD -MP -MF $(DEPDIR)/libllvmexecutionengine_la-TargetSelect.Tpo -c -o libllvmexecutionengine_la-TargetSelect.lo `test -f 'llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp' || echo '$(srcdir)/'`llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libllvmexecutionengine_la-TargetSelect.Tpo $(DEPDIR)/libllvmexecutionengine_la-TargetSelect.Plo
diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index f2f3d85..aa919c5 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -1030,7 +1030,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)
 	    return CL_EBYTECODE;
 	}
 
-	EE->RegisterJITEventListener(createOProfileJITEventListener());
+//	EE->RegisterJITEventListener(createOProfileJITEventListener());
 	// Due to LLVM PR4816 only X86 supports non-lazy compilation, disable
 	// for now.
 	// EE->DisableLazyCompilation();

-- 
Debian repository for ClamAV