#55 OS X and GCC need different stripping flags to the linker

fommil · Oct 10, 2013 · 51a7f8e · 51a7f8e
1 parent e5b838d
commit 51a7f8e
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 2 deletions.
diff --git a/native_ref/osx-x86_64/pom.xml b/native_ref/osx-x86_64/pom.xml
@@ -74,6 +74,7 @@
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,-dead_strip</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-x</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/pom.xml b/native_ref/pom.xml
@@ -140,7 +140,6 @@
                         </compilerMiddleOptions>
                         <linkerStartOptions>
                             <linkerStartOption>-O3</linkerStartOption>
-                            <linkerStartOption>-Wl,--strip-all</linkerStartOption>
                         </linkerStartOptions>
                         <sources>
                             <source>

diff --git a/native_ref/win-i686/pom.xml b/native_ref/win-i686/pom.xml
@@ -84,6 +84,7 @@
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-s</linkerMiddleOption>
                         <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>

diff --git a/native_ref/win-x86_64/pom.xml b/native_ref/win-x86_64/pom.xml
@@ -83,6 +83,7 @@
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libquadmath.a</linkerMiddleOption>
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-s</linkerMiddleOption>
                         <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>

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

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

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

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

diff --git a/native_system/pom.xml b/native_system/pom.xml
@@ -150,7 +150,6 @@
                         </compilerMiddleOptions>
                         <linkerStartOptions>
                             <linkerStartOption>-O3</linkerStartOption>
-                            <linkerStartOption>-Wl,--strip-all</linkerStartOption>
                         </linkerStartOptions>
                         <sources>
                             <source>

diff --git a/native_system/win-i686/pom.xml b/native_system/win-i686/pom.xml
@@ -97,6 +97,7 @@
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-s</linkerMiddleOption>
                         <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>

diff --git a/native_system/win-x86_64/pom.xml b/native_system/win-x86_64/pom.xml
@@ -95,6 +95,7 @@
                         <linkerMiddleOption>/opt/mingw64/mingw/lib/libquadmath.a</linkerMiddleOption>
                         <linkerMiddleOption>-static-libgcc</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
+                        <linkerMiddleOption>-Wl,-s</linkerMiddleOption>
                         <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>

diff --git a/native_system/xbuilds/linux-armhf/pom.xml b/native_system/xbuilds/linux-armhf/pom.xml
@@ -95,6 +95,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,-s</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
                     </linkerMiddleOptions>

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

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