pool/psmisc
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 203605 from Base:System

Browse Source 
- peekfd-m68k.patch: Port peekfd to m68k (forwarded request 203580 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/203605
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=54
This commit is contained in:
Tomáš Chvátal 2013-10-17 18:38:13 +00:00 committed by Git OBS Bridge
commit ca0076fe6c
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
peekfd-m68k.patch Normal file
View File

@ -0,0 +1,64 @@
Index: psmisc-22.20/configure.ac
===================================================================
--- psmisc-22.20.orig/configure.ac
+++ psmisc-22.20/configure.ac
@@ -128,6 +128,8 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_gp
AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
AC_CHECK_MEMBERS([struct pt_regs.regs,
struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>])
+AC_CHECK_MEMBERS([struct pt_regs.orig_d0,
+ struct pt_regs.d0],[],[], [#include <asm/ptrace.h>])
case ${target_os} in
gnu*)
@@ -160,6 +162,9 @@ AM_CONDITIONAL(WANT_PEEKFD_MIPS,
test $build_cpu = mipsel &&
test $ac_cv_member_struct_pt_regs_regs = yes &&
test $ac_cv_member_struct_pt_regs_cp0_status = yes)
+AM_CONDITIONAL(WANT_PEEKFD_M68K,
+ test $ac_cv_member_struct_pt_regs_orig_d0 = yes &&
+ test $ac_cv_member_struct_pt_regs_d0 = yes)
dnl Checks for library functions.
AC_FUNC_CLOSEDIR_VOID
Index: psmisc-22.20/src/Makefile.am
===================================================================
--- psmisc-22.20.orig/src/Makefile.am
+++ psmisc-22.20/src/Makefile.am
@@ -29,6 +29,10 @@ if WANT_PEEKFD_MIPS
bin_PROGRAMS += peekfd
AM_CFLAGS += -DMIPS
endif
+if WANT_PEEKFD_M68K
+ bin_PROGRAMS += peekfd
+ AM_CFLAGS += -DM68K
+endif
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
if WANT_TIMEOUT_STAT
Index: psmisc-22.20/src/peekfd.c
===================================================================
--- psmisc-22.20.orig/src/peekfd.c
+++ psmisc-22.20/src/peekfd.c
@@ -76,6 +76,12 @@
#define REG_PARAM1 regs[4]
#define REG_PARAM2 regs[5]
#define REG_PARAM3 regs[6]
+#elif defined(M68K)
+ #define REG_ORIG_ACCUM orig_d0
+ #define REG_ACCUM d0
+ #define REG_PARAM1 d1
+ #define REG_PARAM2 d2
+ #define REG_PARAM3 d3
#endif
#define MAX_ATTACHED_PIDS 1024
@@ -270,7 +276,7 @@ int main(int argc, char **argv)
}
for (i = 0; i < regs.REG_PARAM3; i++) {
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
#if __WORDSIZE == 64
unsigned int a = bswap_64(ptrace(PTRACE_PEEKTEXT, pid, regs.REG_PARAM2 + i, 0));
#else

5
psmisc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 9 12:33:26 UTC 2013 - schwab@suse.de
- peekfd-m68k.patch: Port peekfd to m68k
-------------------------------------------------------------------
Sat Feb 9 12:46:46 UTC 2013 - schwab@suse.de

2
psmisc.spec
View File

@ -38,6 +38,7 @@ Patch0: %name-22.20.dif
Patch1: %name-22.12-tigetstr.patch
Patch2: %name-22.12-pstree.patch
Patch3: %name-22.20-pstree.patch
Patch4: peekfd-m68k.patch
Patch42: %{name}-%{version}-upstream.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -66,6 +67,7 @@ Provides translations to the package %{name}
%patch2 -p0 -b .pstree
%patch3 -p0 -b .se
%patch0 -p0 -b .0
%patch4 -p1
%build
autoreconf -fi