compiler-rt: build fix for NetBSD-10.99.12

[0-wiz-0]

In this commit, __lwp_getprivate_fast() was moved to a new arch-specific header file.
This breaks the build of compiler-rt:

FAILED: lib/sanitizer_common/CMakeFiles/RTSanitizerCommonLibc.x86_64.dir/sanitizer_linux_libcdep.cpp.o
/scratch/lang/compiler-rt/work/.cwrapper/bin/c++ -DHAVE_RPC_XDR_H=0 -I/scratch/lang/compiler-rt/work/compiler-rt-18.1.8.src/lib/sanitizer_common/.. -O2 -g -fstack-clash-protection -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/python3.13 -Wall -Wno-unused-parameter -DNDEBUG -std=c++17 -m64 -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fvisibility=hidden -fno-lto -O3 -g -Wno-variadic-macros -nostdinc++ -Wno-format -fno-rtti -Wframe-larger-than=570 -MD -MT lib/sanitizer_common/CMakeFiles/RTSanitizerCommonLibc.x86_64.dir/sanitizer_linux_libcdep.cpp.o -MF lib/sanitizer_common/CMakeFiles/RTSanitizerCommonLibc.x86_64.dir/sanitizer_linux_libcdep.cpp.o.d -o lib/sanitizer_common/CMakeFiles/RTSanitizerCommonLibc.x86_64.dir/sanitizer_linux_libcdep.cpp.o -c /scratch/lang/compiler-rt/work/compiler-rt-18.1.8.src/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
/scratch/lang/compiler-rt/work/compiler-rt-18.1.8.src/lib/sanitizer_common/sanitizer_linux_libcdep.cpp: In function 'tls_tcb* __sanitizer::ThreadSelfTlsTcb()':
/scratch/lang/compiler-rt/work/compiler-rt-18.1.8.src/lib/sanitizer_common/sanitizer_linux_libcdep.cpp:452:27: error: '__lwp_getprivate_fast' was not declared in this scope; did you mean '_lwp_getprivate'?
  452 |   tcb = (struct tls_tcb *)__lwp_getprivate_fast();
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           _lwp_getprivate

The fix is to include the new header machine/lwp_private.h. A tentative patch that fixes the build looks like this:

--- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig       2024-06-15 17:21:32.000000000 +0000
+++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -29,7 +29,13 @@
 #  include "sanitizer_solaris.h"

 #  if SANITIZER_NETBSD
-#    define _RTLD_SOURCE  // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+#    // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+#    include <sys/param.h>
+#    if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 1099001200)
+#      include <machine/lwp_private.h>
+#    else
+#      define _RTLD_SOURCE
+#    endif
 #  endif

 #  include <dlfcn.h>  // for dlsym()

but I don't know the llvm codebase well enough, so I'd appreciate feedback.

[0-wiz-0]

Since I reported this, the patch has changed to:

--- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig       2024-06-15 17:21:32.000000000 +0000
+++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -29,7 +29,14 @@
 #  include "sanitizer_solaris.h"

 #  if SANITIZER_NETBSD
-#    define _RTLD_SOURCE  // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+#    // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+#    define _RTLD_SOURCE
+#    include <machine/mcontext.h>
+#    undef _RTLD_SOURCE
+#    include <sys/param.h>
+#    if __NetBSD_Version__ >= 1099001200
+#      include <machine/lwp_private.h>
+#    endif
 #  endif

 #  include <dlfcn.h>  // for dlsym()

because pulling in sys/param.h already included machine/mcontext.h somehow, IIRC, and without RTLD_SOURCE being defined, it broke. Can you please update it?

[brad0]

#134742

[brad0]

@0-wiz-0 While build testing this on 10 and -current I noticed the build passes the respective file with the newer patch applied. But the linking fails later on on both 10 and -current in the same manner.

10

/usr/bin/ld: /usr/bin/ld: DWARF error: invalid or unhandled FORM value: 0x25
compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.i386.dir/sanitizer_libignore.cpp.o: in function `__sanitizer::LibIgnore::AddIgnoredLibrary(char const*)':
sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x31): undefined reference to `__atomic_load_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x98): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0xf1): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x138): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x15a): undefined reference to `__atomic_load_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x1cf): undefined reference to `__atomic_load_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x222): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: sanitizer_libignore.cpp:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x28e): undefined reference to `__atomic_compare_exchange_8'

-current

/usr/bin/ld: compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.i386.dir/sanitizer_libignore.cpp.o: in function `__sanitizer::LibIgnore::AddIgnoredLibrary(char const*)':
/home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:43:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x31): undefined reference to `__atomic_load_8'
/usr/bin/ld: /home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:84:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x98): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.i386.dir/sanitizer_libignore.cpp.o: in function `Lock':
/home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:84:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0xf1): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: /home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:84:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x138): undefined reference to `__atomic_compare_exchange_8'
/usr/bin/ld: compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.i386.dir/sanitizer_libignore.cpp.o: in function `__sanitizer::LibIgnore::AddIgnoredLibrary(char const*)':
/home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:43:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x15a): undefined reference to `__atomic_load_8'
/usr/bin/ld: /home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:43:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x1cf): undefined reference to `__atomic_load_8'
/usr/bin/ld: /home/brad/tmp/llvm-brad/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h:84:(.text._ZN11__sanitizer9LibIgnore17AddIgnoredLibraryEPKc+0x222): undefined reference to `__atomic_compare_exchange_8'

Building with..

env CC="gcc" CXX="g++" CFLAGS="-pipe" CXXFLAGS="-pipe" cmake -G Ninja -DCLANG_DEFAULT_CXX_STDLIB:STRING='libstdc++' -DLLVM_ENABLE_PROJECTS='clang' -DLLVM_ENABLE_RUNTIMES='compiler-rt' -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2' -DCMAKE_C_FLAGS_RELEASE='-O2' -DLLVM_ENABLE_ASSERTIONS:BOOL=ON -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON -DLLVM_LINK_LLVM_DYLIB:BOOL=ON -DLLVM_BUILD_TESTS:BOOL=ON ../llvm-project/llvm

[0-wiz-0]

I'm not the right person to answer this, but:
NetBSD 10 provides binutils 2.34 (with local patches), perhaps that is too old to support this DWARF feature.
NetBSD current has 2.42.

On what platform is this? In pkgsrc, e.g. the llvm package (but not the compiler-rt one, as of 18.1.8) includes mk/atomic64.mk, which pulls in devel/libatomic for some platforms, and sets -march=i586 on the i386 port. But I guess you're testing on x86_64 or aarch64, where this doesn't happen.

A comment in pkgsrc/mk/atomic64.mk says:

# Non-NetBSD vendors tend to include libatomic as part of gcc.

which makes me think that NetBSD's gcc might not do that.

Does any of this help? If not, please ask on the tech-toolchain mailing list.

[brad0]

On what platform is this? In pkgsrc, e.g. the llvm package (but not the compiler-rt one, as of 18.1.8) includes mk/atomic64.mk, which pulls in devel/libatomic for some platforms, and sets -march=i586 on the i386 port. But I guess you're testing on x86_64 or aarch64, where this doesn't happen.

A comment in pkgsrc/mk/atomic64.mk says:

# Non-NetBSD vendors tend to include libatomic as part of gcc.

which makes me think that NetBSD's gcc might not do that.

Does any of this help? If not, please ask on the tech-toolchain mailing list.

This is on x86_64.