[PATCH] D15441: [libc++] Use libgcc_s and libgcc instead of libgcc_eh when running the libc++ tests

[Eric Fiselier via cfe-commits]

EricWF created this revision.
EricWF added reviewers: danalbert, jroelofs, chandlerc.
EricWF added a subscriber: cfe-commits.
EricWF added a dependency: D15440: [libc++abi] Use libgcc and libgcc_s to 
provide _Unwind symbols instead of libgcc_eh.a.

This change depends on D15440.

http://reviews.llvm.org/D15441

Files:
  test/libcxx/test/config.py

Index: test/libcxx/test/config.py
===================================================================
--- test/libcxx/test/config.py
+++ test/libcxx/test/config.py
@@ -572,15 +572,16 @@
         if target_platform == 'darwin':
             self.cxx.link_flags += ['-lSystem']
         elif target_platform == 'linux':
+            self.cxx.link_flags += ['-lm']
             if not llvm_unwinder:
-                self.cxx.link_flags += ['-lgcc_eh']
-            self.cxx.link_flags += ['-lc', '-lm']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
             if enable_threads:
                 self.cxx.link_flags += ['-lpthread']
+            self.cxx.link_flags += ['-lc']
             if llvm_unwinder:
                 self.cxx.link_flags += ['-lunwind', '-ldl']
             else:
-                self.cxx.link_flags += ['-lgcc_s']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
         elif target_platform.startswith('freebsd'):
             self.cxx.link_flags += ['-lc', '-lm', '-lpthread', '-lgcc_s', 
'-lcxxrt']
         else:



Index: test/libcxx/test/config.py
===================================================================
--- test/libcxx/test/config.py
+++ test/libcxx/test/config.py
@@ -572,15 +572,16 @@
         if target_platform == 'darwin':
             self.cxx.link_flags += ['-lSystem']
         elif target_platform == 'linux':
+            self.cxx.link_flags += ['-lm']
             if not llvm_unwinder:
-                self.cxx.link_flags += ['-lgcc_eh']
-            self.cxx.link_flags += ['-lc', '-lm']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
             if enable_threads:
                 self.cxx.link_flags += ['-lpthread']
+            self.cxx.link_flags += ['-lc']
             if llvm_unwinder:
                 self.cxx.link_flags += ['-lunwind', '-ldl']
             else:
-                self.cxx.link_flags += ['-lgcc_s']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
         elif target_platform.startswith('freebsd'):
             self.cxx.link_flags += ['-lc', '-lm', '-lpthread', '-lgcc_s', '-lcxxrt']
         else:

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits