Use same path as other binaries

Try to fix cross-compile build
Set linker language in debug build
2024-10-09 21:04:45 -07:00 · 2024-10-09 20:19:53 -07:00 · 2024-10-09 18:07:22 -07:00 · 2024-10-09 17:49:55 -07:00 · 2024-10-04 16:05:35 -07:00 · 2024-10-04 16:01:55 -07:00
6 changed files with 23 additions and 23 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,12 +95,23 @@ target_compile_options(${PROJECT_NAME}-object PRIVATE -fno-exceptions
                                                      -fvisibility=hidden)
 target_include_directories(${PROJECT_NAME}-object
                           PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+if(NOT LD_EXE)
+  set(LD_EXE ld)
+endif()
+add_custom_command(
+  OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o
+  COMMAND ${LD_EXE} -r $<TARGET_OBJECTS:${PROJECT_NAME}-object> -o
+          ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o
+  DEPENDS $<TARGET_OBJECTS:${PROJECT_NAME}-object>
+  COMMAND_EXPAND_LISTS)

-add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:${PROJECT_NAME}-object>)
+add_library(${PROJECT_NAME} SHARED ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o)
 set_target_properties(
  ${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY
                             "${CMAKE_CURRENT_BINARY_DIR}/radix_tree")
-if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+  set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+else()
  set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C)
 endif()

@@ -110,19 +121,13 @@ if(HAS_VERSION_SCRIPT)
    LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.map)
 endif()

-add_library(${PROJECT_NAME}-static STATIC
-            $<TARGET_OBJECTS:${PROJECT_NAME}-object>)
-if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+add_library(${PROJECT_NAME}-static STATIC ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.o)
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+  set_target_properties(${PROJECT_NAME}-static PROPERTIES LINKER_LANGUAGE CXX)
+else()
  set_target_properties(${PROJECT_NAME}-static PROPERTIES LINKER_LANGUAGE C)
 endif()
-
-if(APPLE)
-  add_custom_command(
-    TARGET ${PROJECT_NAME}-static
-    PRE_LINK
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/privatize_symbols_macos.sh
-            $<TARGET_OBJECTS:${PROJECT_NAME}-object>)
-else()
+if(NOT APPLE)
  add_custom_command(
    TARGET ${PROJECT_NAME}-static
    POST_BUILD
--- a/1
+++ b/1
@@ -8,6 +8,7 @@ RUN chmod -R 777 /tmp
 RUN apt-get update
 RUN apt-get upgrade -y
 RUN TZ=America/Los_Angeles DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    binutils-aarch64-linux-gnu \
    build-essential \
    ccache \
    clang \
--- a/aarch64-toolchain.cmake
+++ b/aarch64-toolchain.cmake
@@ -5,3 +5,4 @@ set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
 set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu)
 set(CMAKE_CROSSCOMPILING_EMULATOR "qemu-aarch64;-L;/usr/aarch64-linux-gnu/")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
+set(LD_EXE "/usr/bin/aarch64-linux-gnu-ld")
--- a/privatize_symbols_macos.sh
+++ b/privatize_symbols_macos.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This has the effect of making visibility=hidden symbols private in object files
-for obj in "$@" ; do
-  ld -r "$obj" -o "$obj.tmp"
-  touch -r "$obj" "$obj.tmp"
-  mv "$obj.tmp" "$obj"
-done
--- a/symbol-exports.txt
+++ b/symbol-exports.txt
@@ -16,4 +16,5 @@ _ZN8weaselab11ConflictSetaSEOS0_
 _ZNK8weaselab11ConflictSet12getMetricsV1EPPNS0_9MetricsV1EPi
 _ZNK8weaselab11ConflictSet5checkEPKNS0_9ReadRangeEPNS0_6ResultEi
 _ZNK8weaselab11ConflictSet8getBytesEv
-_ZNK8weaselab11ConflictSet9MetricsV18getValueEv
+_ZNK8weaselab11ConflictSet9MetricsV18getValueEv
+___asan_globals_registered
--- a/test_symbols.sh
+++ b/test_symbols.sh
@@ -4,7 +4,7 @@ set -euo pipefail

 # ./test_symbols.sh <library> <expected exported symbols file> <allowed imported symbols file>

