upstream changes: 4771 OpenIndiana hipster: 32-bit distribution is broken

4771 OpenIndiana hipster: 32-bit distribution is broken, among others..