From eb3bd1ce7ce3cb1969d75bbdd8cbdca094b44ad7 Mon Sep 17 00:00:00 2001
From: Eric Scharff <eric_scharff@ecovate.com>
Date: Thu, 1 Nov 2007 14:37:51 -0600
Subject: [PATCH] Got strip working for Mac OS X

---
 classpath/jni-util.h | 4 ----
 makefile             | 4 ++--
 src/common.h         | 4 ----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/classpath/jni-util.h b/classpath/jni-util.h
index 4cd0363c8a..00778c85cd 100644
--- a/classpath/jni-util.h
+++ b/classpath/jni-util.h
@@ -5,12 +5,8 @@
 #ifdef __MINGW32__
 #  define JNIEXPORT __declspec(dllexport)
 #else
-#ifdef __APPLE__
-#  define JNIEXPORT __attribute__ ((used))
-#else
 #  define JNIEXPORT __attribute__ ((visibility("default")))
 #endif
-#endif
 
 namespace {
 
diff --git a/makefile b/makefile
index 87a1f1f5ec..98fedea753 100644
--- a/makefile
+++ b/makefile
@@ -82,7 +82,7 @@ ifeq ($(platform),darwin)
 	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
 		-I$(JAVA_HOME)/include/linux -I$(src)
 	lflags = $(common-lflags) -ldl
-	strip-all =
+	strip-all = -S -x
 endif
 
 ifeq ($(platform),windows)
@@ -328,7 +328,7 @@ ifeq ($(platform),windows)
 else
 	$(cc) $(^) $(lflags) -o $(@)
 endif
-	@$(strip) $(strip-all) $(@)
+	$(strip) $(strip-all) $(@)
 	@$(show-size) $(@)
 
 $(generator): $(generator-objects)
diff --git a/src/common.h b/src/common.h
index 92ec87084b..6ba5156701 100644
--- a/src/common.h
+++ b/src/common.h
@@ -14,12 +14,8 @@
 #ifdef __MINGW32__
 #  define JNIEXPORT __declspec(dllexport)
 #else
-#ifdef __APPLE__
-#  define JNIEXPORT __attribute__ ((used))
-#else
 #  define JNIEXPORT __attribute__ ((visibility("default")))
 #endif
-#endif
 
 #ifdef __i386__
 #  define LD "d"