Reviewers: Mads Ager, Description: Fix the xcode build by not including x64 specific code when generating 32 bit code.
Please review this at http://codereview.chromium.org/6249002/ SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/ia32/deoptimizer-ia32.cc M src/ia32/lithium-codegen-ia32.cc M src/ia32/lithium-ia32.cc M src/x64/deoptimizer-x64.cc M src/x64/lithium-codegen-x64.cc M src/x64/lithium-x64.cc Index: src/ia32/deoptimizer-ia32.cc =================================================================== --- src/ia32/deoptimizer-ia32.cc (revision 6298) +++ src/ia32/deoptimizer-ia32.cc (working copy) @@ -27,6 +27,8 @@ #include "v8.h" +#if defined(V8_TARGET_ARCH_IA32) + #include "codegen.h" #include "deoptimizer.h" #include "full-codegen.h" @@ -618,3 +620,5 @@ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 Index: src/ia32/lithium-codegen-ia32.cc =================================================================== --- src/ia32/lithium-codegen-ia32.cc (revision 6298) +++ src/ia32/lithium-codegen-ia32.cc (working copy) @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_IA32) + #include "ia32/lithium-codegen-ia32.h" #include "code-stubs.h" #include "stub-cache.h" @@ -3482,3 +3486,5 @@ #undef __ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 Index: src/ia32/lithium-ia32.cc =================================================================== --- src/ia32/lithium-ia32.cc (revision 6298) +++ src/ia32/lithium-ia32.cc (working copy) @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_IA32) + #include "ia32/lithium-ia32.h" #include "ia32/lithium-codegen-ia32.h" @@ -1874,3 +1878,5 @@ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 Index: src/x64/deoptimizer-x64.cc =================================================================== --- src/x64/deoptimizer-x64.cc (revision 6298) +++ src/x64/deoptimizer-x64.cc (working copy) @@ -27,6 +27,8 @@ #include "v8.h" +#if defined(V8_TARGET_ARCH_X64) + #include "codegen.h" #include "deoptimizer.h" #include "full-codegen.h" @@ -75,3 +77,5 @@ } } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64 Index: src/x64/lithium-codegen-x64.cc =================================================================== --- src/x64/lithium-codegen-x64.cc (revision 6298) +++ src/x64/lithium-codegen-x64.cc (working copy) @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_X64) + #include "x64/lithium-codegen-x64.h" #include "code-stubs.h" #include "stub-cache.h" @@ -1125,3 +1129,5 @@ #undef __ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64 Index: src/x64/lithium-x64.cc =================================================================== --- src/x64/lithium-x64.cc (revision 6298) +++ src/x64/lithium-x64.cc (working copy) @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_X64) + #include "x64/lithium-x64.h" #include "x64/lithium-codegen-x64.h" @@ -1314,3 +1318,5 @@ } } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