-diff -u <(sort < "$2") <(nm "$1" | grep " T " | cut -f3 -d " " | sort)
+diff -u <(sort < "$2" | grep -v ___asan_globals_registered) <(nm "$1" | grep " T " | cut -f3 -d " " | sort)
 ec=0
 for symbol in $(nm "$1" | grep " U " | sed 's/ U //') ; do
    if ! grep --fixed-strings "$symbol" "$3" > /dev/null ; then
Author	SHA1	Message	Date
Andrew Noyes	c3190c11ac	Use same path as other binaries All checks were successful Tests / Clang total: 3339, passed: 3339 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / 64 bit versions total: 3339, passed: 3339 Details Tests / Debug total: 3337, passed: 3337 Details Tests / SIMD fallback total: 3339, passed: 3339 Details Tests / Release [gcc] total: 3339, passed: 3339 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Release [gcc,aarch64] total: 2482, passed: 2482 Details Tests / Coverage total: 2511, passed: 2511 Details Code Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 99.09% (1846/1863) * Branch Coverage: 67.65% (1447/2139) * Complexity Density: 0.00 * Lines of Code: 1863 #### Quality Gates Summary Output truncated. Details weaselab/conflict-set/pipeline/head This commit looks good Details	2024-10-09 21:04:45 -07:00
Andrew Noyes	52b4bf5a0e	Try to fix cross-compile build All checks were successful Tests / Clang total: 3339, passed: 3339 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / 64 bit versions total: 3339, passed: 3339 Details Tests / Debug total: 3337, passed: 3337 Details Tests / SIMD fallback total: 3339, passed: 3339 Details Tests / Release [gcc] total: 3339, passed: 3339 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Release [gcc,aarch64] total: 2482, passed: 2482 Details Tests / Coverage total: 2511, passed: 2511 Details Code Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 99.09% (1846/1863) * Branch Coverage: 67.65% (1447/2139) * Complexity Density: 0.00 * Lines of Code: 1863 #### Quality Gates Summary Output truncated. Details weaselab/conflict-set/pipeline/head This commit looks good Details	2024-10-09 20:19:53 -07:00
Andrew Noyes	5516477956	Set linker language in debug build Some checks failed Tests / Clang total: 3339, passed: 3339 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / 64 bit versions total: 3339, passed: 3339 Details Tests / Debug total: 3337, passed: 3337 Details Tests / SIMD fallback total: 3339, passed: 3339 Details Tests / Release [gcc] total: 3339, passed: 3339 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details weaselab/conflict-set/pipeline/head There was a failure building this commit Details	2024-10-09 18:07:22 -07:00
Andrew Noyes	f639db18a5	Allow conflict-set to have multiple object files Some checks failed Tests / Clang total: 3339, passed: 3339 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / 64 bit versions total: 3339, passed: 3339 Details weaselab/conflict-set/pipeline/head There was a failure building this commit Details	2024-10-09 17:49:55 -07:00
Andrew Noyes	f8a1643714	Make exporting ___asan_globals_registered optional All checks were successful Tests / Clang total: 3339, passed: 3339 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / 64 bit versions total: 3339, passed: 3339 Details Tests / Debug total: 3337, passed: 3337 Details Tests / SIMD fallback total: 3339, passed: 3339 Details Tests / Release [gcc] total: 3339, passed: 3339 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Release [gcc,aarch64] total: 2482, passed: 2482 Details Tests / Coverage total: 2511, passed: 2511 Details Code Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 99.09% (1846/1863) * Branch Coverage: 67.65% (1447/2139) * Complexity Density: 0.00 * Lines of Code: 1863 #### Quality Gates Summary Output truncated. Details weaselab/conflict-set/pipeline/head This commit looks good Details	2024-10-04 16:05:35 -07:00
Andrew Noyes	a0a961ae58	Allow ___asan_globals_registered to be exported Some checks failed Tests / Clang total: 3339, failed: 2, passed: 3337 Details Tests / 64 bit versions total: 3339, failed: 2, passed: 3337 Details Tests / Debug total: 3337, passed: 3337 Details Tests / SIMD fallback total: 3339, failed: 2, passed: 3337 Details Tests / Release [gcc] total: 3339, failed: 2, passed: 3337 Details Tests / Release [gcc,aarch64] total: 2482, failed: 2, passed: 2480 Details Tests / Coverage total: 2511, passed: 2511 Details weaselab/conflict-set/pipeline/head There was a failure building this commit Details For if someone wants to build the static library with asan	2024-10-04 16:01:55 -07:00