#55 restrict symbol export on OS X and Linux

fommil · Oct 9, 2013 · 7b4336f · 7b4336f
1 parent 4ca3ef6
commit 7b4336f
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 0 deletions.
diff --git a/native_ref/osx-x86_64/pom.xml b/native_ref/osx-x86_64/pom.xml
@@ -72,6 +72,7 @@
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
                         <linkerMiddleOption>-framework JavaVM</linkerMiddleOption>
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/win-i686/pom.xml b/native_ref/win-i686/pom.xml
@@ -83,6 +83,7 @@
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
+                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/win-x86_64/pom.xml b/native_ref/win-x86_64/pom.xml
@@ -76,11 +76,13 @@
                     <linkerMiddleOptions>
 <!-- check binary link with
   x86_64-w64-mingw32-objdump -p target/netlib-native_ref-win-x86_64.dll | grep DLL
+  x86_64-w64-mingw32-nm -g target/netlib-native_ref-win-x86_64.dll
 -->
                         <linkerMiddleOption>-shared</linkerMiddleOption>
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libgfortran.a</linkerMiddleOption>
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libquadmath.a</linkerMiddleOption>
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
+                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/xbuilds/linux-armhf/pom.xml b/native_ref/xbuilds/linux-armhf/pom.xml
@@ -85,6 +85,7 @@ arm-rpi-linux-gnueabi-readelf -a target/netlib-native_ref-linux-armhf.so | grep
 -->
                         <linkerMiddleOption>-shared</linkerMiddleOption>
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/xbuilds/linux-i686/pom.xml b/native_ref/xbuilds/linux-i686/pom.xml
@@ -80,6 +80,7 @@
                     <linkerMiddleOptions>
                         <linkerMiddleOption>-shared</linkerMiddleOption>
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/xbuilds/linux-x86_64/pom.xml b/native_ref/xbuilds/linux-x86_64/pom.xml
@@ -67,6 +67,7 @@
                     <linkerMiddleOptions>
                         <linkerMiddleOption>-shared</linkerMiddleOption>
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/osx-x86_64/pom.xml b/native_system/osx-x86_64/pom.xml
@@ -76,6 +76,7 @@
                         <linkerMiddleOption>-framework JavaVM</linkerMiddleOption>
                         <linkerMiddleOption>-framework veclib</linkerMiddleOption>
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/win-i686/pom.xml b/native_system/win-i686/pom.xml
@@ -96,6 +96,7 @@
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
+                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/win-x86_64/pom.xml b/native_system/win-x86_64/pom.xml
@@ -94,6 +94,7 @@
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libgfortran.a</linkerMiddleOption>
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libquadmath.a</linkerMiddleOption>
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
+                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/xbuilds/linux-armhf/pom.xml b/native_system/xbuilds/linux-armhf/pom.xml
@@ -98,6 +98,7 @@ arm-rpi-linux-gnueabi-readelf -a target/netlib-native_system-linux-armhf.so | gr
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-lblas</linkerMiddleOption>
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/xbuilds/linux-i686/pom.xml b/native_system/xbuilds/linux-i686/pom.xml
@@ -98,6 +98,7 @@
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-lblas</linkerMiddleOption>
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/xbuilds/linux-x86_64/pom.xml b/native_system/xbuilds/linux-x86_64/pom.xml
@@ -80,6 +80,7 @@
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-lblas</linkerMiddleOption>
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/netlib/symbol.map b/netlib/symbol.map
@@ -0,0 +1 @@
+{ global: Java_*; _Java_*; local: *; };