Fix issues with Win32 / x86 compilation (#847)

open-telemetry · Jun 15, 2021 · 7fca2c3 · 7fca2c3
1 parent fa2caa8
commit 7fca2c3
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,46 @@ project(opentelemetry-cpp)
 # Mark variables as used so cmake doesn't complain about them
 mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
 
+if(DEFINED ENV{ARCH})
+ # Architecture may be specified via ARCH environment variable
+ set(ARCH $ENV{ARCH})
+else()
+ # Autodetection logic that populates ARCH variable
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+ # Windows may report AMD64 even if target is 32-bit
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(ARCH x64)
+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(ARCH x86)
+ endif()
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
+ # Windows may report x86 even if target is 64-bit
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(ARCH x64)
+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(ARCH x86)
+ endif()
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES
+ "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
+ set(ARCH arm64)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
+ set(ARCH arm)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+ set(ARCH ppc64le)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+ set(ARCH ppc64)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(mips.*|MIPS.*)")
+ set(ARCH mips)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv.*|RISCV.*)")
+ set(ARCH riscv)
+ else()
+ message(
+ FATAL_ERROR
+ "opentelemetry-cpp: unrecognized target processor configuration!")
+ endif()
+endif()
+message(STATUS "Building for architecture ARCH=${ARCH}")
+
 # Autodetect vcpkg toolchain
 if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
  set(CMAKE_TOOLCHAIN_FILE
@@ -144,8 +184,12 @@ find_package(Threads)
 
 function(install_windows_deps)
  # Bootstrap vcpkg from CMake and auto-install deps in case if we are missing
- # deps on Windows
+ # deps on Windows. Respect the target architecture variable.
+ set(VCPKG_TARGET_ARCHITECTURE
+ ${ARCH}
+ PARENT_SCOPE)
  message("Installing build tools and dependencies...")
+ set(ENV{ARCH} ${ARCH})
  execute_process(
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/setup-buildtools.cmd)
  set(CMAKE_TOOLCHAIN_FILE

diff --git a/examples/grpc/CMakeLists.txt b/examples/grpc/CMakeLists.txt
@@ -39,12 +39,7 @@ endif()
 foreach(_target client server)
  add_executable(${_target} "${_target}.cpp")
  target_link_libraries(
- ${_target}
- example_grpc_proto
- protobuf::libprotobuf
- gRPC::grpc++
- gRPC::grpc++_reflection
- opentelemetry_trace
- opentelemetry_exporter_ostream_span)
+ ${_target} example_grpc_proto protobuf::libprotobuf gRPC::grpc++
+ opentelemetry_trace opentelemetry_exporter_ostream_span)
  patch_protobuf_targets(${_target})
 endforeach()
diff --git a/sdk/include/opentelemetry/sdk/common/circular_buffer.h b/sdk/include/opentelemetry/sdk/common/circular_buffer.h
@@ -173,11 +173,12 @@ class CircularBuffer
  auto data = data_.get();
  if (tail_index < head_index)
  {
- return CircularBufferRange<AtomicUniquePtr<T>>{
- nostd::span<AtomicUniquePtr<T>>{data + tail_index, head_index - tail_index}};
+ return CircularBufferRange<AtomicUniquePtr<T>>{nostd::span<AtomicUniquePtr<T>>{
+ data + tail_index, static_cast<std::size_t>(head_index - tail_index)}};
  }
- return {nostd::span<AtomicUniquePtr<T>>{data + tail_index, capacity_ - tail_index},
- nostd::span<AtomicUniquePtr<T>>{data, head_index}};
+ return {nostd::span<AtomicUniquePtr<T>>{data + tail_index,
+ static_cast<std::size_t>(capacity_ - tail_index)},
+ nostd::span<AtomicUniquePtr<T>>{data, static_cast<std::size_t>(head_index)}};
  }
 };
 } // namespace common