From 9b8e01d51646778a00c3b34ee7d9e8dcdad635be Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Thu, 9 Apr 2015 17:11:33 -0700
Subject: [PATCH] enforce visibility of default pkg R_init methods
---
com.oracle.truffle.r.native/Makefile | 3 ++-
com.oracle.truffle.r.native/gnur/Makefile.gnur | 2 +-
com.oracle.truffle.r.native/library/base/src/registration.c | 2 --
com.oracle.truffle.r.native/library/graphics/src/init.c | 3 ---
com.oracle.truffle.r.native/library/methods/src/init.c | 3 ---
com.oracle.truffle.r.native/library/tools/src/init.c | 3 ---
com.oracle.truffle.r.native/library/utils/src/init.c | 3 ---
7 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile
index 79096582ac..c6abbfd958 100644
--- a/com.oracle.truffle.r.native/Makefile
+++ b/com.oracle.truffle.r.native/Makefile
@@ -36,9 +36,10 @@ all:
$(MAKE) -C run
clean:
- $(MAKE) -C gnur clean
$(MAKE) -C include clean
$(MAKE) -C builtinlibs clean
$(MAKE) -C fficall clean
$(MAKE) -C library clean
$(MAKE) -C run clean
+ $(MAKE) -C gnur clean
+
\ No newline at end of file
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 66d9cfcc72..c5c581f7ed 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -78,5 +78,5 @@ $(GNUR_DIR)/bin/R: $(GNUR_DIR)/Makeconf
(cd $(GNUR_DIR); make >& gnur_make.log)
clean:
- rm Makeconf.done
+ rm -f Makeconf.done
(cd $(GNUR_DIR); make distclean)
diff --git a/com.oracle.truffle.r.native/library/base/src/registration.c b/com.oracle.truffle.r.native/library/base/src/registration.c
index 566ec18c7c..72feb45ef8 100644
--- a/com.oracle.truffle.r.native/library/base/src/registration.c
+++ b/com.oracle.truffle.r.native/library/base/src/registration.c
@@ -77,8 +77,6 @@ static R_FortranMethodDef fortranMethods[] = {
{NULL, NULL, 0}
};
-#include <R_ext/Visibility.h>
-void attribute_hidden
R_init_base(DllInfo *dll)
{
// R_registerRoutines(dll, NULL, callMethods, fortranMethods, NULL);
diff --git a/com.oracle.truffle.r.native/library/graphics/src/init.c b/com.oracle.truffle.r.native/library/graphics/src/init.c
index dfc6468c28..b992a5530d 100644
--- a/com.oracle.truffle.r.native/library/graphics/src/init.c
+++ b/com.oracle.truffle.r.native/library/graphics/src/init.c
@@ -81,9 +81,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
R_init_graphics(DllInfo *dll)
{
R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);
diff --git a/com.oracle.truffle.r.native/library/methods/src/init.c b/com.oracle.truffle.r.native/library/methods/src/init.c
index f67ea8ac9a..c7607bb4f2 100644
--- a/com.oracle.truffle.r.native/library/methods/src/init.c
+++ b/com.oracle.truffle.r.native/library/methods/src/init.c
@@ -56,9 +56,6 @@ static const R_CallMethodDef CallEntries[] = {
};
void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
R_init_methods(DllInfo *dll)
{
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
diff --git a/com.oracle.truffle.r.native/library/tools/src/init.c b/com.oracle.truffle.r.native/library/tools/src/init.c
index bff24a0b8f..4fd2404024 100644
--- a/com.oracle.truffle.r.native/library/tools/src/init.c
+++ b/com.oracle.truffle.r.native/library/tools/src/init.c
@@ -65,9 +65,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
R_init_tools(DllInfo *dll)
{
R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);
diff --git a/com.oracle.truffle.r.native/library/utils/src/init.c b/com.oracle.truffle.r.native/library/utils/src/init.c
index 111354b86d..d397c0a43b 100644
--- a/com.oracle.truffle.r.native/library/utils/src/init.c
+++ b/com.oracle.truffle.r.native/library/utils/src/init.c
@@ -112,9 +112,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
R_init_utils(DllInfo *dll)
{
R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);
--
GitLab