src/macro-assembler.h - Issue 99355: Introduce processor detection in globals.h, instead of from the build system.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/macro-assembler.h

Issue 99355: Introduce processor detection in globals.h, instead of from the build system. (Closed)

Patch Set: Guard 64-bit literals around 64-bit. Switch to long. Created 11 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/macro-assembler.h

diff --git a/src/macro-assembler.h b/src/macro-assembler.h

index 2d93dac841225ddce816afed6d53d48399f8f4d1..116381bb3164c5fc42f5b2955180f945598d6e7c 100644

--- a/src/macro-assembler.h

+++ b/src/macro-assembler.h

@@ -28,29 +28,25 @@

#ifndef V8_MACRO_ASSEMBLER_H_

#define V8_MACRO_ASSEMBLER_H_

-#ifdef V8_ARCH_ARM

-#include "arm/constants-arm.h"

+#if V8_TARGET_ARCH_IA32

#include "assembler.h"

-#include "arm/assembler-arm.h"

-#include "arm/assembler-arm-inl.h"

+#include "ia32/assembler-ia32.h"

+#include "ia32/assembler-ia32-inl.h"

#include "code.h" // must be after assembler_*.h

-#include "arm/macro-assembler-arm.h"

-#endif

-#ifdef V8_ARCH_X64

+#include "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"

-#endif

-#ifdef V8_ARCH_IA32

+#elif V8_TARGET_ARCH_ARM

+#include "arm/constants-arm.h"

#include "assembler.h"

-#include "ia32/assembler-ia32.h"

-#include "ia32/assembler-ia32-inl.h"

+#include "arm/assembler-arm.h"

+#include "arm/assembler-arm-inl.h"

#include "code.h" // must be after assembler_*.h

-#include "ia32/macro-assembler-ia32.h"

+#include "arm/macro-assembler-arm.h"

#endif

#endif // V8_MACRO_ASSEMBLER_H_

« no previous file with comments | « src/jsregexp.cc ('k') | src/objects.cc » ('j') | no next file with comments »