| Index: src/macro-assembler.h | 
| diff --git a/src/macro-assembler.h b/src/macro-assembler.h | 
| index e4315163ac88f27ba37d84af7b7f263ebdad9439..a11afd863bb09910ae6008a203912e058b014315 100644 | 
| --- a/src/macro-assembler.h | 
| +++ b/src/macro-assembler.h | 
| @@ -38,45 +38,45 @@ enum AllocationFlags { | 
| const int kInvalidProtoDepth = -1; | 
|  | 
| #if V8_TARGET_ARCH_IA32 | 
| -#include "assembler.h" | 
| -#include "ia32/assembler-ia32.h" | 
| -#include "ia32/assembler-ia32-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "ia32/macro-assembler-ia32.h" | 
| +#include "src/assembler.h" | 
| +#include "src/ia32/assembler-ia32.h" | 
| +#include "src/ia32/assembler-ia32-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/ia32/macro-assembler-ia32.h" | 
| #elif V8_TARGET_ARCH_X64 | 
| -#include "assembler.h" | 
| -#include "x64/assembler-x64.h" | 
| -#include "x64/assembler-x64-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "x64/macro-assembler-x64.h" | 
| +#include "src/assembler.h" | 
| +#include "src/x64/assembler-x64.h" | 
| +#include "src/x64/assembler-x64-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/x64/macro-assembler-x64.h" | 
| #elif V8_TARGET_ARCH_ARM64 | 
| -#include "arm64/constants-arm64.h" | 
| -#include "assembler.h" | 
| -#include "arm64/assembler-arm64.h" | 
| -#include "arm64/assembler-arm64-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "arm64/macro-assembler-arm64.h" | 
| -#include "arm64/macro-assembler-arm64-inl.h" | 
| +#include "src/arm64/constants-arm64.h" | 
| +#include "src/assembler.h" | 
| +#include "src/arm64/assembler-arm64.h" | 
| +#include "src/arm64/assembler-arm64-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/arm64/macro-assembler-arm64.h" | 
| +#include "src/arm64/macro-assembler-arm64-inl.h" | 
| #elif V8_TARGET_ARCH_ARM | 
| -#include "arm/constants-arm.h" | 
| -#include "assembler.h" | 
| -#include "arm/assembler-arm.h" | 
| -#include "arm/assembler-arm-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "arm/macro-assembler-arm.h" | 
| +#include "src/arm/constants-arm.h" | 
| +#include "src/assembler.h" | 
| +#include "src/arm/assembler-arm.h" | 
| +#include "src/arm/assembler-arm-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/arm/macro-assembler-arm.h" | 
| #elif V8_TARGET_ARCH_MIPS | 
| -#include "mips/constants-mips.h" | 
| -#include "assembler.h" | 
| -#include "mips/assembler-mips.h" | 
| -#include "mips/assembler-mips-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "mips/macro-assembler-mips.h" | 
| +#include "src/mips/constants-mips.h" | 
| +#include "src/assembler.h" | 
| +#include "src/mips/assembler-mips.h" | 
| +#include "src/mips/assembler-mips-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/mips/macro-assembler-mips.h" | 
| #elif V8_TARGET_ARCH_X87 | 
| -#include "assembler.h" | 
| -#include "x87/assembler-x87.h" | 
| -#include "x87/assembler-x87-inl.h" | 
| -#include "code.h"  // must be after assembler_*.h | 
| -#include "x87/macro-assembler-x87.h" | 
| +#include "src/assembler.h" | 
| +#include "src/x87/assembler-x87.h" | 
| +#include "src/x87/assembler-x87-inl.h" | 
| +#include "src/code.h"  // must be after assembler_*.h | 
| +#include "src/x87/macro-assembler-x87.h" | 
| #else | 
| #error Unsupported target architecture. | 
| #endif | 
|  |