The Aarch64 VDSO doesn't actually define gettimeofday or `clock_get…

…time` so don't try to version them LLD barfs if we try to version a symbol that isn't defined.
rr-debugger · Oct 7, 2024 · 972ef90 · 972ef90
1 parent bfe5018
commit 972ef90
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386|i686|x86|x86_64)
   set(FLAGS_COMMON "${FLAGS_COMMON} -msse2 -D__MMX__ -D__SSE__ -D__SSE2__")
   set(PRELOAD_LIBRARY_PAGE_SIZE 4096)
   set(VDSO_NAME "LINUX_2.6")
-  set(VDSO_SYMBOLS "__vdso_gettimeofday; __vdso_clock_getres; __vdso_time; __vdso_clock_gettime; __vdso_getcpu;")
+  set(VDSO_SYMBOLS "gettimeofday; clock_gettime; __vdso_gettimeofday; __vdso_clock_getres; __vdso_time; __vdso_clock_gettime; __vdso_getcpu;")
 else()
   message(FATAL_ERROR "The architecture " ${CMAKE_SYSTEM_PROCESSOR} " is not yet supported")
 endif()

diff --git a/src/preload/rr_page.ld.in b/src/preload/rr_page.ld.in
@@ -44,8 +44,6 @@ SECTIONS
 VERSION {
   @VDSO_NAME@ {
     global:
-      gettimeofday;
-      clock_gettime;
       @VDSO_SYMBOLS@
   };
 }