x86: i386_generate_nops() may not derive decisions from global variables What matters is what was in effect at the time the original directive was issued. Later changes to global state (bitness or ISA) must not affect what code is generated.