From 1fd00dd55d005a4f5c29d40f8e4dc11740b99b8d Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Tue, 27 Oct 2009 10:35:26 -0600
Subject: [PATCH] revert all __attribute__ ((externally_visible)) changes
 because it's not clear yet how to detect whether it's supported

---
 classpath/jni-util.h | 14 ++------------
 src/boot.cpp         | 17 ++++-------------
 src/common.h         |  9 ++-------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/classpath/jni-util.h b/classpath/jni-util.h
index c1dde192b9..181ad56161 100644
--- a/classpath/jni-util.h
+++ b/classpath/jni-util.h
@@ -20,21 +20,11 @@
 #if (defined __MINGW32__) || (defined _MSC_VER)
 #  define PLATFORM_WINDOWS
 #  define PATH_SEPARATOR ';'
-#  ifdef __MINGW32__
-#    define JNIEXPORT __declspec(dllexport) \
-  __attribute__ ((externally_visible))
-#  else // not __MINGW32__
-#    define JNIEXPORT __declspec(dllexport)
-#  endif // not __MINGW32__
+#  define JNIEXPORT __declspec(dllexport)
 #else // not (defined __MINGW32__) || (defined _MSC_VER)
 #  define PLATFORM_POSIX
 #  define PATH_SEPARATOR ':'
-#  ifdef __APPLE__
-#    define JNIEXPORT __attribute__ ((visibility("default")))
-#  else // not __APPLE__
-#    define JNIEXPORT __attribute__ ((visibility("default"))) \
-  __attribute__ ((externally_visible))
-#  endif // not __APPLE__
+#  define JNIEXPORT __attribute__ ((visibility("default")))
 #endif // not (defined __MINGW32__) || (defined _MSC_VER)
 
 #ifdef _MSC_VER
diff --git a/src/boot.cpp b/src/boot.cpp
index 81437450af..b46bac72fb 100644
--- a/src/boot.cpp
+++ b/src/boot.cpp
@@ -25,19 +25,10 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
 #endif // not _MSC_VER
 
 #if (defined __MINGW32__) || (defined _MSC_VER)
-#  ifdef __MINGW32__
-#    define EXPORT __declspec(dllexport) __attribute__ ((externally_visible))
-#  else // not __MINGW32__
-#    define EXPORT __declspec(dllexport)
-#  endif // not __MINGW32__
-#else // not (defined __MINGW32__) || (defined _MSC_VER)
-#  ifdef __APPLE__
-#    define EXPORT __attribute__ ((visibility("default")))
-#  else // not __APPLE__
-#    define EXPORT __attribute__ ((visibility("default"))) \
-  __attribute__ ((externally_visible))
-#  endif // not __APPLE__
-#endif // not (defined __MINGW32__) || (defined _MSC_VER)
+#  define EXPORT __declspec(dllexport)
+#else
+#  define EXPORT __attribute__ ((visibility("default")))
+#endif
 
 #ifdef BOOT_IMAGE
 
diff --git a/src/common.h b/src/common.h
index 5620b99b9e..744a507822 100644
--- a/src/common.h
+++ b/src/common.h
@@ -90,15 +90,10 @@ typedef uint64_t uintptr_t;
 
 #undef JNIEXPORT
 #ifdef PLATFORM_WINDOWS
-#  define JNIEXPORT __declspec(dllexport) __attribute__ ((externally_visible))
+#  define JNIEXPORT __declspec(dllexport)
 #  define PATH_SEPARATOR ';'
 #else // not PLATFORM_WINDOWS
-#  ifdef __APPLE__
-#    define JNIEXPORT __attribute__ ((visibility("default")))
-#  else // not __APPLE__
-#    define JNIEXPORT __attribute__ ((visibility("default"))) \
-  __attribute__ ((externally_visible))
-#  endif // not __APPLE__
+#  define JNIEXPORT __attribute__ ((visibility("default")))
 #  define PATH_SEPARATOR ':'
 #endif // not PLATFORM_WINDOWS