diff --git a/.bpftrace.metadata b/.bpftrace.metadata
index 2b446c6..97a8f2e 100644
--- a/.bpftrace.metadata
+++ b/.bpftrace.metadata
@@ -1 +1 @@
-f35927be0719e7537e10cab1f4bee28705270ff8 SOURCES/bpftrace-0.9.2.tar.gz
+1b1d4e5058e07f82904971e65733791b25ef5263 SOURCES/bpftrace-0.10.0.tar.gz
diff --git a/.gitignore b/.gitignore
index 1edb7c1..03fef87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/bpftrace-0.9.2.tar.gz
+SOURCES/bpftrace-0.10.0.tar.gz
diff --git a/SOURCES/bpftrace-0.10.0-Add-s390x-register-support.patch b/SOURCES/bpftrace-0.10.0-Add-s390x-register-support.patch
new file mode 100644
index 0000000..8b162b4
--- /dev/null
+++ b/SOURCES/bpftrace-0.10.0-Add-s390x-register-support.patch
@@ -0,0 +1,126 @@
+From 3516f05627b33cb2e6e74965650c6d6c043f78f9 Mon Sep 17 00:00:00 2001
+From: Sumanth Korikkar <sumanthk@linux.ibm.com>
+Date: Mon, 6 Apr 2020 09:23:34 +0200
+Subject: [PATCH] bpftrace: Add s390x register support
+
+Add s390x specific registers. This is needed for bpftrace builtins like argX,
+regs(), retval etc. This commit provides various functions to perform proper
+offset calculation from the pt_regs context. The builtin functions of
+bpftrace uses these offset functions to generate the proper bytecode for s390x
+
+Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
+Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
+---
+ src/arch/CMakeLists.txt | 3 ++
+ src/arch/s390.cpp | 85 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 88 insertions(+)
+ create mode 100644 src/arch/s390.cpp
+
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index 7156276..51707cb 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -3,6 +3,9 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
+ CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ add_library(arch ppc64.cpp)
++elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
++ CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
++ add_library(arch s390.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ add_library(arch x86_64.cpp)
+ else()
+diff --git a/src/arch/s390.cpp b/src/arch/s390.cpp
+new file mode 100644
+index 0000000..a2278c8
+--- /dev/null
++++ b/src/arch/s390.cpp
+@@ -0,0 +1,85 @@
++#include "arch.h"
++
++#include <algorithm>
++#include <array>
++
++#define REQ_REGISTERS 19
++#define ARG_REGISTERS 5
++
++namespace bpftrace {
++namespace arch {
++
++// clang-format off
++static std::array<std::string, REQ_REGISTERS> registers = {
++ // Breakpoint event address
++ "arg",
++ "pswmask",
++ // Instruction address
++ "pswaddr",
++ "r0",
++ "r1",
++ "r2",
++ "r3",
++ "r4",
++ "r5",
++ "r6",
++ "r7",
++ "r8",
++ "r9",
++ "r10",
++ "r11",
++ "r12",
++ "r13",
++ "r14",
++ "r15",
++};
++
++static std::array<std::string, ARG_REGISTERS> arg_registers = {
++ "r2",
++ "r3",
++ "r4",
++ "r5",
++ "r6",
++};
++// clang-format on
++
++int offset(std::string reg_name)
++{
++ auto it = find(registers.begin(), registers.end(), reg_name);
++ if (it == registers.end())
++ return -1;
++ return distance(registers.begin(), it);
++}
++
++int max_arg()
++{
++ return arg_registers.size() - 1;
++}
++
++int arg_offset(int arg_num)
++{
++ return offset(arg_registers.at(arg_num));
++}
++
++int ret_offset()
++{
++ return offset("r2");
++}
++
++int pc_offset()
++{
++ return offset("pswaddr");
++}
++
++int sp_offset()
++{
++ return offset("r15");
++}
++
++std::string name()
++{
++ return std::string("s390x");
++}
++
++} // namespace arch
++} // namespace bpftrace
+--
+2.25.3
+
diff --git a/SOURCES/bpftrace-0.10.0-RHEL-8-fixes.patch b/SOURCES/bpftrace-0.10.0-RHEL-8-fixes.patch
new file mode 100644
index 0000000..7c4becf
--- /dev/null
+++ b/SOURCES/bpftrace-0.10.0-RHEL-8-fixes.patch
@@ -0,0 +1,56 @@
+From a09a2f06d6316801e89e7f676d0839910aea765d Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 11 Jun 2019 16:41:59 +0200
+Subject: [PATCH] RHEL 8 fixes
+
+Fixes the following RHEL 8 specific issues:
+ - library path in gethostlatency and threadsnoop
+---
+ tools/gethostlatency.bt | 12 ++++++------
+ tools/threadsnoop.bt | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tools/gethostlatency.bt b/tools/gethostlatency.bt
+index a1ac1b2..ade1005 100755
+--- a/tools/gethostlatency.bt
++++ b/tools/gethostlatency.bt
+@@ -26,17 +26,17 @@ BEGIN
+ "HOST");
+ }
+
+-uprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo,
+-uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname,
+-uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2
++uprobe:/lib64/libc.so.6:getaddrinfo,
++uprobe:/lib64/libc.so.6:gethostbyname,
++uprobe:/lib64/libc.so.6:gethostbyname2
+ {
+ @start[tid] = nsecs;
+ @name[tid] = arg0;
+ }
+
+-uretprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo,
+-uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname,
+-uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2
++uretprobe:/lib64/libc.so.6:getaddrinfo,
++uretprobe:/lib64/libc.so.6:gethostbyname,
++uretprobe:/lib64/libc.so.6:gethostbyname2
+ /@start[tid]/
+ {
+ $latms = (nsecs - @start[tid]) / 1000000;
+diff --git a/tools/threadsnoop.bt b/tools/threadsnoop.bt
+index e4d3875..c56b1ac 100755
+--- a/tools/threadsnoop.bt
++++ b/tools/threadsnoop.bt
+@@ -18,7 +18,7 @@ BEGIN
+ printf("%-10s %-6s %-16s %s\n", "TIME(ms)", "PID", "COMM", "FUNC");
+ }
+
+-uprobe:/lib/x86_64-linux-gnu/libpthread.so.0:pthread_create
++uprobe:/usr/lib64/libpthread.so:pthread_create
+ {
+ printf("%-10u %-6d %-16s %s\n", elapsed / 1000000, pid, comm,
+ usym(arg2));
+--
+2.25.4
+
diff --git a/SOURCES/bpftrace-0.9.2-RHEL-8-fixes.patch b/SOURCES/bpftrace-0.9.2-RHEL-8-fixes.patch
deleted file mode 100644
index b15f98a..0000000
--- a/SOURCES/bpftrace-0.9.2-RHEL-8-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1dce61acfec57712f84cfdf2a8f4c69d27744b04 Mon Sep 17 00:00:00 2001
-From: Jerome Marchand <jmarchan@redhat.com>
-Date: Tue, 11 Jun 2019 16:41:59 +0200
-Subject: RHEL 8 fixes
-
-Fixes the following RHEL 8 specific issues:
- - library path in gethostlatency
-
----
- tools/gethostlatency.bt | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tools/gethostlatency.bt b/tools/gethostlatency.bt
-index a1ac1b2..ade1005 100755
---- a/tools/gethostlatency.bt
-+++ b/tools/gethostlatency.bt
-@@ -26,17 +26,17 @@ BEGIN
- "HOST");
- }
-
--uprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo,
--uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname,
--uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2
-+uprobe:/lib64/libc.so.6:getaddrinfo,
-+uprobe:/lib64/libc.so.6:gethostbyname,
-+uprobe:/lib64/libc.so.6:gethostbyname2
- {
- @start[tid] = nsecs;
- @name[tid] = arg0;
- }
-
--uretprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo,
--uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname,
--uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2
-+uretprobe:/lib64/libc.so.6:getaddrinfo,
-+uretprobe:/lib64/libc.so.6:gethostbyname,
-+uretprobe:/lib64/libc.so.6:gethostbyname2
- /@start[tid]/
- {
- $latms = (nsecs - @start[tid]) / 1000000;
---
-2.20.1
-
diff --git a/SPECS/bpftrace.spec b/SPECS/bpftrace.spec
index d1aa05e..f423299 100644
--- a/SPECS/bpftrace.spec
+++ b/SPECS/bpftrace.spec
@@ -1,14 +1,15 @@
%bcond_without llvm_static
Name: bpftrace
-Version: 0.9.2
-Release: 1%{?dist}
+Version: 0.10.0
+Release: 2%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
URL: https://github.com/iovisor/bpftrace
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %{name}-%{version}-RHEL-8-fixes.patch
+Patch1: %{name}-%{version}-Add-s390x-register-support.patch
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
@@ -59,8 +60,8 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \;
# Move man pages to the right location
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
+#mkdir -p %{buildroot}%{_mandir}
+#mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%files
@@ -77,6 +78,12 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Tue May 05 2020 Jerome Marchand <jmarchan@redhat.com> - 0.10.0-2
+- Fix libpthread path in threadsnoop
+
+* Wed Apr 22 2020 Jerome Marchand <jmarchan@redhat.com> - 0.10.0-1
+- Rebase on bpftrace 0.10.0
+
* Fri Nov 08 2019 Jerome Marchand <jmarchan@redhat.com> - 0.9.2-1
- Rebase on bpftrace 0.9.2