Dave, compared to your original patch (http://patchwork.freedesktop.org/patch/37363/), it seems the changes in src/gallium/drivers/r600/r600_llvm.c are missing in the commit.