From 21f099bac3bc94dbdca6d52f1c996446a6ad2d83 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Wed, 11 Aug 2010 16:49:42 -0700
Subject: [PATCH] Bug 585818 - Export CPU_ARCH and define INTEL_ARCHITECTURE to
 the build. r=khuey, a2.0=bsmedberg

--HG--
extra : rebase_source : 70993b47ea8843a02dc2143e344ecd40412ece39
---
 config/autoconf.mk.in        |  2 ++
 configure.in                 | 10 ++++++++++
 js/src/config/autoconf.mk.in |  2 ++
 js/src/configure.in          | 10 ++++++++++
 4 files changed, 24 insertions(+)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 725d96a9530..f9bd445c7e7 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -606,6 +606,8 @@ OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
+CPU_ARCH=@CPU_ARCH@
+INTEL_ARCHITECTURE=@INTEL_ARCHITECTURE@
 
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
diff --git a/configure.in b/configure.in
index c16f4c7de91..4a76d3c7434 100644
--- a/configure.in
+++ b/configure.in
@@ -1563,6 +1563,14 @@ if test -z "$OS_TARGET"; then
 fi
 OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
 
+dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
+dnl ===============================================================
+INTEL_ARCHITECTURE=
+case "$OS_TEST" in
+    x86_64|i?86)
+      INTEL_ARCHITECTURE=1
+esac
+
 dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================
@@ -9122,6 +9130,8 @@ AC_SUBST(OS_TARGET)
 AC_SUBST(OS_ARCH)
 AC_SUBST(OS_RELEASE)
 AC_SUBST(OS_TEST)
+AC_SUBST(CPU_ARCH)
+AC_SUBST(INTEL_ARCHITECTURE)
 
 AC_SUBST(MOZ_DISABLE_JAR_PACKAGING)
 AC_SUBST(MOZ_CHROME_FILE_FORMAT)
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 28c3ea06968..0e7d1c2ee4a 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -295,6 +295,8 @@ OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
 OS_TEST=@OS_TEST@
+CPU_ARCH=@CPU_ARCH@
+INTEL_ARCHITECTURE=@INTEL_ARCHITECTURE@
 
 # For Solaris build
 SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
diff --git a/js/src/configure.in b/js/src/configure.in
index 2de9f0fb9fe..94f0f60a0b7 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1539,6 +1539,14 @@ if test -z "$OS_TARGET"; then
 fi
 OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
 
+dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
+dnl ===============================================================
+INTEL_ARCHITECTURE=
+case "$OS_TEST" in
+    x86_64|i?86)
+      INTEL_ARCHITECTURE=1
+esac
+
 dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================
@@ -5745,6 +5753,8 @@ AC_SUBST(OS_TARGET)
 AC_SUBST(OS_ARCH)
 AC_SUBST(OS_RELEASE)
 AC_SUBST(OS_TEST)
+AC_SUBST(CPU_ARCH)
+AC_SUBST(INTEL_ARCHITECTURE)
 
 AC_SUBST(WRAP_MALLOC_CFLAGS)
 AC_SUBST(WRAP_MALLOC_LIB)