| Index: src/assembler.cc | 
| diff --git a/src/assembler.cc b/src/assembler.cc | 
| index c11882405a25dd93bfcf9fcf0677c4e3bba00b99..ff5816b21e59cc2390ba8d020e4b42866a7ff730 100644 | 
| --- a/src/assembler.cc | 
| +++ b/src/assembler.cc | 
| @@ -77,6 +77,8 @@ | 
| #include "src/mips/assembler-mips-inl.h"  // NOLINT | 
| #elif V8_TARGET_ARCH_MIPS64 | 
| #include "src/mips64/assembler-mips64-inl.h"  // NOLINT | 
| +#elif V8_TARGET_ARCH_S390 | 
| +#include "src/s390/assembler-s390-inl.h"  // NOLINT | 
| #elif V8_TARGET_ARCH_X87 | 
| #include "src/x87/assembler-x87-inl.h"  // NOLINT | 
| #else | 
| @@ -99,6 +101,8 @@ | 
| #include "src/regexp/mips/regexp-macro-assembler-mips.h"  // NOLINT | 
| #elif V8_TARGET_ARCH_MIPS64 | 
| #include "src/regexp/mips64/regexp-macro-assembler-mips64.h"  // NOLINT | 
| +#elif V8_TARGET_ARCH_S390 | 
| +#include "src/regexp/s390/regexp-macro-assembler-s390.h"  // NOLINT | 
| #elif V8_TARGET_ARCH_X87 | 
| #include "src/regexp/x87/regexp-macro-assembler-x87.h"  // NOLINT | 
| #else  // Unknown architecture. | 
| @@ -1498,6 +1502,8 @@ ExternalReference ExternalReference::re_check_stack_guard_state( | 
| function = FUNCTION_ADDR(RegExpMacroAssemblerMIPS::CheckStackGuardState); | 
| #elif V8_TARGET_ARCH_MIPS64 | 
| function = FUNCTION_ADDR(RegExpMacroAssemblerMIPS::CheckStackGuardState); | 
| +#elif V8_TARGET_ARCH_S390 | 
| +  function = FUNCTION_ADDR(RegExpMacroAssemblerS390::CheckStackGuardState); | 
| #elif V8_TARGET_ARCH_X87 | 
| function = FUNCTION_ADDR(RegExpMacroAssemblerX87::CheckStackGuardState); | 
| #else | 
|  |