Merge "remove unused cpi parameters from firstpass.c"