tcf-agent: bump to version 1.7.0
Build issues with MicroBlaze and PPC64 targets are fixed, and the three patches are upstream. Signed-off-by: Eugene Tarassov <eugene@largest.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018.05.x
Eugene Tarassov
Thomas Petazzoni
parent
50b1a05fb6
commit
2d64ba803b
|
|
@ -1,48 +0,0 @@
|
|||
From 96c43b223c90746cb2f680d6d5e198afc690dd4d Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Lange <nolange79@gmail.com>
|
||||
Date: Mon, 4 Dec 2017 10:56:45 +0100
|
||||
Subject: [PATCH] agent: add install target to the CMakeLists
|
||||
|
||||
It is common for CMake packages to make sure that 'make install'
|
||||
works properly, and that's what most users expect.
|
||||
|
||||
More specifically, build systems such as Buildroot also expect
|
||||
'make install' to do the right thing for CMake-based packages
|
||||
|
||||
Signed-off-by: Norbert Lange <nolange79@gmail.com>
|
||||
---
|
||||
agent/CMakeLists.txt | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
|
||||
index aef15b96..605862b2 100644
|
||||
--- a/agent/CMakeLists.txt
|
||||
+++ b/agent/CMakeLists.txt
|
||||
@@ -1,6 +1,8 @@
|
||||
# -*- cmake -*-
|
||||
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
+project(tcfagent C)
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
set(CMAKE_COLOR_MAKEFILE OFF)
|
||||
|
||||
@@ -43,3 +45,15 @@ message(STATUS "machine:" ${TCF_MACHINE})
|
||||
|
||||
add_executable(agent tcf/main/main.c)
|
||||
target_link_libraries(agent ${TCF_LIB_NAME})
|
||||
+
|
||||
+# executable and library cant have the same target name,
|
||||
+# but we can rename the output
|
||||
+set_target_properties(agent
|
||||
+ PROPERTIES OUTPUT_NAME tcf-agent)
|
||||
+
|
||||
+# add target to install all outputs
|
||||
+install(TARGETS agent ${TCF_LIB_NAME}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
--
|
||||
2.15.1
|
||||
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
From 3e662598e1d9ad682e470988764c3af5b1a78cb7 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Lange <nolange79@gmail.com>
|
||||
Date: Fri, 1 Dec 2017 13:15:50 +0100
|
||||
Subject: [PATCH] linux: remove explicit uses of __ptrace_request
|
||||
|
||||
This type is not to be used directly, and with musl it wont build
|
||||
|
||||
Signed-off-by: Norbert Lange <nolange79@gmail.com>
|
||||
---
|
||||
agent/machine/arm/tcf/cpudefs-mdep.c | 4 ++--
|
||||
agent/machine/arm/tcf/regset-mdep.h | 4 ++--
|
||||
agent/system/GNU/Linux/tcf/context-linux.c | 18 +++++++++---------
|
||||
3 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/agent/machine/arm/tcf/cpudefs-mdep.c b/agent/machine/arm/tcf/cpudefs-mdep.c
|
||||
index 27ab0129..0bc8b146 100644
|
||||
--- a/agent/machine/arm/tcf/cpudefs-mdep.c
|
||||
+++ b/agent/machine/arm/tcf/cpudefs-mdep.c
|
||||
@@ -89,10 +89,10 @@ static RegisterDefinition * lr_def = NULL;
|
||||
static RegisterDefinition * cpsr_def = NULL;
|
||||
|
||||
#if !defined(PTRACE_GETHBPREGS)
|
||||
-#define PTRACE_GETHBPREGS (enum __ptrace_request)29
|
||||
+#define PTRACE_GETHBPREGS 29
|
||||
#endif
|
||||
#if !defined(PTRACE_SETHBPREGS)
|
||||
-#define PTRACE_SETHBPREGS (enum __ptrace_request)30
|
||||
+#define PTRACE_SETHBPREGS 30
|
||||
#endif
|
||||
|
||||
#define ARM_DEBUG_ARCH_V6 1
|
||||
diff --git a/agent/machine/arm/tcf/regset-mdep.h b/agent/machine/arm/tcf/regset-mdep.h
|
||||
index e5516042..893ba64f 100644
|
||||
--- a/agent/machine/arm/tcf/regset-mdep.h
|
||||
+++ b/agent/machine/arm/tcf/regset-mdep.h
|
||||
@@ -28,11 +28,11 @@
|
||||
#endif
|
||||
|
||||
#ifndef PTRACE_GETREGSET
|
||||
-#define PTRACE_GETREGSET (enum __ptrace_request)0x4204
|
||||
+#define PTRACE_GETREGSET 0x4204
|
||||
#endif
|
||||
|
||||
#ifndef PTRACE_SETREGSET
|
||||
-#define PTRACE_SETREGSET (enum __ptrace_request)0x4205
|
||||
+#define PTRACE_SETREGSET 0x4205
|
||||
#endif
|
||||
|
||||
struct regset_gp {
|
||||
diff --git a/agent/system/GNU/Linux/tcf/context-linux.c b/agent/system/GNU/Linux/tcf/context-linux.c
|
||||
index d4eb5e6b..4c86021e 100644
|
||||
--- a/agent/system/GNU/Linux/tcf/context-linux.c
|
||||
+++ b/agent/system/GNU/Linux/tcf/context-linux.c
|
||||
@@ -60,10 +60,10 @@
|
||||
#endif
|
||||
|
||||
#if !defined(PTRACE_SETOPTIONS)
|
||||
-#define PTRACE_SETOPTIONS (enum __ptrace_request)0x4200
|
||||
-#define PTRACE_GETEVENTMSG (enum __ptrace_request)0x4201
|
||||
-#define PTRACE_GETSIGINFO (enum __ptrace_request)0x4202
|
||||
-#define PTRACE_SETSIGINFO (enum __ptrace_request)0x4203
|
||||
+#define PTRACE_SETOPTIONS 0x4200
|
||||
+#define PTRACE_GETEVENTMSG 0x4201
|
||||
+#define PTRACE_GETSIGINFO 0x4202
|
||||
+#define PTRACE_SETSIGINFO 0x4203
|
||||
|
||||
#define PTRACE_O_TRACESYSGOOD 0x00000001
|
||||
#define PTRACE_O_TRACEFORK 0x00000002
|
||||
@@ -85,8 +85,8 @@
|
||||
|
||||
#if defined(__arm__) || defined(__aarch64__)
|
||||
#if !defined(PTRACE_GETVFPREGS)
|
||||
-#define PTRACE_GETVFPREGS (enum __ptrace_request)27
|
||||
-#define PTRACE_SETVFPREGS (enum __ptrace_request)28
|
||||
+#define PTRACE_GETVFPREGS 27
|
||||
+#define PTRACE_SETVFPREGS 28
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -483,7 +483,7 @@ static const char * get_ptrace_cmd_name(int cmd) {
|
||||
static int do_single_step(Context * ctx) {
|
||||
uint32_t is_cont = 0;
|
||||
ContextExtensionLinux * ext = EXT(ctx);
|
||||
- enum __ptrace_request cmd = PTRACE_SINGLESTEP;
|
||||
+ int cmd = PTRACE_SINGLESTEP;
|
||||
|
||||
assert(!ext->pending_step);
|
||||
|
||||
@@ -540,9 +540,9 @@ int context_continue(Context * ctx) {
|
||||
int signal = 0;
|
||||
ContextExtensionLinux * ext = EXT(ctx);
|
||||
#if USE_PTRACE_SYSCALL
|
||||
- enum __ptrace_request cmd = PTRACE_SYSCALL;
|
||||
+ int cmd = PTRACE_SYSCALL;
|
||||
#else
|
||||
- enum __ptrace_request cmd = PTRACE_CONT;
|
||||
+ int cmd = PTRACE_CONT;
|
||||
#endif
|
||||
|
||||
assert(is_dispatch_thread());
|
||||
--
|
||||
2.15.1
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 1323aa4459004b9817f0cfbf4b59c31480d527cf Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Lange <nolange79@gmail.com>
|
||||
Date: Fri, 1 Dec 2017 13:34:08 +0100
|
||||
Subject: [PATCH] linux: provide canonicalize_file_name for all c libs except
|
||||
glibc
|
||||
|
||||
musl was not covered so far, and this library does not define a
|
||||
macro for detection.
|
||||
unless glibc is detected, a canonicalize_file_name implementation
|
||||
will be provided.
|
||||
|
||||
Signed-off-by: Norbert Lange <nolange79@gmail.com>
|
||||
---
|
||||
agent/tcf/framework/mdep.c | 2 +-
|
||||
agent/tcf/framework/mdep.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c
|
||||
index 8aee811f..d38036be 100644
|
||||
--- a/agent/tcf/framework/mdep.c
|
||||
+++ b/agent/tcf/framework/mdep.c
|
||||
@@ -1097,7 +1097,7 @@ char * canonicalize_file_name(const char * path) {
|
||||
return strdup(res);
|
||||
}
|
||||
|
||||
-#elif defined(__UCLIBC__)
|
||||
+#elif defined(__UCLIBC__) || !defined(__GLIBC_)
|
||||
|
||||
char * canonicalize_file_name(const char * path) {
|
||||
return realpath(path, NULL);
|
||||
diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h
|
||||
index f90f03f2..3e331383 100644
|
||||
--- a/agent/tcf/framework/mdep.h
|
||||
+++ b/agent/tcf/framework/mdep.h
|
||||
@@ -292,7 +292,7 @@ extern int loc_clock_gettime(int, struct timespec *);
|
||||
|
||||
#define O_BINARY 0
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)
|
||||
+#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)) | !defined (__GLIBC__)
|
||||
# define O_LARGEFILE 0
|
||||
extern char ** environ;
|
||||
extern char * canonicalize_file_name(const char * path);
|
||||
--
|
||||
2.15.1
|
||||
|
||||
|
|
@ -28,9 +28,8 @@ config BR2_PACKAGE_TCF_AGENT_ARCH
|
|||
default "i386" if BR2_i386 && !BR2_ARCH="i686"
|
||||
default "x86_64" if BR2_x86_64
|
||||
default "powerpc" if BR2_powerpc || BR2_powerpcle
|
||||
# those architectures fail to build currently
|
||||
# default "ppc64" if BR2_powerpc64 || BR2_powerpc64le
|
||||
# default "microblaze" if BR2_microblaze || BR2_microblazeel
|
||||
default "ppc64" if BR2_powerpc64 || BR2_powerpc64le
|
||||
default "microblaze" if BR2_microblaze || BR2_microblazeel
|
||||
|
||||
config BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS
|
||||
bool
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Locally computed:
|
||||
sha256 94e9277a52929791417d59b515235bf28ca29ffb05c9e89ad331ebc3256fb5df org.eclipse.tcf.agent-1.6.0.tar.gz
|
||||
sha256 2f8c7be8a0bf7c86c72fd5680bc19a9e8f98792d40c94a0fee30ceb6428b8f33 org.eclipse.tcf.agent-1.7.0.tar.gz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 f82d01b74a513bd3504d08136026a5ac2a7e6ff62ebcde391fa74aa222d11ce0 agent/edl-v10.html
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
TCF_AGENT_VERSION = 1.6.0
|
||||
TCF_AGENT_VERSION = 1.7.0
|
||||
# the tar.xz link was broken the time this file got authored
|
||||
TCF_AGENT_SOURCE = org.eclipse.tcf.agent-$(TCF_AGENT_VERSION).tar.gz
|
||||
TCF_AGENT_SITE = http://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/snapshot
|
||||
|
|
|
|||
Loading…
Reference in New Issue