import part of 586 revision patch for supporting QNX