Merge "Remove code related to compiled invoke stubs." into dalvik-dev
diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc
index 93ba71b..fd33c24 100644
--- a/src/compiler/driver/compiler_driver.cc
+++ b/src/compiler/driver/compiler_driver.cc
@@ -385,6 +385,7 @@
                                                     compiler_library_, "ArtUnInitQuickCompilerContext");
   }
   uninit_compiler_context(*this);
+#if 0
   if (compiler_library_ != NULL) {
     VLOG(compiler) << "dlclose(" << compiler_library_ << ")";
     /*
@@ -397,9 +398,14 @@
      * However, this is not required by POSIX and we don't do it.
      * See: http://b/issue?id=4998315
      * What's the right thing to do here?
+     *
+     * This has now been completely disabled because mclinker was
+     * closing stdout on exit, which was affecting both quick and
+     * portable.
      */
     dlclose(compiler_library_);
   }
+#endif
 }
 
 CompilerTls* CompilerDriver::GetTls() {