Hello community, here is the log from the commit of package bpftrace for openSUSE:Factory checked in at 2020-11-02 09:42:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bpftrace (Old) and /work/SRC/openSUSE:Factory/.bpftrace.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bpftrace" Mon Nov 2 09:42:21 2020 rev:6 rq:845156 version:0.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bpftrace/bpftrace.changes 2020-07-16 12:20:46.191105319 +0200 +++ /work/SRC/openSUSE:Factory/.bpftrace.new.3463/bpftrace.changes 2020-11-02 09:42:48.749749202 +0100 @@ -1,0 +2,6 @@ +Sat Oct 31 06:05:03 UTC 2020 - Aleksa Sarai <asa...@suse.com> + +- Update to bpftrace 0.11.2. + * Support for LLVM 11. + +------------------------------------------------------------------- Old: ---- bpftrace-0.11.0.tar.gz New: ---- bpftrace-0.11.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bpftrace.spec ++++++ --- /var/tmp/diff_new_pack.6Pv5Ki/_old 2020-11-02 09:42:49.409749835 +0100 +++ /var/tmp/diff_new_pack.6Pv5Ki/_new 2020-11-02 09:42:49.413749839 +0100 @@ -17,7 +17,7 @@ Name: bpftrace -Version: 0.11.0 +Version: 0.11.2 Release: 0 Summary: High-level tracing language for Linux eBPF License: Apache-2.0 ++++++ bpftrace-0.11.0.tar.gz -> bpftrace-0.11.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/.github/workflows/ci.yml new/bpftrace-0.11.2/.github/workflows/ci.yml --- old/bpftrace-0.11.0/.github/workflows/ci.yml 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/.github/workflows/ci.yml 2020-10-30 15:15:28.000000000 +0100 @@ -95,6 +95,18 @@ RUN_ALL_TESTS: 1 RUNTIME_TEST_DISABLE: builtin.cgroup,probe.kprobe_offset_fail_size BASE: bionic + - NAME: LLVM 11 Debug + TYPE: Debug + LLVM_VERSION: 11 + RUN_ALL_TESTS: 1 + RUNTIME_TEST_DISABLE: builtin.cgroup,probe.kprobe_offset_fail_size + BASE: bionic + - NAME: LLVM 11 Release + TYPE: Release + LLVM_VERSION: 11 + RUN_ALL_TESTS: 1 + RUNTIME_TEST_DISABLE: builtin.cgroup,probe.kprobe_offset_fail_size + BASE: bionic steps: - uses: actions/checkout@v2 - name: Build docker container diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/.github/workflows/embedded.yml new/bpftrace-0.11.2/.github/workflows/embedded.yml --- old/bpftrace-0.11.0/.github/workflows/embedded.yml 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/.github/workflows/embedded.yml 2020-10-30 15:15:28.000000000 +0100 @@ -121,21 +121,79 @@ steps: - uses: actions/checkout@v2 - name: Build docker container - run: | - docker build -t bpftrace-embedded-${{ matrix.env['BASE'] }} -f docker/Dockerfile.${{ matrix.env['DISTRO'] }} --build-arg bcc_ref=${{ matrix.env['BCC_REF'] }} --build-arg BASE=${{ matrix.env['BASE'] }} --build-arg ALPINE_VERSION=${{ matrix.env['ALPINE_VERSION'] }} docker/ + run: > + docker build + -t bpftrace-embedded-${{ matrix.env['BASE'] }} + -f docker/Dockerfile.${{ matrix.env['DISTRO'] }} + --build-arg bcc_ref=${{ matrix.env['BCC_REF'] }} + --build-arg BASE=${{ matrix.env['BASE'] }} + --build-arg ALPINE_VERSION=${{ matrix.env['ALPINE_VERSION'] }} + docker/ - name: bpftrace embedded build env: ${{ matrix.env }} - run: | - docker run --privileged -v $(pwd):$(pwd) -w $(pwd) -v /sys/kernel/debug:/sys/kernel/debug:rw -v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro -e STATIC_LINKING=${STATIC_LINKING} -e STATIC_LIBC=${STATIC_LIBC} -e EMBED_LLVM=${EMBED_LLVM} -e EMBED_CLANG=${EMBED_CLANG} -e EMBED_BCC=${EMBED_BCC} -e EMBED_LIBELF=${EMBED_LIBELF} -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} -e EMBED_BINUTILS=${EMBED_BINUTILS} -e RUN_ALL_TESTS=${RUN_ALL_TESTS} -e CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" -e TEST_GROUPS_DISABLE="${TEST_GROUPS_DISABLE}" -e RUNTIME_TEST_DISABLE="${RUNTIME_TEST_DISABLE}" bpftrace-embedded-${{ matrix.env['BASE'] }} $(pwd)/build-embedded ${TYPE} -j`nproc` + run: > + docker run --privileged + -v $(pwd):$(pwd) + -w $(pwd) + -v /sys/kernel/debug:/sys/kernel/debug:rw + -v /lib/modules:/lib/modules:ro + -v /usr/src:/usr/src:ro + -e STATIC_LINKING=${STATIC_LINKING} + -e STATIC_LIBC=${STATIC_LIBC} + -e EMBED_LLVM=${EMBED_LLVM} + -e EMBED_CLANG=${EMBED_CLANG} + -e EMBED_BCC=${EMBED_BCC} + -e EMBED_LIBELF=${EMBED_LIBELF} + -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} + -e EMBED_BINUTILS=${EMBED_BINUTILS} + -e RUN_ALL_TESTS=${RUN_ALL_TESTS} + -e CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" + -e TEST_GROUPS_DISABLE="${TEST_GROUPS_DISABLE}" + -e RUNTIME_TEST_DISABLE="${RUNTIME_TEST_DISABLE}" + bpftrace-embedded-${{ matrix.env['BASE'] }} + $(pwd)/build-embedded ${TYPE} + -j`nproc` - name: Check linked libs env: ${{ matrix.env }} - run: | - docker run --privileged -v $(pwd):$(pwd) -w $(pwd) -v /sys/kernel/debug:/sys/kernel/debug:rw -v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro -e STATIC_LINKING=${STATIC_LINKING} -e STATIC_LIBC=${STATIC_LIBC} -e EMBED_LLVM=${EMBED_LLVM} -e EMBED_CLANG=${EMBED_CLANG} -e EMBED_BCC=${EMBED_BCC} -e EMBED_LIBELF=${EMBED_LIBELF} -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} -e EMBED_BINUTILS=${EMBED_BINUTILS} --entrypoint /bin/bash bpftrace-embedded-${{ matrix.env['BASE'] }} -c "[[ -f $(pwd)/build-embedded/src/bpftrace ]] && ! readelf --dynamic $(pwd)/build-embedded/src/bpftrace | grep NEEDED | grep -v 'libm\|libc\|ld-linux\|libpthread\|libdl'" + run: > + docker run --privileged + -v $(pwd):$(pwd) + -w $(pwd) + -v /sys/kernel/debug:/sys/kernel/debug:rw + -v /lib/modules:/lib/modules:ro + -v /usr/src:/usr/src:ro + -e STATIC_LINKING=${STATIC_LINKING} + -e STATIC_LIBC=${STATIC_LIBC} + -e EMBED_LLVM=${EMBED_LLVM} + -e EMBED_CLANG=${EMBED_CLANG} + -e EMBED_BCC=${EMBED_BCC} + -e EMBED_LIBELF=${EMBED_LIBELF} + -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} + -e EMBED_BINUTILS=${EMBED_BINUTILS} + --entrypoint /bin/bash + bpftrace-embedded-${{ matrix.env['BASE'] }} + -c "[[ -f $(pwd)/build-embedded/src/bpftrace ]] && ! readelf --dynamic $(pwd)/build-embedded/src/bpftrace | grep NEEDED | grep -v 'libm\|libc\|ld-linux\|libpthread\|libdl'" - name: Strip artifacts env: ${{ matrix.env }} if: matrix.env['TYPE'] == 'Release' - run: | - docker run --privileged -v $(pwd):$(pwd) -w $(pwd) -v /sys/kernel/debug:/sys/kernel/debug:rw -v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro -e STATIC_LINKING=${STATIC_LINKING} -e STATIC_LIBC=${STATIC_LIBC} -e EMBED_LLVM=${EMBED_LLVM} -e EMBED_CLANG=${EMBED_CLANG} -e EMBED_BCC=${EMBED_BCC} -e EMBED_LIBELF=${EMBED_LIBELF} -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} -e EMBED_BINUTILS=${EMBED_BINUTILS} --entrypoint /bin/bash bpftrace-embedded-${{ matrix.env['BASE'] }} -c "strip --keep-symbol BEGIN_trigger $(pwd)/build-embedded/src/bpftrace" + run: > + docker run --privileged + -v $(pwd):$(pwd) + -w $(pwd) + -v /sys/kernel/debug:/sys/kernel/debug:rw + -v /lib/modules:/lib/modules:ro + -v /usr/src:/usr/src:ro + -e STATIC_LINKING=${STATIC_LINKING} + -e STATIC_LIBC=${STATIC_LIBC} + -e EMBED_LLVM=${EMBED_LLVM} + -e EMBED_CLANG=${EMBED_CLANG} + -e EMBED_BCC=${EMBED_BCC} + -e EMBED_LIBELF=${EMBED_LIBELF} + -e EMBED_LIBCLANG_ONLY=${EMBED_LIBCLANG_ONLY} + -e EMBED_BINUTILS=${EMBED_BINUTILS} + --entrypoint /bin/bash + bpftrace-embedded-${{ matrix.env['BASE'] }} + -c "strip --keep-symbol BEGIN_trigger --keep-symbol END_trigger $(pwd)/build-embedded/src/bpftrace" - uses: actions/upload-artifact@v1 with: @@ -147,11 +205,23 @@ path: build-embedded/tests/bpftrace_test - name: Authenticate with docker registry - if: matrix.env['TYPE'] == 'Release' && github.ref == 'refs/heads/master' && github.repository == 'iovisor/bpftrace' + if: > + matrix.env['TYPE'] == 'Release' && + (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && + github.repository == 'iovisor/bpftrace' env: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} run: ./docker/scripts/auth.sh ${{ github.repository }} - name: Package docker image and push to quay.io - if: matrix.env['TYPE'] == 'Release' && github.ref == 'refs/heads/master' && github.repository == 'iovisor/bpftrace' - run: ./docker/scripts/push.sh ${{ github.repository }} ${{ github.ref }} ${{ github.sha }} ${{ matrix.env['NAME'] }} ${{ matrix.env['EDGE'] }} + if: > + matrix.env['TYPE'] == 'Release' && + (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && + github.repository == 'iovisor/bpftrace' + run: > + ./docker/scripts/push.sh + ${{ github.repository }} + ${{ github.ref }} + ${{ github.sha }} + ${{ matrix.env['NAME'] }} + ${{ matrix.env['EDGE'] }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/CHANGELOG.md new/bpftrace-0.11.2/CHANGELOG.md --- old/bpftrace-0.11.0/CHANGELOG.md 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/CHANGELOG.md 2020-10-30 15:15:28.000000000 +0100 @@ -6,6 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.11.2] 2020-10-30 + +LLVM 11 support release + +### Added + +Add LLVM11 build support +- [#1578](https://github.com/iovisor/bpftrace/pull/1578) + +## [0.11.1] 2020-09-22 + +Bug fix release for the [Docker build](https://quay.io/repository/iovisor/bpftrace) + +### Fixed + +- Don't strip END_trigger + - [#1513](https://github.com/iovisor/bpftrace/pull/1513) + + ## [0.11.0] 2020-07-15 ### All Changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/CMakeLists.txt new/bpftrace-0.11.2/CMakeLists.txt --- old/bpftrace-0.11.0/CMakeLists.txt 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/CMakeLists.txt 2020-10-30 15:15:28.000000000 +0100 @@ -4,7 +4,7 @@ # bpftrace version number components. set(bpftrace_VERSION_MAJOR 0) set(bpftrace_VERSION_MINOR 11) -set(bpftrace_VERSION_PATCH 0) +set(bpftrace_VERSION_PATCH 2) include(GNUInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/src/ast/irbuilderbpf.cpp new/bpftrace-0.11.2/src/ast/irbuilderbpf.cpp --- old/bpftrace-0.11.0/src/ast/irbuilderbpf.cpp 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/src/ast/irbuilderbpf.cpp 2020-10-30 15:15:28.000000000 +0100 @@ -201,10 +201,25 @@ return ty; } +CallInst *IRBuilderBPF::createCall(Value *callee, + ArrayRef<Value *> args, + const Twine &Name) +{ +#if LLVM_VERSION_MAJOR >= 11 + auto *calleePtrType = cast<PointerType>(callee->getType()); + auto *calleeType = cast<FunctionType>(calleePtrType->getElementType()); + return CreateCall(calleeType, callee, args, Name); +#else + return CreateCall(callee, args, Name); +#endif +} + CallInst *IRBuilderBPF::CreateBpfPseudoCall(int mapfd) { Function *pseudo_func = module_.getFunction("llvm.bpf.pseudo"); - return CreateCall(pseudo_func, {getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapfd)}, "pseudo"); + return createCall(pseudo_func, + { getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapfd) }, + "pseudo"); } CallInst *IRBuilderBPF::CreateBpfPseudoCall(Map &map) @@ -227,7 +242,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_map_lookup_elem), lookup_func_ptr_type); - return CreateCall(lookup_func, { map_ptr, key }, "lookup_elem"); + return createCall(lookup_func, { map_ptr, key }, "lookup_elem"); } CallInst *IRBuilderBPF::CreateGetJoinMap(Value *ctx, const location &loc) @@ -325,7 +340,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_map_update_elem), update_func_ptr_type); - CallInst *call = CreateCall(update_func, + CallInst *call = createCall(update_func, { map_ptr, key, val, flags }, "update_elem"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_update_elem, loc); @@ -349,7 +364,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_map_delete_elem), delete_func_ptr_type); - CallInst *call = CreateCall(delete_func, { map_ptr, key }, "delete_elem"); + CallInst *call = createCall(delete_func, { map_ptr, key }, "delete_elem"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_delete_elem, loc); } @@ -378,7 +393,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_probe_read), proberead_func_ptr_type); - CallInst *call = CreateCall(proberead_func, { dst, size, src }, "probe_read"); + CallInst *call = createCall(proberead_func, { dst, size, src }, "probe_read"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_probe_read, loc); } @@ -413,7 +428,7 @@ { assert(ctx && ctx->getType() == getInt8PtrTy()); Constant *fn = createProbeReadStrFn(dst->getType(), src->getType()); - CallInst *call = CreateCall(fn, + CallInst *call = createCall(fn, { dst, getInt32(size), src }, "probe_read_str"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_probe_read_str, loc); @@ -434,7 +449,7 @@ auto *size_i32 = CreateIntCast(size, getInt32Ty(), false); Constant *fn = createProbeReadStrFn(dst->getType(), src->getType()); - CallInst *call = CreateCall(fn, { dst, size_i32, src }, "probe_read_str"); + CallInst *call = createCall(fn, { dst, size_i32, src }, "probe_read_str"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_probe_read_str, loc); return call; } @@ -717,7 +732,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_ktime_get_ns), gettime_func_ptr_type); - return CreateCall(gettime_func, {}, "get_ns"); + return createCall(gettime_func, {}, "get_ns"); } CallInst *IRBuilderBPF::CreateGetPidTgid() @@ -730,7 +745,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_current_pid_tgid), getpidtgid_func_ptr_type); - return CreateCall(getpidtgid_func, {}, "get_pid_tgid"); + return createCall(getpidtgid_func, {}, "get_pid_tgid"); } CallInst *IRBuilderBPF::CreateGetCurrentCgroupId() @@ -744,7 +759,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_current_cgroup_id), getcgroupid_func_ptr_type); - return CreateCall(getcgroupid_func, {}, "get_cgroup_id"); + return createCall(getcgroupid_func, {}, "get_cgroup_id"); } CallInst *IRBuilderBPF::CreateGetUidGid() @@ -757,7 +772,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_current_uid_gid), getuidgid_func_ptr_type); - return CreateCall(getuidgid_func, {}, "get_uid_gid"); + return createCall(getuidgid_func, {}, "get_uid_gid"); } CallInst *IRBuilderBPF::CreateGetCpuId() @@ -770,7 +785,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_smp_processor_id), getcpuid_func_ptr_type); - return CreateCall(getcpuid_func, {}, "get_cpu_id"); + return createCall(getcpuid_func, {}, "get_cpu_id"); } CallInst *IRBuilderBPF::CreateGetCurrentTask() @@ -783,7 +798,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_current_task), getcurtask_func_ptr_type); - return CreateCall(getcurtask_func, {}, "get_cur_task"); + return createCall(getcurtask_func, {}, "get_cur_task"); } CallInst *IRBuilderBPF::CreateGetRandom() @@ -796,7 +811,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_prandom_u32), getrandom_func_ptr_type); - return CreateCall(getrandom_func, {}, "get_random"); + return createCall(getrandom_func, {}, "get_random"); } CallInst *IRBuilderBPF::CreateGetStackId(Value *ctx, @@ -826,7 +841,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_stackid), getstackid_func_ptr_type); - CallInst *call = CreateCall(getstackid_func, + CallInst *call = createCall(getstackid_func, { ctx, map_ptr, flags_val }, "get_stackid"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_get_stackid, loc); @@ -852,7 +867,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_get_current_comm), getcomm_func_ptr_type); - CallInst *call = CreateCall(getcomm_func, + CallInst *call = createCall(getcomm_func, { buf, getInt64(size) }, "get_comm"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_get_current_comm, loc); @@ -883,7 +898,9 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_perf_event_output), perfoutput_func_ptr_type); - CreateCall(perfoutput_func, {ctx, map_ptr, flags_val, data, size_val}, "perf_event_output"); + createCall(perfoutput_func, + { ctx, map_ptr, flags_val, data, size_val }, + "perf_event_output"); } void IRBuilderBPF::CreateSignal(Value *ctx, Value *sig, const location &loc) @@ -899,7 +916,7 @@ Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_send_signal), signal_func_ptr_type); - CallInst *call = CreateCall(signal_func, { sig }, "signal"); + CallInst *call = createCall(signal_func, { sig }, "signal"); CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_send_signal, loc); } @@ -913,7 +930,7 @@ Constant *override_func = ConstantExpr::getCast(Instruction::IntToPtr, getInt64(libbpf::BPF_FUNC_override_return), override_func_ptr_type); - CreateCall(override_func, { ctx, rc }, "override"); + createCall(override_func, { ctx, rc }, "override"); } Value *IRBuilderBPF::CreatKFuncArg(Value *ctx, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/src/ast/irbuilderbpf.h new/bpftrace-0.11.2/src/ast/irbuilderbpf.h --- old/bpftrace-0.11.0/src/ast/irbuilderbpf.h 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/src/ast/irbuilderbpf.h 2020-10-30 15:15:28.000000000 +0100 @@ -80,6 +80,7 @@ CallInst *CreateGetRandom(); CallInst *CreateGetStackId(Value *ctx, bool ustack, StackType stack_type, const location& loc); CallInst *CreateGetJoinMap(Value *ctx, const location& loc); + CallInst *createCall(Value *callee, ArrayRef<Value *> args, const Twine &Name); void CreateGetCurrentComm(Value *ctx, AllocaInst *buf, size_t size, const location& loc); void CreatePerfEventOutput(Value *ctx, Value *data, size_t size); void CreateSignal(Value *ctx, Value *sig, const location &loc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/src/bpforc.h new/bpftrace-0.11.2/src/bpforc.h --- old/bpftrace-0.11.0/src/bpforc.h 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/src/bpforc.h 2020-10-30 15:15:28.000000000 +0100 @@ -96,9 +96,15 @@ : TM(TM_), Resolver(createLegacyLookupResolver( ES, +#if LLVM_VERSION_MAJOR >= 11 + [](llvm::StringRef Name __attribute__((unused))) -> JITSymbol { + return nullptr; + }, +#else [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; }, +#endif [](Error Err) { cantFail(std::move(Err), "lookup failed"); })), #if LLVM_VERSION_MAJOR > 8 ObjectLayer(AcknowledgeORCv1Deprecation, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bpftrace-0.11.0/tests/CMakeLists.txt new/bpftrace-0.11.2/tests/CMakeLists.txt --- old/bpftrace-0.11.0/tests/CMakeLists.txt 2020-07-15 19:36:10.000000000 +0200 +++ new/bpftrace-0.11.2/tests/CMakeLists.txt 2020-10-30 15:15:28.000000000 +0100 @@ -16,6 +16,13 @@ -P ${CMAKE_SOURCE_DIR}/tests/codegen/generate_codegen_includes.cmake DEPENDS ${CODEGEN_SOURCES}) +if(${LLVM_VERSION} VERSION_LESS 11.0.0) + set(CODEGEN_SRC ${CMAKE_BINARY_DIR}/tests/codegen_includes.cpp) +else() + set(CODEGEN_SRC "") + message("Disabled codegen test for LLVM >= 11") +endif() + add_executable(bpftrace_test ast.cpp bpftrace.cpp @@ -30,7 +37,7 @@ tracepoint_format_parser.cpp utils.cpp - ${CMAKE_BINARY_DIR}/tests/codegen_includes.cpp + ${CODEGEN_SRC} ${CMAKE_SOURCE_DIR}/src/attached_probe.cpp ${CMAKE_SOURCE_DIR}/src/bpftrace.cpp