X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27b0c1ee1d85c53f1d11bb2b8e539cd76e4cf437..0a200527ffe9436d177c839c4bbb0a28e87b862b:/tools/cmake/Modules/FindLibunwind.cmake

diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake
index e4ca67f210..8ae23e59a5 100644
--- a/tools/cmake/Modules/FindLibunwind.cmake
+++ b/tools/cmake/Modules/FindLibunwind.cmake
@@ -1,6 +1,6 @@
 # Search for libunwind and components, both includes and libraries
 #
-# Copyright (C) 2003-2018 The SimGrid Team.
+# Copyright (C) 2003-2019 The SimGrid Team.
 # This is distributed under the LGPL licence but please contact us for
 # relicensing if you need. This is merely free software, no matter the licence.
 #
@@ -14,7 +14,7 @@
 
 # SimGrid needs unwind-ptrace on Linux and FreeBSD
 if("${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD")
-  set(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} unwind-ptrace)
+  set(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} unwind-ptrace unwind-generic)
 endif()
 
 #
@@ -29,16 +29,6 @@ endif()
 # Of course also need the core lib
 set(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} "unwind")
 
-# For some reason, some archs have an arch-specific while other do not.
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-    SET(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} unwind-arm)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
-    SET(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} unwind-x86_64)
-elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
-    SET(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} unwind-x86)
-endif()
-
-
 message(STATUS "Looking for libunwind:")
 # Let's assume we have it, and invalidate if parts are missing
 SET(HAVE_LIBUNWIND 1)