[llvm-branch-commits] [llvm-branch] r214682 - Merging r214519:

[Bill Wendling]

Author: void
Date: Sun Aug  3 23:21:04 2014
New Revision: 214682

URL: http://llvm.org/viewvc/llvm-project?rev=214682&view=rev
Log:
Merging r214519:
------------------------------------------------------------------------
r214519 | rafael | 2014-08-01 07:57:05 -0700 (Fri, 01 Aug 2014) | 3 lines

Remove lto_codegen_set_attr.

It was never exported, so no functionality change.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/include/llvm-c/lto.h
    llvm/branches/release_35/tools/lto/lto.cpp

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug  3 23:21:04 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213773,213793,213798,213815,213847,213880,213884,213894-213895,213915,214129,214180,214287,214331
+/llvm/trunk:155241,213653,213749,213773,213793,213798,213815,213847,213880,213884,213894-213895,213915,214129,214180,214287,214331,214519

Modified: llvm/branches/release_35/include/llvm-c/lto.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/include/llvm-c/lto.h?rev=214682&r1=214681&r2=214682&view=diff
==============================================================================
--- llvm/branches/release_35/include/llvm-c/lto.h (original)
+++ llvm/branches/release_35/include/llvm-c/lto.h Sun Aug  3 23:21:04 2014
@@ -40,7 +40,7 @@ typedef bool lto_bool_t;
  * @{
  */
 
-#define LTO_API_VERSION 11
+#define LTO_API_VERSION 10
 
 /**
  * \since prior to LTO_API_VERSION=3
@@ -375,14 +375,6 @@ lto_codegen_set_pic_model(lto_code_gen_t
 extern void
 lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu);
 
-/**
- * Sets attributes for the cpu to generate code for.
- *
- * \since LTO_API_VERSION=11
- */
-extern void
-lto_codegen_set_attr(lto_code_gen_t cg, const char *attr);
-
 
 /**
  * Sets the location of the assembler tool to run. If not set, libLTO

Modified: llvm/branches/release_35/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/tools/lto/lto.cpp?rev=214682&r1=214681&r2=214682&view=diff
==============================================================================
--- llvm/branches/release_35/tools/lto/lto.cpp (original)
+++ llvm/branches/release_35/tools/lto/lto.cpp Sun Aug  3 23:21:04 2014
@@ -222,10 +222,6 @@ void lto_codegen_set_cpu(lto_code_gen_t
   return unwrap(cg)->setCpu(cpu);
 }
 
-void lto_codegen_set_attr(lto_code_gen_t cg, const char *attr) {
-  return unwrap(cg)->setAttr(attr);
-}
-
 void lto_codegen_set_assembler_path(lto_code_gen_t cg, const char *path) {
   // In here only for backwards compatibility. We use MC now.
 }