I'm anxious to resume "the enhancements to Icarus Verilog that will allow it to compile parts of OpenSPARC T1 that it did not understand when I began the project". I have finally switched to OpenSPARC T1 chip design 1.6 release. The current problem is:

jesus% git pull
remote: Counting objects: 89, done.
remote: Compressing objects: 100% (57/57), done.
Unpacking 57 objects...
remote: Total 57 (delta 50), reused 0 (delta 0)
100% (57/57) done
* refs/remotes/origin/master: fast forward to branch 'master' of git://icarus.com/~steve-icarus/verilog
old..new: e5ce883..497e095
autoconf.sh: needs update
config.guess: needs update
config.sub: needs update
install-sh: needs update
iverilog-vpi.sh: needs update
libveriuser/mkinstalldirs: needs update
mkinstalldirs: needs update
solaris/mksolpkg: needs update
vpip/mkinstalldirs: needs update
vvp/config.guess: needs update
vvp/config.sub: needs update
vvp/install-sh: needs update
vvp/mkinstalldirs: needs update
xnf2pcf.sh: needs update
fatal: Entry 'iverilog-vpi.sh' not uptodate. Cannot merge.
Merge with strategy recursive failed.

I'll need to investigate.