From 82a165d9be60be33af5092543e60a3fff82ef07e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 27 Feb 2014 18:01:43 +0200
Subject: [PATCH] nlr.h: Do proper arch selection, using the same tests as
 nlr*.S .

---
 py/nlr.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/py/nlr.h b/py/nlr.h
index 8ca8a9dc62..4cc66d8c20 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -3,23 +3,19 @@
 
 #include <limits.h>
 
-//#ifndef __WORDSIZE
-//#error __WORDSIZE needs to be defined
-//#endif
-
 typedef struct _nlr_buf_t nlr_buf_t;
 struct _nlr_buf_t {
     // the entries here must all be machine word size
     nlr_buf_t *prev;
     void *ret_val;
-#if __WORDSIZE == 32
+#if defined(__i386__)
     void *regs[6];
-#elif __WORDSIZE == 64
+#elif defined(__x86_64__)
     void *regs[8];
-#else
-    // hack for thumb
+#elif defined(__thumb2__)
     void *regs[10];
-//#error Unsupported __WORDSIZE
+#else
+#error Unknown arch in nlr.h
 #endif
 };