(synch patches using update-patches, no functional changes)
this should more or less compile and run tests on i386, but is not guaranteed to do anything more yet...