ODR warning for "struct instruction_type" "struct instruction_type" is defined in multiple .c files, causing an ODR warning. This patch renames the types. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395