Some eddits to compile CompCert with trunk (not finished)