The only thing about this patch that looks odd is ARMGenericBuildAttrInfo. Why do you have a class with every valid tag as a member? Can't you return a list of (tag, value) pairs? Is ARMBuildAttrs.h now redundant? Can it be removed? Cheers, Rafael