Log Message:
Put back a couple of IRIX conditionals the way they used to behave,
e.g. match IRIX 5.x but not 6.x. Some of these may indeed apply to 6.x
too, but let's be conservative. PR pkg/38224.