#55 strip all and (possibly ignored) using the symbol table on Windows

fommil · Oct 10, 2013 · e5b838d · e5b838d
1 parent 144478d
commit e5b838d
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 16 deletions.
diff --git a/native_ref/pom.xml b/native_ref/pom.xml
@@ -140,6 +140,7 @@
                         </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,7 +84,8 @@
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
+                        <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

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

diff --git a/native_ref/xbuilds/linux-armhf/pom.xml b/native_ref/xbuilds/linux-armhf/pom.xml
@@ -84,8 +84,6 @@ arm-rpi-linux-gnueabi-readelf -a target/netlib-native_ref-linux-armhf.so | grep
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/xbuilds/linux-i686/pom.xml b/native_ref/xbuilds/linux-i686/pom.xml
@@ -79,8 +79,6 @@
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_ref/xbuilds/linux-x86_64/pom.xml b/native_ref/xbuilds/linux-x86_64/pom.xml
@@ -66,8 +66,6 @@
                         <linkerMiddleOption>-lgfortran</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/pom.xml b/native_system/pom.xml
@@ -150,6 +150,7 @@
                         </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,7 +97,8 @@
                         <!-- otherwise an "@..." symbol is added to the function name! -->
                         <linkerMiddleOption>-Wl,--kill-at</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- No symbol restrictions on Windows, see http://sourceforge.net/p/mingw/bugs/1134/ -->
+                        <!-- Ignored, see http://sourceforge.net/p/mingw/bugs/1134/ -->
+                        <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

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

diff --git a/native_system/xbuilds/linux-armhf/pom.xml b/native_system/xbuilds/linux-armhf/pom.xml
@@ -97,8 +97,6 @@ arm-rpi-linux-gnueabi-readelf -a target/netlib-native_system-linux-armhf.so | gr
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/xbuilds/linux-i686/pom.xml b/native_system/xbuilds/linux-i686/pom.xml
@@ -97,8 +97,6 @@
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>

diff --git a/native_system/xbuilds/linux-x86_64/pom.xml b/native_system/xbuilds/linux-x86_64/pom.xml
@@ -79,8 +79,6 @@
                         <linkerMiddleOption>-llapack</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--version-script=${netlib.src}/symbol.map</linkerMiddleOption>
                         <linkerMiddleOption>-Wl,--gc-sections</linkerMiddleOption>
-                        <!-- ignored :-( http://stackoverflow.com/questions/19289901 -->
-                        <linkerMiddleOption>-Wl,--discard-all</linkerMiddleOption>
                     </linkerMiddleOptions>
                 </configuration>
             </plugin>