Re: preparing to 4.5.19 release
On Mon, Oct 12, 2009 at 06:59:04PM -0700, Roland McGrath wrote: I've done scratch builds for Fedora 10 and 12 (x86_64, i386, ppc64, ppc), available here: http://koji.fedoraproject.org/scratch/roland/task_1742936/ http://koji.fedoraproject.org/scratch/roland/task_1742937/ (The build system and/or network is resisting me so there isn't a Fedora 11 one there, but I'm sure that works too.) I also did scratch builds for RHEL5 (x86_64, i386, ppc64, ppc, s390x, s390, ia64). Those are not available in public but I can make them so if anyone wants them. All those builds were happy. I smoke-tested all the variants of x86_64 packages, but that is all. I say we ship it. If I don't see objections by 2009-10-14 0:00 UTC, I will cut the 4.5.19 release and push Fedora updates. For Fedora, I just need a trivial edit of the strace.spec %changelog text tomorrow before a final commit, tag, and make-dist. If debian/ bits need any more tweaks to go with final officialdom, someone say so fast. I believe that the date mentioned above was a week ago, and I haven't seen any objections. So it's a time to release 4.5.19 finally, isn't it? -- ldv pgprwzANeFzbN.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Monday 12 October 2009 16:36:43 Dmitry V. Levin wrote: On Mon, Oct 12, 2009 at 04:18:26PM +0400, Dmitry V. Levin wrote: On Sun, Oct 11, 2009 at 04:31:38PM -0700, Roland McGrath wrote: [...] Are we about ready to go now? Yes, everything looks OK, except build failure on Debian sparc. With help of Mike and Frederik, this problem should be fixed in HEAD now. That is, we hopefully have no more release stopper issues. I've just built and tested strace from HEAD on x86 and x86-64. Looks like there are no regressions. It would be good to ensure that all other supported architectures are also OK. alpha seems to be OK -mike -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi, On Fri, Oct 09, 2009 at 04:48:55PM -0400, Mike Frysinger wrote: On Friday 09 October 2009 07:42:19 Frederik Schüler wrote: thanks fot the patch, with a small fix, the 32bit strace binary on sparc builds now [...] but the 64bit binary fails: gcc -m64 -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc64 -I../linux/sparc64 -Ilinux - I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c ../syscall.c: In function ‘get_scno’: ../syscall.c:1177: error: ‘struct pt_regs’ has no member named ‘pc’ make[2]: *** [syscall.o] Error 1 make[2]: Leaving directory `/home/fs/strace-4.5.19/build64' make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/fs/strace-4.5.19/build64' make: *** [stamp-build64] Error 2 that's easy to fix Frederik, does the most recent patch from Mike fix 64bit strace in your build environment? -- ldv pgpijhX1PES9z.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi! The addressed issue is fixed now, thanks! But we got another issue open: gcc -m64 -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc64 -I../linux/sparc64 -Ilinux - I../linux -Wall -g -O2 -MT util.o -MD -MP -MF .deps/util.Tpo -c -o util.o ../util.c ../util.c: In function ‘printcall’: ../util.c:1254: error: ‘struct pt_regs’ has no member named ‘pc’ make[2]: *** [util.o] Error 1 make[2]: Leaving directory `/home/fs/strace-4.5.19/build64' make[1]: *** [all] Error 2 Best regards Frederik Schüler On Friday 09 October 2009 22:48:55 Mike Frysinger wrote: On Friday 09 October 2009 07:42:19 Frederik Schüler wrote: thanks fot the patch, with a small fix, the 32bit strace binary on sparc builds now: diff --git a/util.c b/util.c index c96eb0a..ddb7195 100644 --- a/util.c +++ b/util.c @@ -83,7 +83,9 @@ # define fpq kernel_fpq # define fq kernel_fq # define fpu kernel_fpu +# ifdef HAS_ASM_REG_H # include asm/reg.h +# endif # undef fpq # undef fq # undef fpu this section of code should simply be deleted as we no longer want to pull in the asm/reg.h header but the 64bit binary fails: gcc -m64 -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc64 -I../linux/sparc64 -Ilinux - I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c ../syscall.c: In function ‘get_scno’: ../syscall.c:1177: error: ‘struct pt_regs’ has no member named ‘pc’ make[2]: *** [syscall.o] Error 1 make[2]: Leaving directory `/home/fs/strace-4.5.19/build64' make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/fs/strace-4.5.19/build64' make: *** [stamp-build64] Error 2 that's easy to fix of course, now that ive done all this, perhaps the obvious fix was to delete the asm/reg.h include and then copy the 'struct regs' into the local defs.h for sparc linux systems ... -mike -- ENOSIG signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Monday 12 October 2009 10:04:42 Frederik Schüler wrote:
But we got another issue open:
gcc -m64 -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc64 -I../linux/sparc64
-Ilinux - I../linux -Wall -g -O2 -MT util.o -MD -MP -MF .deps/util.Tpo
-c -o util.o ../util.c
../util.c: In function ‘printcall’:
../util.c:1254: error: ‘struct pt_regs’ has no member named ‘pc’
make[2]: *** [util.o] Error 1
make[2]: Leaving directory `/home/fs/strace-4.5.19/build64'
make[1]: *** [all] Error 2
thought i did a search for .pc, but guess i missed a spot
-mike
diff --git a/defs.h b/defs.h
index 9fd6122..e5e920b 100644
--- a/defs.h
+++ b/defs.h
@@ -218,6 +218,11 @@ extern int ptrace();
#define DEFAULT_PERSONALITY 0
#ifdef LINUXSPARC
+/* Indexes into the pt_regs.u_reg[] array -- UREG_XX from kernel are all off
+ * by 1 and use Ix instead of Ox. These work for both 32 and 64 bit Linux. */
+#define U_REG_G1 0
+#define U_REG_O0 7
+#define U_REG_O1 8
#define PERSONALITY0_WORDSIZE 4
#define PERSONALITY1_WORDSIZE 4
#undef SUPPORTED_PERSONALITIES
diff --git a/process.c b/process.c
index 5d956b0..551e1bb 100644
--- a/process.c
+++ b/process.c
@@ -56,20 +56,6 @@
#include sys/ptrace.h
#endif
-#if HAVE_ASM_REG_H
-#if defined (SPARC) || defined (SPARC64)
-# define fpq kernel_fpq
-# define fq kernel_fq
-# define fpu kernel_fpu
-#endif /* SPARC || SPARC64 */
-#include asm/reg.h
-#if defined (SPARC) || defined (SPARC64)
-# undef fpq
-# undef fq
-# undef fpu
-#endif /* SPARC || SPARC64 */
-#endif /* HAVE_ASM_REG_H */
-
#ifdef HAVE_SYS_REG_H
# include sys/reg.h
#ifndef PTRACE_PEEKUSR
@@ -726,10 +712,10 @@ change_syscall(struct tcb *tcp, int new)
return -1;
return 0;
#elif defined(SPARC) || defined(SPARC64)
- struct regs regs;
+ struct pt_regs regs;
if (ptrace(PTRACE_GETREGS, tcp-pid, (char*)regs, 0)0)
return -1;
- regs.r_g1=new;
+ regs.u_regs[U_REG_G1] = new;
if (ptrace(PTRACE_SETREGS, tcp-pid, (char*)regs, 0)0)
return -1;
return 0;
diff --git a/signal.c b/signal.c
index 4f3111a..6cfdeb2 100644
--- a/signal.c
+++ b/signal.c
@@ -72,33 +72,14 @@
# include asm/ptrace_offsets.h
#endif /* !IA64 */
-#if HAVE_ASM_REG_H
-# if defined (SPARC) || defined (SPARC64)
-# define fpq kernel_fpq
-# define fq kernel_fq
-# define fpu kernel_fpu
-# endif
-# include asm/reg.h
-# if defined (SPARC) || defined (SPARC64)
-# undef fpq
-# undef fq
-# undef fpu
-# endif
#if defined (LINUX) defined (SPARC64)
-# define r_pc r_tpc
# undef PTRACE_GETREGS
# define PTRACE_GETREGS PTRACE_GETREGS64
# undef PTRACE_SETREGS
# define PTRACE_SETREGS PTRACE_SETREGS64
#endif /* LINUX SPARC64 */
-#endif /* HAVE_ASM_REG_H */
-#if defined (SPARC) || defined (SPARC64)
-typedef struct {
- struct regs si_regs;
- int si_mask;
-} m_siginfo_t;
-#elif defined (MIPS)
+#if defined (SPARC) || defined (SPARC64) || defined (MIPS)
typedef struct {
struct pt_regs si_regs;
int si_mask;
@@ -1408,7 +1389,7 @@ sys_sigreturn(struct tcb *tcp)
return 0;
#elif defined (SPARC) || defined (SPARC64)
long i1;
- struct regs regs;
+ struct pt_regs regs;
m_siginfo_t si;
if(ptrace(PTRACE_GETREGS, tcp-pid, (char *)regs, 0) 0) {
@@ -1417,7 +1398,7 @@ sys_sigreturn(struct tcb *tcp)
}
if(entering(tcp)) {
tcp-u_arg[0] = 0;
- i1 = regs.r_o1;
+ i1 = regs.u_regs[U_REG_O1];
if(umove(tcp, i1, si) 0) {
perror(sigreturn: umove );
return 0;
diff --git a/syscall.c b/syscall.c
index 6a75c70..3f551cd 100644
--- a/syscall.c
+++ b/syscall.c
@@ -42,20 +42,6 @@
#include sys/syscall.h
#include sys/param.h
-#if HAVE_ASM_REG_H
-#if defined (SPARC) || defined (SPARC64)
-# define fpq kernel_fpq
-# define fq kernel_fq
-# define fpu kernel_fpu
-#endif
-#include asm/reg.h
-#if defined (SPARC) || defined (SPARC64)
-# undef fpq
-# undef fq
-# undef fpu
-#endif
-#endif
-
#ifdef HAVE_SYS_REG_H
#include sys/reg.h
#ifndef PTRACE_PEEKUSR
@@ -75,7 +61,6 @@
#endif
#if defined (LINUX) defined (SPARC64)
-# define r_pc r_tpc
# undef PTRACE_GETREGS
# define PTRACE_GETREGS PTRACE_GETREGS64
# undef PTRACE_SETREGS
@@ -755,7 +740,7 @@ internal_syscall(struct tcb *tcp)
#elif defined(AVR32)
static struct pt_regs regs;
#elif defined (SPARC) || defined (SPARC64)
- static struct regs regs;
+ static struct pt_regs regs;
static unsigned long trap;
#elif defined(LINUX_MIPSN32)
static long long a3;
@@ -1186,9 +1171,11 @@ get_scno(struct tcb *tcp)
if (!(tcp-flags TCB_INSYSCALL)) {
/* Retrieve the syscall trap instruction. */
errno = 0;
- trap = ptrace(PTRACE_PEEKTEXT, tcp-pid, (char *)regs.r_pc, 0);
# if defined(SPARC64)
+ trap = ptrace(PTRACE_PEEKTEXT, tcp-pid, (char *)regs.tpc, 0);
trap = 32;
+# else
+ trap = ptrace(PTRACE_PEEKTEXT, tcp-pid, (char *)regs.pc, 0);
# endif
if (errno)
return -1;
@@ -1226,9 +1213,9 @@ get_scno(struct tcb *tcp)
return 0;
}
# if defined (SPARC64)
- fprintf(stderr,syscall: unknown syscall trap %08lx %016lx\n, trap, regs.r_tpc);
+ fprintf(stderr,syscall: unknown
Re: preparing to 4.5.19 release
Hi! Now it builds both the 32 and 64bit strace binaries on sparc64, thanks! Best regards Frederik Schüler On Monday 12 October 2009 16:19:07 Mike Frysinger wrote: On Monday 12 October 2009 10:04:42 Frederik Schüler wrote: But we got another issue open: gcc -m64 -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc64 -I../linux/sparc64 -Ilinux - I../linux -Wall -g -O2 -MT util.o -MD -MP -MF .deps/util.Tpo -c -o util.o ../util.c ../util.c: In function ‘printcall’: ../util.c:1254: error: ‘struct pt_regs’ has no member named ‘pc’ make[2]: *** [util.o] Error 1 make[2]: Leaving directory `/home/fs/strace-4.5.19/build64' make[1]: *** [all] Error 2 thought i did a search for .pc, but guess i missed a spot -mike -- ENOSIG signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi, On Mon, Oct 12, 2009 at 04:27:23PM +0200, Frederik Schüler wrote: Now it builds both the 32 and 64bit strace binaries on sparc64, thanks! Does it also work there? ;) -- ldv pgpZDJQmsXeQn.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Monday 12 October 2009 10:34:57 Dmitry V. Levin wrote: On Mon, Oct 12, 2009 at 04:27:23PM +0200, Frederik Schüler wrote: Now it builds both the 32 and 64bit strace binaries on sparc64, thanks! Does it also work there? ;) it works for me in sparc32 userland -mike signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Fri, Oct 09, 2009 at 10:49:30AM -0700, Roland McGrath wrote: Yes, there are no problem, at least for those who just build strace from tarball. But there are people who still list tarball contents before use. Maybe it's some kind of a taste, but for me it would be a bit more fair if each file timestamp in tarball would correspond to the last file change. You still haven't said exactly what you are proposing. I propose to build release tarballs from clean checked out source, and to set file timestamps right after checkout, e.g. git clone /path/to/strace.git cd strace git-set-file-times autoreconf -i ./configure --enable-maintainer-mode TAR_OPTIONS='--owner=0 --group=0 --numeric-owner --mode=go-w,go+rX' make distcheck A few words about TAR_OPTIONS: --owner=0 --group=0 --numeric-owner is used to avoid information disclosure, and --mode=go-w,go+rX is advisable to avoid umask side effects. Maybe we could sacrifice portability and add this TAR_OPTIONS definition to Makefile.am -- ldv pgpaDHkfc8gqt.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Fri, Oct 09, 2009 at 02:48:49PM -0700, Roland McGrath wrote: I propose to build release tarballs from clean checked out source, and to set file timestamps right after checkout, e.g. git clone /path/to/strace.git cd strace git-set-file-times autoreconf -i ./configure --enable-maintainer-mode TAR_OPTIONS='--owner=0 --group=0 --numeric-owner --mode=go-w,go+rX' make distcheck Why don't you put that into a script Yes, I'm going to put that into a script. or make rule that starts with git archive $TAG | tar xf - -C tmpdir? git archive won't work well with --enable-maintainer-mode due to gitlog-to-changelog. Maybe we could sacrifice portability and add this TAR_OPTIONS definition to Makefile.am Yes, please do. Portability is not an issue inside if MAINTAINER_MODE. Unpacking the dist, configure --enable-maintainer-mode + make distcheck should match what we do for creating the official tarball. Done. -- ldv pgpx5YosLOlCg.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Sat, Oct 10, 2009 at 03:01:56AM +0400, Dmitry V. Levin wrote: On Fri, Oct 09, 2009 at 02:48:49PM -0700, Roland McGrath wrote: I propose to build release tarballs from clean checked out source, and to set file timestamps right after checkout, e.g. git clone /path/to/strace.git cd strace git-set-file-times autoreconf -i ./configure --enable-maintainer-mode TAR_OPTIONS='--owner=0 --group=0 --numeric-owner --mode=go-w,go+rX' make distcheck Why don't you put that into a script Yes, I'm going to put that into a script. Done: http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=shortlog;h=ldv/make-dist The script is clumsy, so enhancements are welcome. -- ldv pgppIkyHpEygA.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Wed, Oct 07, 2009 at 07:03:14PM -0700, Roland McGrath wrote: Mike Frysinger already submitted a fix for this issue, I'm going to check it on x86 and x86-64, and merge it if everything is OK. Ok. Another small issue is file timestamps in release tarball. Since git does not store timestamps, all files will have current mtime after checkout, while we still package files with last modification in previous century (e.g. PORTING). I honestly just don't see any problem there. Nobody cares what the timestamps are, as long as configure is newer than configure.ac and that sort of thing Yes, there are no problem, at least for those who just build strace from tarball. But there are people who still list tarball contents before use. Maybe it's some kind of a taste, but for me it would be a bit more fair if each file timestamp in tarball would correspond to the last file change. -- ldv pgp8y8WZA8wvm.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Wed, Oct 07, 2009 at 03:00:50PM +0200, Frederik Schüler wrote: [...] and on sparc: gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc -I../linux/sparc -Ilinux -I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c [...] ../syscall.c: In function ‘get_scno’: ../syscall.c:1192: error: invalid use of undefined type ‘struct regs’ [a lot of complains about struct regs] On sparc, it is defined as static struct regs regs; Nothing has changed in this area since v4.5.18. On Wed, Oct 07, 2009 at 03:51:57PM -0400, Mike Frysinger wrote: [...] In file included from ../syscall.c:129: ../linux/sparc/syscallent.h:250: error: ‘sys_nanosleep’ undeclared here (not in a function) looks like linux/sparc/syscall.h needs updating to match linux/syscall.h. sparc seems odd as it's the only one to provide its own syscall.h. someone should really look at merging sparc with the common one. at any rate, once that's fixed, things build seem to run fine for me. Just to make things clear: does the struct regs problem still persists on sparc? -- ldv pgpC6iDPfkKHH.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Thursday 08 October 2009 19:14:13 Dmitry V. Levin wrote: On Wed, Oct 07, 2009 at 03:00:50PM +0200, Frederik Schüler wrote: [...] and on sparc: gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc -I../linux/sparc -Ilinux -I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c [...] ../syscall.c: In function ‘get_scno’: ../syscall.c:1192: error: invalid use of undefined type ‘struct regs’ [a lot of complains about struct regs] On sparc, it is defined as static struct regs regs; Nothing has changed in this area since v4.5.18. On Wed, Oct 07, 2009 at 03:51:57PM -0400, Mike Frysinger wrote: [...] In file included from ../syscall.c:129: ../linux/sparc/syscallent.h:250: error: ‘sys_nanosleep’ undeclared here (not in a function) looks like linux/sparc/syscall.h needs updating to match linux/syscall.h. sparc seems odd as it's the only one to provide its own syscall.h. someone should really look at merging sparc with the common one. at any rate, once that's fixed, things build seem to run fine for me. Just to make things clear: does the struct regs problem still persists on sparc? on my sparc system, things built fine after i added the nanosleep prototype. i dont know if the struct regs problem Frederik is seeing is due to the C compiler barfing on earlier errors (since things like to snowball), or some other problem. i know that running on a sparc64 kernel with a sparc32 userland results in lots of errors if the --host isnt forced to match the userland (config.guess returns a sparc64 host). i dont have any systems running a sparc32 kernel or a sparc64 userland, so i cant really test those setups. sparc32 user on a sparc64 kernel is by far the most common combo at any rate ... -mike signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi! On Friday 09 October 2009 01:14:13 Dmitry V. Levin wrote: On sparc, it is defined as static struct regs regs; Nothing has changed in this area since v4.5.18. Yes, still barfing: gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc -I../linux/sparc -Ilinux -I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c ../syscall.c: In function ‘get_scno’: ../syscall.c:1192: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1234: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1234: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long unsigned int’ (sid)f...@smetana:~/strace-4.5.19$ uname -a Linux smetana 2.6.26-2-sparc64-smp #1 SMP Thu Aug 20 16:48:42 UTC 2009 sparc64 GNU/Linux (sid)f...@smetana:~/strace-4.5.19$ gcc --version gcc (Debian 4.3.4-4) 4.3.4 Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Best regards Frederik Schüler -- ENOSIG signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Thursday 08 October 2009 21:09:22 Mike Frysinger wrote:
On Thursday 08 October 2009 20:33:31 Frederik Schüler wrote:
On Friday 09 October 2009 01:14:13 Dmitry V. Levin wrote:
On sparc, it is defined as static struct regs regs;
Nothing has changed in this area since v4.5.18.
Yes, still barfing:
gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc -I../linux/sparc -Ilinux
-I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c
-o syscall.o ../syscall.c
../syscall.c: In function ‘get_scno’:
../syscall.c:1192: error: invalid use of undefined type ‘struct regs’
../syscall.c:1234: error: invalid use of undefined type ‘struct regs’
../syscall.c:1234: warning: format ‘%08x’ expects type ‘unsigned int’,
but argument 3 has type ‘long unsigned int’
(sid)f...@smetana:~/strace-4.5.19$ uname -a
Linux smetana 2.6.26-2-sparc64-smp #1 SMP Thu Aug 20 16:48:42 UTC 2009
sparc64 GNU/Linux
(sid)f...@smetana:~/strace-4.5.19$ gcc --version
gcc (Debian 4.3.4-4) 4.3.4
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
not related to the running kernel or gcc/glibc. 'struct regs' comes from
asm/regs*.h which comes from the kernel headers. 2.6.28 and older
installed it, but it was killed off as useless during 2.6.29
development. presumably you're using newer kernel headers version.
going by arch/sparc/kernel/ptrace_*.c, looks like it should be switched to
struct pt_regs as asm/ptrace.h is still installed.
i thought learning another ptrace abi would be neat, so ive converted the code
from 'struct regs' to 'struct pt_regs', but i think the sparc kernel headers
are a little wonky here. if you look at the UREG_XX values, they appear to
all be off by one, and they declare the o registers as i registers.
compare the 32 and 64 bit versions of struct pt_regs to struct regs and you'll
see that the fields all line up, but for some reason pt_regs.u_regs[UREG_G0]
actually refers to g1 as in reg.r_g1. that is why in the attached patch
register names get changed. strace still runs fine, but the new code doesnt
make me happy. it should however work on both sparc32 and sparc64 userland.
looking at gdb shows that they use sys/ucontext.h from glibc to provide the
gregset_t type (which is really just a simple array -- they rely on the size
being correct for the ptrace call). this header also provides REG_xx defines
for sparc32 to index this array and the nice thing is that it appears to
actually line up correctly -- g1 is g1 and o0 is o0. the downside is that the
sparc64 api uses diff define names for indexing (MC_xx), and it apparently
relies on sparc32 layout (so i guess it assumes PTRACE_GETREGS will always be
used as opposed to PTRACE_GETREGS64). you can tell this as the 32bit abi has
the state/pc regs first followed by the g/o regs while the 64bit abi has the
state/pc regs after the g/o regs. in turn, this would prevent a pure 64bit
kernel and userland combo.
perhaps the sanest thing is to use pt_regs from the kernel, but then define
our own set of defines for indexing the u_regs array. call them U_REG_xx to
avoid conflicting with the header. and we stick a note in there about why we
arent using UREG_xx from the kernel. this way the strace sparc code would
reflect the calling convention actually in use -- g1 is the syscall number and
o0..o5.
-mike
diff --git a/process.c b/process.c
index 5d956b0..11f5711 100644
--- a/process.c
+++ b/process.c
@@ -726,10 +726,10 @@ change_syscall(struct tcb *tcp, int new)
return -1;
return 0;
#elif defined(SPARC) || defined(SPARC64)
- struct regs regs;
+ struct pt_regs regs;
if (ptrace(PTRACE_GETREGS, tcp-pid, (char*)regs, 0)0)
return -1;
- regs.r_g1=new;
+ regs.u_regs[UREG_G0] = new;
if (ptrace(PTRACE_SETREGS, tcp-pid, (char*)regs, 0)0)
return -1;
return 0;
diff --git a/signal.c b/signal.c
index 4f3111a..1e47639 100644
--- a/signal.c
+++ b/signal.c
@@ -93,12 +93,7 @@
#endif /* LINUX SPARC64 */
#endif /* HAVE_ASM_REG_H */
-#if defined (SPARC) || defined (SPARC64)
-typedef struct {
- struct regs si_regs;
- int si_mask;
-} m_siginfo_t;
-#elif defined (MIPS)
+#if defined (SPARC) || defined (SPARC64) || defined (MIPS)
typedef struct {
struct pt_regs si_regs;
int si_mask;
@@ -1408,7 +1403,7 @@ sys_sigreturn(struct tcb *tcp)
return 0;
#elif defined (SPARC) || defined (SPARC64)
long i1;
- struct regs regs;
+ struct pt_regs regs;
m_siginfo_t si;
if(ptrace(PTRACE_GETREGS, tcp-pid, (char *)regs, 0) 0) {
@@ -1417,7 +1412,7 @@ sys_sigreturn(struct tcb *tcp)
}
if(entering(tcp)) {
tcp-u_arg[0] = 0;
- i1 = regs.r_o1;
+ i1 = regs.u_regs[UREG_I0];
if(umove(tcp, i1, si) 0) {
perror(sigreturn: umove );
return 0;
diff --git a/syscall.c b/syscall.c
index a2e6885..f862405 100644
--- a/syscall.c
+++ b/syscall.c
Re: preparing to 4.5.19 release
On Tue, Oct 06, 2009 at 06:05:32PM -0700, Roland McGrath wrote: I committed some nits to make for a happy make distcheck (d087571). After that, everything looks good to me. I noticed a compilation warning on x86: util.c: In function 'do_ptrace': util.c:260: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast defs.h:163: note: expected 'long int' but argument is of type 'void *' util.c: In function 'ptrace_restart': util.c:282: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast defs.h:163: note: expected 'long int' but argument is of type 'void *' Mike Frysinger already submitted a fix for this issue, I'm going to check it on x86 and x86-64, and merge it if everything is OK. Another small issue is file timestamps in release tarball. Since git does not store timestamps, all files will have current mtime after checkout, while we still package files with last modification in previous century (e.g. PORTING). There is a script, git-set-file-times, which could be called right after checkout to set mtime and atime of files to their latest commit time in git: http://gitweb.samba.org/?p=rsync.git;a=blob_plain;f=support/git-set-file-times I suggest to use it for preparing release tarball. -- ldv pgp5Y9zYkJNNa.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi! On Wednesday 07 October 2009 03:05:32 Roland McGrath wrote: I'd like Frederik and Andreas to reply that they see no problems, and then I'll tag it and push out to sourceforge and Fedora. In the next cycle, I would be pleased to have Andreas and/or Dmitry do either or both of those last steps when we've agreed on the git rev for the release. I just did a test build on all available porter boxes, and found the build failing on ia64: gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/ia64 -I../linux/ia64 -Ilinux -I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c In file included from ../syscall.c:129: ../linux/ia64/syscallent.h:249:3: error: #error fix me make[2]: *** [syscall.o] Error 1 looks like missing syscalls to me and on sparc: gcc -DHAVE_CONFIG_H -I. -I.. -Ilinux/sparc -I../linux/sparc -Ilinux -I../linux -Wall -g -O2 -MT syscall.o -MD -MP -MF .deps/syscall.Tpo -c -o syscall.o ../syscall.c In file included from ../syscall.c:129: ../linux/sparc/syscallent.h:250: error: ‘sys_nanosleep’ undeclared here (not in a function) ../syscall.c: In function ‘get_scno’: ../syscall.c:1192: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1234: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1234: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘long unsigned int’ ../syscall.c:1234: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 4 has type ‘const struct sysent *’ ../syscall.c:1243: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1243: warning: assignment makes integer from pointer without a cast ../syscall.c:1245: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1245: warning: assignment makes integer from pointer without a cast ../syscall.c:1246: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1246: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1246: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1246: error: invalid operands to binary * (have ‘int’ and ‘const struct sysent *’) ../syscall.c:1246: warning: passing argument 3 of ‘memmove’ makes integer from pointer without a cast ../syscall.c: In function ‘get_error’: ../syscall.c:1652: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1652: error: invalid operands to binary (have ‘const struct sysent *’ and ‘int’) ../syscall.c:1654: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1654: warning: assignment makes integer from pointer without a cast ../syscall.c:1657: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1657: warning: assignment makes integer from pointer without a cast ../syscall.c: In function ‘force_result’: ../syscall.c:1881: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1881: warning: statement with no effect ../syscall.c:1882: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1882: warning: statement with no effect ../syscall.c:1885: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1885: warning: statement with no effect ../syscall.c:1886: error: invalid use of undefined type ‘struct regs’ ../syscall.c:1886: warning: statement with no effect ../syscall.c: In function ‘syscall_enter’: ../syscall.c:2116: error: invalid use of undefined type ‘struct regs’ ../syscall.c:2116: warning: assignment makes integer from pointer without a cast ../syscall.c: In function ‘getrval2’: ../syscall.c:2693: error: storage size of ‘regs’ isn’t known ../syscall.c:2696: error: request for member ‘r_o1’ in something not a structure or union ../syscall.c:2696: warning: assignment makes integer from pointer without a cast ../syscall.c:2693: warning: unused variable ‘regs’ make[2]: *** [syscall.o] Error 1 make[2]: Leaving directory `/home/fs/strace-4.5.19/build' Best regards Frederik Schüler -- ENOSIG signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi Andreas, the fix works, thanks. On Wednesday 07 October 2009 16:44:33 Andreas Schwab wrote: I've pushed this change: From 0fda1c59cc707918b7d5de9c516c629d0abb4f3c Mon Sep 17 00:00:00 2001 From: Andreas Schwab sch...@redhat.com Date: Wed, 7 Oct 2009 16:00:31 +0200 Subject: [PATCH] Fix build on ia64 * linux/ia64/syscallent.h: Update for addition of accept4 syscall in ../syscallent.h. Best regards Frederik Schüler -- ENOSIG signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Mike Frysinger already submitted a fix for this issue, I'm going to check it on x86 and x86-64, and merge it if everything is OK. Ok. Another small issue is file timestamps in release tarball. Since git does not store timestamps, all files will have current mtime after checkout, while we still package files with last modification in previous century (e.g. PORTING). I honestly just don't see any problem there. Nobody cares what the timestamps are, as long as configure is newer than configure.ac and that sort of thing (not that they should complain anyway if they decided to use --enable-maintainer-mode). There is a script, git-set-file-times, which could be called right after checkout to set mtime and atime of files to their latest commit time in git: http://gitweb.samba.org/?p=rsync.git;a=blob_plain;f=support/git-set-file-times I suggest to use it for preparing release tarball. What I've always used is just 'make distcheck' (and now 'make srpm'), just based on my own checkout with whatever working file state it has (making sure manually that it's a clean checkout of the tagged state, of course). I can't tell if you are suggesting some new automation, or just encouraging that whoever does 'make distcheck' runs this thing on their working tree first. Since I'm looking to get out of being the one who does that step in future cycles, it's not really my reaction that matters. Thanks, Roland -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Wednesday 07 October 2009 22:03:14 Roland McGrath wrote: Another small issue is file timestamps in release tarball. Since git does not store timestamps, all files will have current mtime after checkout, while we still package files with last modification in previous century (e.g. PORTING). I honestly just don't see any problem there. Nobody cares what the timestamps are, as long as configure is newer than configure.ac and that sort of thing (not that they should complain anyway if they decided to use --enable-maintainer-mode). as you say, as long as the autotool timestamps are in sync (and thus cause them to re-run), it shouldnt matter. only other timestamp issue i can think of is having a file that is really really old and ends up making tar whine about it when unpacking. There is a script, git-set-file-times, which could be called right after checkout to set mtime and atime of files to their latest commit time in git: http://gitweb.samba.org/?p=rsync.git;a=blob_plain;f=support/git-set-file- times I suggest to use it for preparing release tarball. What I've always used is just 'make distcheck' (and now 'make srpm'), just based on my own checkout with whatever working file state it has (making sure manually that it's a clean checkout of the tagged state, of course). I can't tell if you are suggesting some new automation, or just encouraging that whoever does 'make distcheck' runs this thing on their working tree first. Since I'm looking to get out of being the one who does that step in future cycles, it's not really my reaction that matters. i hope `make distcheck` is kept in working order as it's the preferred way of packaging autotooled projects. -mike signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
That all looks good to me. Go ahead and merge it. If Frederik has any more tweaks to add, just commit those on top. Thanks, Roland -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Tue, Oct 06, 2009 at 04:27:41PM -0400, Carlos O'Donell wrote: [...] I have verified that upstream strace HEAD works correctly on hppa. Good news. Looks like everything is ready for 4.5.19 release? -- ldv pgpaN6COQs6ry.pgp Description: PGP signature -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi, On Tue, Sep 29, 2009 at 04:10:48AM +0400, Dmitry V. Levin wrote: On Tue, Sep 22, 2009 at 01:04:45AM +0200, Frederik Schüler wrote: [...] I attached my current diff, you might want to crosscheck, waiting for debian hppa porters to confirm the issues are fixed. Is there any feedback from hppa porters? Well, I see no feedback from hppa porters so far. What we are going to do with hppa changes and 4.5.19 release? -- ldv pgp86aIMY7UiV.pgp Description: PGP signature -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
It's been long enough already. Whatever the particulars, we can't keep waiting. I want to see the release this week. Thanks, Roland -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Monday 05 October 2009 11:45:28 Dmitry V. Levin wrote: On Tue, Sep 29, 2009 at 04:10:48AM +0400, Dmitry V. Levin wrote: On Tue, Sep 22, 2009 at 01:04:45AM +0200, Frederik Schüler wrote: [...] I attached my current diff, you might want to crosscheck, waiting for debian hppa porters to confirm the issues are fixed. Is there any feedback from hppa porters? Well, I see no feedback from hppa porters so far. What we are going to do with hppa changes and 4.5.19 release? i dont think this patch made it in ? http://sourceforge.net/mailarchive/forum.php?thread_name=20090914215441.GD5352%40wo.int.altlinux.orgforum_name=strace-devel [PATCH] hppa: Avoid manipulating function pointers from a traced process. otherwise, the proposed patch is: - update debian maintainer (debian/*) - update hppa syscall list (linux/hppa/*) - fix hppa signal/function handling (the patch in the above url) - fix hppa syscall decode (syscall.c) - something else (ipc.c) the first two should go in as obvious, the third has been approved but not merged, and the last two have been around for a while but not pushed (but affect only hppa systems). if the last two dont get merged, i'll include them in the Gentoo ebuild and report back after people test things (current strace on Gentoo/hppa is crashing anyways due to issue 3 above). -mike signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi!
I did the checks myself now, thanks to debian porters machines.
armel build fixes confirmed.
hppa issues fixed and tested, patch attached.
I hope the format is ok, this is my first official git commit ;)
Best regards
Frederik Schüler
On Monday 05 October 2009 17:45:28 Dmitry V. Levin wrote:
Hi,
On Tue, Sep 29, 2009 at 04:10:48AM +0400, Dmitry V. Levin wrote:
On Tue, Sep 22, 2009 at 01:04:45AM +0200, Frederik Schüler wrote:
[...]
I attached my current diff, you might want to crosscheck, waiting for
debian
hppa porters to confirm the issues are fixed.
Is there any feedback from hppa porters?
Well, I see no feedback from hppa porters so far.
What we are going to do with hppa changes and 4.5.19 release?
--
ldv
--
ENOSIG
commit 15e2b7ef1ebb1c619c602c1855e65ac75cef6fa8
Author: Frederik Schüler f...@debian.org
Date: Mon Oct 5 22:50:07 2009 +0200
Fix HPPA issues and prepare Debian release.
This patch is based on the work of Carlos O'Donell car...@systemhalted.org
and Helge Deller del...@gmx.de, found in the Debian Bugs #546619
and #437928.
* ipc.c: HPPA does not use an IPC multiplexer.
* linux/hppa/syscallent.h: add missing syscalls.
* signal.c: architectures using function pointers, like hppa, may need to
manipulate the function pointer to compute the result of a comparison.
However, the SA_HANDLER function pointer exists only in the address space
of the traced process, and can't be manipulated by strace. In order to
prevent the compiler from generating code to manipulate SA_HANDLER we cast
the function pointers to long.
* syscall.c: more than maximum number of syscall arguments accessed causing
upeek failures.
* debian/rules: don't ship ChangeLog anymore, deprecated.
* debian/control: update to Debian standards version 3.8.1, and remove Roland
from the Maintainers list. This closes Debian #521458
* debian/changelog: document changes and prepare for release.
diff --git a/debian/changelog b/debian/changelog
index c351178..3785d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
strace (4.5.19-1) unstable; urgency=low
+ [ Dmitry V. Levin ]
* New upstream release.
+ Fixed FTBFS on armel, closes: #520084, #535564
+ Marked sendfile(2) as a network syscall, closes: #509499
@@ -7,7 +8,14 @@ strace (4.5.19-1) unstable; urgency=low
+ Changed strace to exit/kill with traced process
exitcode/signal, closes: #37665
- -- Dmitry V. Levin l...@altlinux.org Mon, 14 Sep 2009 12:34:56 +
+ [ Frederik Schüler ]
+ * Move myself from uploaders to maintainers, and drop Roland from the list,
+closes: #521458
+ * Apply hppa fixes, thanks to Carlos O'Donell car...@systemhalted.org
+and Helge Deller del...@gmx.de for the fixes, closes: #546619, #437928
+ * Update standards-version to 3.8.1.
+
+ -- Frederik Schüler f...@debian.org Mon, 05 Oct 2009 22:39:54 +0200
strace (4.5.18-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6ad7cb9..da46c25 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
Source: strace
-Maintainer: Roland McGrath f...@debian.org
-Uploaders: Frederik Schüler f...@debian.org
+Maintainer: Frederik Schüler f...@debian.org
Section: utils
Priority: standard
Build-Depends: libc6-dev (= 2.2.2) [!alpha !ia64], libc6.1-dev (= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (= 7.0.0)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1.0
Homepage: http://sourceforge.net/projects/strace/
Package: strace
diff --git a/debian/rules b/debian/rules
index 791f5ef..8f9f316 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ binary-arch: build checkroot
dh_installdocs -s
dh_installman -s
dh_installexamples -s
- dh_installchangelogs -s ChangeLog
+ dh_installchangelogs -s
dh_install -s
dh_link -s
dh_strip -s
diff --git a/ipc.c b/ipc.c
index ab29412..bc40805 100644
--- a/ipc.c
+++ b/ipc.c
@@ -387,7 +387,8 @@ struct tcb *tcp;
}
if (syserror(tcp))
return 0;
-#ifdef LINUX
+/* HPPA does not use an IPC multiplexer. */
+#ifdef LINUX !defined(HPPA)
if (umove(tcp, tcp-u_arg[2], raddr) 0)
return RVAL_NONE;
tcp-u_rval = raddr;
diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index c8ff52e..0906b58 100644
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -197,10 +197,10 @@
{ 4, TI, sys_msgrcv, msgrcv }, /* 189 */
{ 4, TI, sys_msgget, msgget }, /* 190 */
{ 4, TI, sys_msgctl, msgctl }, /* 191 */
- { 4, TI, sys_shmat, shmat }, /* 192 */
- { 4, TI, sys_shmdt, shmdt }, /* 193 */
- { 4, TI, sys_shmget, shmget }, /* 194 */
- { 4, TI, sys_shmctl, shmctl }, /* 195 */
+ { 3, TI, sys_shmat, shmat }, /* 192 */
+ { 1, TI, sys_shmdt, shmdt }, /* 193 */
+ { 3, TI, sys_shmget, shmget }, /* 194 */
+ { 3, TI, sys_shmctl, shmctl }, /* 195 */
{ 5, 0, sys_getpmsg, getpmsg },
Re: preparing to 4.5.19 release
On Tue, Oct 06, 2009 at 01:30:07AM +0400, Dmitry V. Levin wrote: On Mon, Oct 05, 2009 at 11:10:09PM +0200, Frederik Schüler wrote: I did the checks myself now, thanks to debian porters machines. armel build fixes confirmed. hppa issues fixed and tested, patch attached. I hope the format is ok, this is my first official git commit ;) Thank you. To speedup things, I'm going to split the patch and adjust format myself. I've just pushed corrected hppa fixes to ldv/hppa branch, and debian/* files update (applied on top of hppa fixes) -- to ldv/debian branch: http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=shortlog;h=ldv/debian Please test. -- ldv pgprL7BrwnFIX.pgp Description: PGP signature -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Roland McGrath rol...@redhat.com writes: Andreas, please look it over. It also wouldn't hurt to do a round-up of the open Fedora bugs, make sure the ones fixed in this release are mentioned in the log so we close them with the Fedora update, and list here pending ones not yet fixed so we can start tying those up after 4.5.19. AFAICS all fedora bugs are covered, the only major issue left is the SIGTRAP handling. Andreas. -- Andreas Schwab, sch...@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E And now for something completely different. -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
AFAICS all fedora bugs are covered, the only major issue left is the SIGTRAP handling. Great! I think we should leave that slightly hairy issue for after this release, so I think we are about ready to go. It would sure be nice to hear from Frederik... Thanks, Roland -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Hi! On Monday 21 September 2009 22:40:34 Dmitry V. Levin wrote: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520084 I believe it was fixed already, so I added closes: #520084 to the debian/changelog file last Monday. Yes confirmed, the patch is already in git. I attached my current diff, you might want to crosscheck, waiting for debian hppa porters to confirm the issues are fixed. Best regards Frederik Schüler -- ENOSIG strace-hppa.diff.gz Description: GNU Zip compressed data signature.asc Description: This is a digitally signed message part. -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
Done, please review: http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=ldv/release I probably missed some noteworthy changes, feel free to add/correct. Looks good to me! Thanks! Go ahead and merge it and we can add any follow-on changes as needed. Andreas, please look it over. It also wouldn't hurt to do a round-up of the open Fedora bugs, make sure the ones fixed in this release are mentioned in the log so we close them with the Fedora update, and list here pending ones not yet fixed so we can start tying those up after 4.5.19. I had to update debian/* files from strace_4.5.18-1.diff.gz prior to this change, see http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=ldv/debian Where is Frederik? I'd asked him to push all debian/ updates to us as soon as they are ready. Thanks, Roland -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
Re: preparing to 4.5.19 release
On Tue, Sep 15, 2009 at 12:16:50AM +0400, Dmitry V. Levin wrote: On Mon, Sep 07, 2009 at 06:25:13PM -0700, Roland McGrath wrote: Two months ago I said that I'd like to see reintroduced one change (which was lost with big revert commit) made by Denys: Replace many more bare ptrace calls with calls to wrappers which do proper error-checking and set tcp-ptrace_errno. Unfortunately, I failed to allocate time required to implement and test it. Anyway, current HEAD is much better than last release made more than a year ago. Agreed. Let's not have any more delay. We can do all those things after the release. OK, I'll prepare update for NEWS and other release-related files now. Done, please review: http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=ldv/release I probably missed some noteworthy changes, feel free to add/correct. I had to update debian/* files from strace_4.5.18-1.diff.gz prior to this change, see http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=ldv/debian -- ldv pgp0FTDmZi3Bi.pgp Description: PGP signature -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf___ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
