I put these in. For anything less trivial than that, it may be better to use override files in your add-on/sysdeps/.../power4/bits/atomic.h or the like (with #include_next). It's better to consolidate knowledge about those CPUs' details into the add-on's files whenever possible. Thanks, Roland