Simplify libunwind build files

Sandbox2 and SAPI only use the `unwind-ptrace-wrapped` target. PiperOrigin-RevId: 338450188 Change-Id: Iee7d7aeda244cad90dae8b5228316f506efc3deb
2020-10-22 05:02:42 -07:00 · 2020-10-22 05:02:42 -07:00 · 040d76be28
parent cba334a9d1
commit 040d76be28
3 changed files with 132 additions and 146 deletions
--- a/cmake/SapiDeps.cmake
+++ b/cmake/SapiDeps.cmake
@ -59,7 +59,6 @@ endif()
 if(SAPI_DOWNLOAD_LIBUNWIND)
  include(cmake/libunwind/Download.cmake)
 endif()
-check_target(unwind_ptrace)
 check_target(unwind_ptrace_wrapped)

 if(SAPI_DOWNLOAD_GFLAGS)
--- a/cmake/libunwind/Download.cmake
+++ b/cmake/libunwind/Download.cmake
@ -33,121 +33,117 @@ if(error)
 endif()

 set(_unwind_src "${CMAKE_BINARY_DIR}/libunwind-src")
-foreach(wrapped _wrapped "")
-  add_library(unwind_ptrace${wrapped} STATIC
-    # internal_headers
-    ${_unwind_src}/include/compiler.h
-    ${_unwind_src}/include/config.h
-    ${_unwind_src}/include/dwarf.h
-    ${_unwind_src}/include/dwarf-eh.h
-    ${_unwind_src}/include/dwarf_i.h
-    ${_unwind_src}/include/libunwind.h
-    ${_unwind_src}/include/libunwind-common.h
-    ${_unwind_src}/include/libunwind-coredump.h
-    ${_unwind_src}/include/libunwind-dynamic.h
-    ${_unwind_src}/include/libunwind-ptrace.h
-    ${_unwind_src}/include/libunwind-x86_64.h
-    ${_unwind_src}/include/libunwind_i.h
-    ${_unwind_src}/include/mempool.h
-    ${_unwind_src}/include/remote.h
-    ${_unwind_src}/include/tdep-x86_64/dwarf-config.h
-    ${_unwind_src}/include/tdep-x86_64/libunwind_i.h
-    ${_unwind_src}/include/tdep/dwarf-config.h
-    ${_unwind_src}/include/tdep/libunwind_i.h
-    ${_unwind_src}/include/unwind.h
-    ${_unwind_src}/src/elf32.h
-    ${_unwind_src}/src/elf64.h
-    ${_unwind_src}/src/elfxx.h
-    ${_unwind_src}/src/os-linux.h
-    ${_unwind_src}/src/x86_64/init.h
-    ${_unwind_src}/src/x86_64/offsets.h
-    ${_unwind_src}/src/x86_64/ucontext_i.h
-    ${_unwind_src}/src/x86_64/unwind_i.h
-    # included_sources
-    ${_unwind_src}/src/elf64.h
-    ${_unwind_src}/src/elfxx.h
-    ${_unwind_src}/src/elfxx.c
-    # sources_common
-    ${_unwind_src}/src/dwarf/Gexpr.c
-    ${_unwind_src}/src/dwarf/Gfde.c
-    ${_unwind_src}/src/dwarf/Gfind_proc_info-lsb.c
-    ${_unwind_src}/src/dwarf/Gfind_unwind_table.c
-    ${_unwind_src}/src/dwarf/Gparser.c
-    ${_unwind_src}/src/dwarf/Gpe.c
-    ${_unwind_src}/src/dwarf/Gstep.c
-    ${_unwind_src}/src/dwarf/global.c
-    ${_unwind_src}/src/mi/Gdestroy_addr_space.c
-    ${_unwind_src}/src/mi/Gdyn-extract.c
-    ${_unwind_src}/src/mi/Gfind_dynamic_proc_info.c
-    ${_unwind_src}/src/mi/Gget_accessors.c
-    ${_unwind_src}/src/mi/Gget_proc_name.c
-    ${_unwind_src}/src/mi/Gget_reg.c
-    ${_unwind_src}/src/mi/Gput_dynamic_unwind_info.c
-    ${_unwind_src}/src/mi/flush_cache.c
-    ${_unwind_src}/src/mi/init.c
-    ${_unwind_src}/src/mi/mempool.c
-    ${_unwind_src}/src/os-linux.c
-    ${_unwind_src}/src/x86_64/Gcreate_addr_space.c
-    ${_unwind_src}/src/x86_64/Gglobal.c
-    ${_unwind_src}/src/x86_64/Ginit.c
-    ${_unwind_src}/src/x86_64/Gos-linux.c
-    ${_unwind_src}/src/x86_64/Gregs.c
-    ${_unwind_src}/src/x86_64/Gresume.c
-    ${_unwind_src}/src/x86_64/Gstash_frame.c
-    ${_unwind_src}/src/x86_64/Gstep.c
-    ${_unwind_src}/src/x86_64/is_fpreg.c
-    ${_unwind_src}/src/x86_64/setcontext.S
-    # srcs
-    ${_unwind_src}/src/mi/Gdyn-remote.c
-    ${_unwind_src}/src/ptrace/_UPT_access_fpreg.c
-    ${_unwind_src}/src/ptrace/_UPT_access_mem.c
-    ${_unwind_src}/src/ptrace/_UPT_access_reg.c
-    ${_unwind_src}/src/ptrace/_UPT_accessors.c
-    ${_unwind_src}/src/ptrace/_UPT_create.c
-    ${_unwind_src}/src/ptrace/_UPT_destroy.c
-    ${_unwind_src}/src/ptrace/_UPT_elf.c
-    ${_unwind_src}/src/ptrace/_UPT_find_proc_info.c
-    ${_unwind_src}/src/ptrace/_UPT_get_dyn_info_list_addr.c
-    ${_unwind_src}/src/ptrace/_UPT_get_proc_name.c
-    ${_unwind_src}/src/ptrace/_UPT_internal.h
-    ${_unwind_src}/src/ptrace/_UPT_put_unwind_info.c
-    ${_unwind_src}/src/ptrace/_UPT_reg_offset.c
-    ${_unwind_src}/src/ptrace/_UPT_resume.c
-    # hdrs
-    ${_unwind_src}/include/config.h
-    ${_unwind_src}/include/libunwind.h
-    # source_ptrace
-    ${_unwind_src}/src/x86_64/Ginit_remote.c
-  )
-  add_library(unwind::unwind_ptrace${wrapped} ALIAS unwind_ptrace${wrapped})
-  target_include_directories(unwind_ptrace${wrapped} PUBLIC
-    ${_unwind_src}/include
-    ${_unwind_src}/include/tdep
-    ${_unwind_src}/src
-  )
-  target_compile_options(unwind_ptrace${wrapped} PRIVATE
-    -fno-common
-    -Wno-cpp
-  )
-  target_compile_definitions(unwind_ptrace${wrapped} PRIVATE
-    -DHAVE_CONFIG_H
-    -D_GNU_SOURCE
-    -DNO_FRAME_POINTER
-  )
-  target_link_libraries(unwind_ptrace${wrapped} PRIVATE
-    sapi::base
-    sandbox2::ptrace_hook
-  )
-endforeach()
-target_compile_definitions(unwind_ptrace_wrapped PUBLIC
-  -D_UPT_accessors=_UPT_accessors_wrapped
-  -D_UPT_create=_UPT_create_wrapped
-  -D_UPT_destroy=_UPT_destroy_wrapped
-  -D_Ux86_64_create_addr_space=_Ux86_64_create_addr_space_wrapped
-  -D_Ux86_64_destroy_addr_space=_Ux86_64_destroy_addr_space_wrapped
-  -D_Ux86_64_get_proc_name=_Ux86_64_get_proc_name_wrapped
-  -D_Ux86_64_get_reg=_Ux86_64_get_reg_wrapped
-  -D_Ux86_64_init_remote=_Ux86_64_init_remote_wrapped
-  -D_Ux86_64_step=_Ux86_64_step_wrapped
-  -Dptrace=ptrace_wrapped
+add_library(unwind_ptrace_wrapped STATIC
+  # internal_headers
+  ${_unwind_src}/include/compiler.h
+  ${_unwind_src}/include/config.h
+  ${_unwind_src}/include/dwarf.h
+  ${_unwind_src}/include/dwarf-eh.h
+  ${_unwind_src}/include/dwarf_i.h
+  ${_unwind_src}/include/libunwind.h
+  ${_unwind_src}/include/libunwind-common.h
+  ${_unwind_src}/include/libunwind-coredump.h
+  ${_unwind_src}/include/libunwind-dynamic.h
+  ${_unwind_src}/include/libunwind-ptrace.h
+  ${_unwind_src}/include/libunwind-x86_64.h
+  ${_unwind_src}/include/libunwind_i.h
+  ${_unwind_src}/include/mempool.h
+  ${_unwind_src}/include/remote.h
+  ${_unwind_src}/include/tdep-x86_64/dwarf-config.h
+  ${_unwind_src}/include/tdep-x86_64/libunwind_i.h
+  ${_unwind_src}/include/tdep/dwarf-config.h
+  ${_unwind_src}/include/tdep/libunwind_i.h
+  ${_unwind_src}/include/unwind.h
+  ${_unwind_src}/src/elf32.h
+  ${_unwind_src}/src/elf64.h
+  ${_unwind_src}/src/elfxx.h
+  ${_unwind_src}/src/os-linux.h
+  ${_unwind_src}/src/x86_64/init.h
+  ${_unwind_src}/src/x86_64/offsets.h
+  ${_unwind_src}/src/x86_64/ucontext_i.h
+  ${_unwind_src}/src/x86_64/unwind_i.h
+  # included_sources
+  ${_unwind_src}/src/elf64.h
+  ${_unwind_src}/src/elfxx.h
+  ${_unwind_src}/src/elfxx.c
+  # sources_common
+  ${_unwind_src}/src/dwarf/Gexpr.c
+  ${_unwind_src}/src/dwarf/Gfde.c
+  ${_unwind_src}/src/dwarf/Gfind_proc_info-lsb.c
+  ${_unwind_src}/src/dwarf/Gfind_unwind_table.c
+  ${_unwind_src}/src/dwarf/Gparser.c
+  ${_unwind_src}/src/dwarf/Gpe.c
+  ${_unwind_src}/src/dwarf/Gstep.c
+  ${_unwind_src}/src/dwarf/global.c
+  ${_unwind_src}/src/mi/Gdestroy_addr_space.c
+  ${_unwind_src}/src/mi/Gdyn-extract.c
+  ${_unwind_src}/src/mi/Gfind_dynamic_proc_info.c
+  ${_unwind_src}/src/mi/Gget_accessors.c
+  ${_unwind_src}/src/mi/Gget_proc_name.c
+  ${_unwind_src}/src/mi/Gget_reg.c
+  ${_unwind_src}/src/mi/Gput_dynamic_unwind_info.c
+  ${_unwind_src}/src/mi/flush_cache.c
+  ${_unwind_src}/src/mi/init.c
+  ${_unwind_src}/src/mi/mempool.c
+  ${_unwind_src}/src/os-linux.c
+  ${_unwind_src}/src/x86_64/Gcreate_addr_space.c
+  ${_unwind_src}/src/x86_64/Gglobal.c
+  ${_unwind_src}/src/x86_64/Ginit.c
+  ${_unwind_src}/src/x86_64/Gos-linux.c
+  ${_unwind_src}/src/x86_64/Gregs.c
+  ${_unwind_src}/src/x86_64/Gresume.c
+  ${_unwind_src}/src/x86_64/Gstash_frame.c
+  ${_unwind_src}/src/x86_64/Gstep.c
+  ${_unwind_src}/src/x86_64/is_fpreg.c
+  ${_unwind_src}/src/x86_64/setcontext.S
+  # srcs
+  ${_unwind_src}/src/mi/Gdyn-remote.c
+  ${_unwind_src}/src/ptrace/_UPT_access_fpreg.c
+  ${_unwind_src}/src/ptrace/_UPT_access_mem.c
+  ${_unwind_src}/src/ptrace/_UPT_access_reg.c
+  ${_unwind_src}/src/ptrace/_UPT_accessors.c
+  ${_unwind_src}/src/ptrace/_UPT_create.c
+  ${_unwind_src}/src/ptrace/_UPT_destroy.c
+  ${_unwind_src}/src/ptrace/_UPT_elf.c
+  ${_unwind_src}/src/ptrace/_UPT_find_proc_info.c
+  ${_unwind_src}/src/ptrace/_UPT_get_dyn_info_list_addr.c
+  ${_unwind_src}/src/ptrace/_UPT_get_proc_name.c
+  ${_unwind_src}/src/ptrace/_UPT_internal.h
+  ${_unwind_src}/src/ptrace/_UPT_put_unwind_info.c
+  ${_unwind_src}/src/ptrace/_UPT_reg_offset.c
+  ${_unwind_src}/src/ptrace/_UPT_resume.c
+  # hdrs
+  ${_unwind_src}/include/config.h
+  ${_unwind_src}/include/libunwind.h
+  # source_ptrace
+  ${_unwind_src}/src/x86_64/Ginit_remote.c
+)
+add_library(unwind::unwind_ptrace_wrapped ALIAS unwind_ptrace_wrapped)
+target_include_directories(unwind_ptrace_wrapped PUBLIC
+  ${_unwind_src}/include
+  ${_unwind_src}/include/tdep
+  ${_unwind_src}/src
+)
+target_compile_options(unwind_ptrace_wrapped PRIVATE
+  -fno-common
+  -Wno-cpp
+)
+target_compile_definitions(unwind_ptrace_wrapped
+  PRIVATE -DHAVE_CONFIG_H
+          -D_GNU_SOURCE
+          -DNO_FRAME_POINTER
+  PUBLIC -D_UPT_accessors=_UPT_accessors_wrapped
+         -D_UPT_create=_UPT_create_wrapped
+         -D_UPT_destroy=_UPT_destroy_wrapped
+         -D_Ux86_64_create_addr_space=_Ux86_64_create_addr_space_wrapped
+         -D_Ux86_64_destroy_addr_space=_Ux86_64_destroy_addr_space_wrapped
+         -D_Ux86_64_get_proc_name=_Ux86_64_get_proc_name_wrapped
+         -D_Ux86_64_get_reg=_Ux86_64_get_reg_wrapped
+         -D_Ux86_64_init_remote=_Ux86_64_init_remote_wrapped
+         -D_Ux86_64_step=_Ux86_64_step_wrapped
+         -Dptrace=ptrace_wrapped
+)
+target_link_libraries(unwind_ptrace_wrapped PRIVATE
+  sapi::base
+  sandbox2::ptrace_hook
 )
--- a/sandboxed_api/bazel/external/libunwind.BUILD
+++ b/sandboxed_api/bazel/external/libunwind.BUILD
@ -106,8 +106,8 @@ filegroup(
    srcs = ["src/x86_64/Ginit_remote.c"],
 )

-[cc_library(
-    name = "unwind-ptrace" + ("-wrapped" if do_wrap else ""),
+cc_library(
+    name = "unwind-ptrace-wrapped",
    srcs = [
        "src/mi/Gdyn-remote.c",
        "src/ptrace/_UPT_access_fpreg.c",
@ -138,30 +138,21 @@ filegroup(
        # whether we ourselves do or not.
        "-DNO_FRAME_POINTER",
        "-fno-common",
-        # Ignore warning in src/ptrace/_UPT_get_dyn_info_list_addr.c
-        "-Wno-cpp",
-    ] + (
-        ["-D{symbol}={symbol}_wrapped".format(symbol = symbol) for symbol in [
-            "_UPT_accessors",
-            "_UPT_create",
-            "_UPT_destroy",
-            "_Ux86_64_create_addr_space",
-            "_Ux86_64_destroy_addr_space",
-            "_Ux86_64_get_proc_name",
-            "_Ux86_64_get_reg",
-            "_Ux86_64_init_remote",
-            "_Ux86_64_step",
-            "ptrace",
-        ]] if do_wrap else []
-    ),
+        "-Wno-cpp",  # Warning in src/ptrace/_UPT_get_dyn_info_list_addr.c
+        "-D_UPT_accessors=_UPT_accessors_wrapped",
+        "-D_UPT_create=_UPT_create_wrapped",
+        "-D_UPT_destroy=_UPT_destroy_wrapped",
+        "-D_Ux86_64_create_addr_space=_Ux86_64_create_addr_space_wrapped",
+        "-D_Ux86_64_destroy_addr_space=_Ux86_64_destroy_addr_space_wrapped",
+        "-D_Ux86_64_get_proc_name=_Ux86_64_get_proc_name_wrapped",
+        "-D_Ux86_64_get_reg=_Ux86_64_get_reg_wrapped",
+        "-D_Ux86_64_init_remote=_Ux86_64_init_remote_wrapped",
+        "-D_Ux86_64_step=_Ux86_64_step_wrapped",
+        "-Dptrace=ptrace_wrapped",
+    ],
    visibility = ["//visibility:public"],
-    deps = [":included_sources"] + (
-      ["@com_google_sandboxed_api//sandboxed_api/sandbox2/unwind:ptrace_hook"] if do_wrap else []
-    ),
-    # This forces a link failure in any target that depends on both
-    # unwind-ptrace and unwind-ptrace-wrapped.
-    alwayslink = 1,
-) for do_wrap in [
-    True,
-    False,
-]]
+    deps = [
+        ":included_sources",
+        "@com_google_sandboxed_api//sandboxed_api/sandbox2/unwind:ptrace_hook",
+    ],
+)