On Tue, Feb 25, 2014 at 11:49:30AM -0800, enh wrote:
[...]
> one reason we've lagged behind upstream in the past is that we've
> needed a lot of local hacks. some bionic's fault, some strace's. as
> part of the recent upgrade i fixed the stuff that was bionic's fault,
> and it looks like you've already fixed all the stuff on your side. i
> still have local hacks for PTRACE_PEEKUSER but they look like they're
> fixed at your head and i just need to wait for 4.9. the only remaining
> diff i have is that bionic doesn't have <scsi/sg.h> so we can't build
> scsi.c which means we can't refer to it in ioctl.c:
> 
> +#ifndef HAVE_ANDROID_OS
>   case 0x22:
>   return scsi_ioctl(tcp, code, arg);
> +#endif
> 
> if you could add a configure "HAVE_SCSI_SG_H" or somesuch, i think we

There is certainly no problem to add a check for <scsi/sg.h>.
I've just pushed commit v4.8-130-gfdb896e to fix this.

> could have no local diffs relative to 4.9. (for a while now i've been
> asking people who submit fixes to us to submit them to you instead,
> and then we cherrypick. chris.dearman's struct sigaction dumping fixes
> were the most recent example.)

Thanks.

> [full disclosure: i actually have a handful of other hacks in the makefile:
> # bionic doesn't have fputs_unlocked.
> LOCAL_CFLAGS += -Dfputs_unlocked=fputs
> # bionic doesn't have fopen64.
> LOCAL_CFLAGS += -Dfopen64=fopen

I've just pushed commit v4.8-132-gd354130 to handle this.

> # uapi's asm/sigcontext.h doesn't have sigcontext_struct.
> LOCAL_CFLAGS += -Dsigcontext_struct=sigcontext

This is already fixed in HEAD by commit v4.8-86-ge2de3bd.

> i could trivially add the last of these (and probably should), but our
> stdio is actually just OpenBSD's, and BSD was smart enough not to have
> a 32-bit off_t, so they don't have all the LFS64 crap. i think we're
> stuck with that hack until one fine day when we can retire LP32. they
> don't have the _unlocked stdio stuff either.
> ]

All build issues should be fixed in HEAD already, please give it a try.
I'd like to be sure we haven't added build regressions since v4.8.


-- 
ldv

Attachment: pgp_8d9U8RlQQ.pgp
Description: PGP signature

------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Strace-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/strace-devel

Reply via email to