Somehow the old builder.dic managed to have two copies of the tokenizer code compiled in at the same time. Fixed that.
cpu/x86/build/builder.dic