Okay... I have attempted to add this to the "contributions" section on the "download" page... but can't get it to "go" at the moment... So:
(hope the "wrap" doesn't screw those up - you can figure it out...)
I think the "-2" version is (one day?) newer. Note that this patch is against an earlier version of Nasm than current. Here's hpa's advice on how to "rescue" a patch...
-------------------------
Also, note that I did run Nindent on the source before the release, so
that any new patches people produce will have the new formatting. There
are two tags in the tree:
before-reformat-2005-01
after-reformat-2005-01
... taken immediately before and after the indent.
If you have patches based on the old source, this is how to rescue them:
-> Check out one tree with cvs [blah] co -r before-reformat-2005-01 nasm
-> Check out one tree with cvs [blah] co -r after-reformat-2005-01 nasm
-> Apply your patches to the first tree.
-> COPY any modified files from the first tree to the second tree.
-> Run Nindent on the modified files.
-> Now you can "cvs update -d" in the second tree to bring it forward to
current time.
---------------------------------
If this is for your private use, it may not be neccessary to go through all this. If you think that "macho" ought to be actually added to Nasm, give us a hand with an "updated" patch, if you're able...
I'm delighted that Michael Weiser's (hope I've remembered that correctly) contribution is useful to someone. I'd be happy to discuss this further - here or on the nasm-devel list or privately, if you have/need anything further on the subject...
Best,
Frank