From 9c780b64e5d428360a5716059dc878827ca080ac Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Thu, 8 Mar 2012 20:51:37 +0000
Subject: [PATCH] Don't use -m32 on arm.  This is a more correct version of
 r77216.

[SVN r77275]
---
 v2/tools/gcc.jam | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index f2cc572d3..7c895d696 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -446,13 +446,17 @@ rule setup-address-model ( targets * : sources * : properties * )
         }
         else
         {
-            if $(model) = 32
+            local arch = [ feature.get-values architecture : $(properties) ] ;
+            if $(arch) != arm
             {
-                option = -m32 ;
-            }
-            else if $(model) = 64
-            {
-                option = -m64 ;
+                if $(model) = 32
+                {
+                    option = -m32 ;
+                }
+                else if $(model) = 64
+                {
+                    option = -m64 ;
+                }
             }
             # For darwin, the model can be 32_64. darwin.jam will handle that
             # on its own.