[llvm-commits] [dragonegg] r103589 - in /dragonegg/trunk: llvm-abi.h llvm-backend.cpp llvm-convert.cpp llvm-debug.cpp llvm-types.cpp x86/llvm-target.cpp

[Duncan Sands]

Author: baldrick
Date: Wed May 12 02:31:59 2010
New Revision: 103589

URL: http://llvm.org/viewvc/llvm-project?rev=103589&view=rev
Log:
Now that VISIBILITY_HIDDEN is no longer defined by LLVM, remove
hacks to avoid collisions with gcc's VISIBILITY_HIDDEN.  Use the
new LLVM_GLOBAL_VISIBILITY rather than using gcc's visibility
pragma directly.

Modified:
    dragonegg/trunk/llvm-abi.h
    dragonegg/trunk/llvm-backend.cpp
    dragonegg/trunk/llvm-convert.cpp
    dragonegg/trunk/llvm-debug.cpp
    dragonegg/trunk/llvm-types.cpp
    dragonegg/trunk/x86/llvm-target.cpp

Modified: dragonegg/trunk/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-abi.h?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/llvm-abi.h (original)
+++ dragonegg/trunk/llvm-abi.h Wed May 12 02:31:59 2010
@@ -41,8 +41,6 @@
 #include <gmp.h>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"

Modified: dragonegg/trunk/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-backend.cpp?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/llvm-backend.cpp (original)
+++ dragonegg/trunk/llvm-backend.cpp Wed May 12 02:31:59 2010
@@ -55,8 +55,6 @@
 #include <gmp.h>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"
@@ -1563,10 +1561,9 @@
 //===----------------------------------------------------------------------===//
 
 // This plugin's code is licensed under the GPLv2 or later.  The LLVM libraries
-// use the GPL compatible University of Illinois/NCSA Open Source License.
-#pragma GCC visibility push(default)
-int plugin_is_GPL_compatible; // This plugin is GPL compatible.
-#pragma GCC visibility pop
+// use the GPL compatible University of Illinois/NCSA Open Source License.  The
+// plugin is GPL compatible.
+int plugin_is_GPL_compatible LLVM_GLOBAL_VISIBILITY;
 
 
 /// llvm_start_unit - Perform late initialization.  This is called by GCC just
@@ -2359,9 +2356,8 @@
 /// plugin_init - Plugin initialization routine, called by GCC.  This is the
 /// first code executed in the plugin (except for constructors).  Configure
 /// the plugin and setup GCC, taking over optimization and code generation.
-#pragma GCC visibility push(default)
-int plugin_init(struct plugin_name_args *plugin_info,
-                struct plugin_gcc_version *version) {
+int LLVM_GLOBAL_VISIBILITY plugin_init(struct plugin_name_args *plugin_info,
+                                       struct plugin_gcc_version *version) {
   const char *plugin_name = plugin_info->base_name;
   struct register_pass_info pass_info;
 
@@ -2652,4 +2648,3 @@
 
   return 0;
 }
-#pragma GCC visibility pop

Modified: dragonegg/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-convert.cpp?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/llvm-convert.cpp (original)
+++ dragonegg/trunk/llvm-convert.cpp Wed May 12 02:31:59 2010
@@ -51,8 +51,6 @@
 #include <gmp.h>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"

Modified: dragonegg/trunk/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-debug.cpp?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/llvm-debug.cpp (original)
+++ dragonegg/trunk/llvm-debug.cpp Wed May 12 02:31:59 2010
@@ -40,8 +40,6 @@
 #include <gmp.h>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"

Modified: dragonegg/trunk/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-types.cpp?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/llvm-types.cpp (original)
+++ dragonegg/trunk/llvm-types.cpp Wed May 12 02:31:59 2010
@@ -42,8 +42,6 @@
 #include <map>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"

Modified: dragonegg/trunk/x86/llvm-target.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/x86/llvm-target.cpp?rev=103589&r1=103588&r2=103589&view=diff
==============================================================================
--- dragonegg/trunk/x86/llvm-target.cpp (original)
+++ dragonegg/trunk/x86/llvm-target.cpp Wed May 12 02:31:59 2010
@@ -34,8 +34,6 @@
 #include <gmp.h>
 
 // GCC headers
-#undef VISIBILITY_HIDDEN
-
 extern "C" {
 #include "config.h"
 #include "system.h"