[llvm-commits] [gcc-plugin] r80494 - in /gcc-plugin/trunk: README llvm-backend.cpp

[Duncan Sands]

Author: baldrick
Date: Sun Aug 30 08:35:20 2009
New Revision: 80494

URL: http://llvm.org/viewvc/llvm-project?rev=80494&view=rev
Log:
Make the plugin work with gcc mainline as well as
the lto branch.

Modified:
    gcc-plugin/trunk/README
    gcc-plugin/trunk/llvm-backend.cpp

Modified: gcc-plugin/trunk/README
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/README?rev=80494&r1=80493&r2=80494&view=diff

==============================================================================
--- gcc-plugin/trunk/README (original)
+++ gcc-plugin/trunk/README Sun Aug 30 08:35:20 2009
@@ -7,6 +7,10 @@
 
 Check out the gcc lto branch from the gcc subversion repository:
   svn checkout svn://gcc.gnu.org/svn/gcc/branches/lto SomeLocalDir
+It should be possible to check out gcc mainline instead:
+  svn checkout svn://gcc.gnu.org/svn/gcc/trunk SomeLocalDir
+However I only test with mainline from time to time (plugin development
+is currently against the lto branch), so it's safer to use the lto branch.
 Apply the patches in the gcc-patches subdirectory, if any.  Hopefully one day
 the plugin will work with an unpatched gcc, but for the moment a few small
 patches need to be applied.  Configure gcc with your favorite options.

Modified: gcc-plugin/trunk/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-backend.cpp?rev=80494&r1=80493&r2=80494&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-backend.cpp (original)
+++ gcc-plugin/trunk/llvm-backend.cpp Sun Aug 30 08:35:20 2009
@@ -1790,9 +1790,11 @@
   if (!quiet_flag)
     errs() << "Starting compilation unit\n";
 
+#ifdef ENABLE_LTO
   // Output LLVM IR if the user requested generation of lto data.
   emit_llvm = flag_generate_lto != 0;
   flag_generate_lto = 0;
+#endif
 }