From c255fba681cde4b1ea0657f667e896d68e7f5595 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 5 Jul 2013 08:15:32 +0000 Subject: [PATCH] Merge two lines into one for V8_TARGET_ARCH_${arch} and V8_HOST_ARCH_${arch} R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/18575003 Patch from Haitao Feng . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15500 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/atomicops.h | 9 +++------ src/strtod.cc | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/atomicops.h b/src/atomicops.h index b18b54d..789721e 100644 --- a/src/atomicops.h +++ b/src/atomicops.h @@ -153,14 +153,11 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // Include our platform specific implementation. #if defined(THREAD_SANITIZER) #include "atomicops_internals_tsan.h" -#elif defined(_MSC_VER) && \ - (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) +#elif defined(_MSC_VER) && (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) #include "atomicops_internals_x86_msvc.h" -#elif defined(__APPLE__) && \ - (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) +#elif defined(__APPLE__) && (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) #include "atomicops_internals_x86_macosx.h" -#elif defined(__GNUC__) && \ - (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) +#elif defined(__GNUC__) && (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64) #include "atomicops_internals_x86_gcc.h" #elif defined(__GNUC__) && V8_HOST_ARCH_ARM #include "atomicops_internals_arm_gcc.h" diff --git a/src/strtod.cc b/src/strtod.cc index a1774b6..b5fd414 100644 --- a/src/strtod.cc +++ b/src/strtod.cc @@ -175,8 +175,7 @@ static void ReadDiyFp(Vector buffer, static bool DoubleStrtod(Vector trimmed, int exponent, double* result) { -#if (V8_TARGET_ARCH_IA32 || defined(USE_SIMULATOR)) \ - && !defined(_MSC_VER) +#if (V8_TARGET_ARCH_IA32 || defined(USE_SIMULATOR)) && !defined(_MSC_VER) // On x86 the floating-point stack can be 64 or 80 bits wide. If it is // 80 bits wide (as is the case on Linux) then double-rounding occurs and the // result is not accurate. -- 2.7.4