Upstream: macro-assembler-s390.cc, Fix macro-assembler-s390.h