upstream changes for src/platform-aix.cc