From 6caae0bcb183fabd2bcf65c2ae2346b4e2d5cbe7 Mon Sep 17 00:00:00 2001
From: Antonin ENFRUN
Date: Sun, 11 May 2014 21:28:26 +0200
Subject: unix: Create __bss_start and _end symbols for Mach-O targets.

It's a hack, but can't find a cleaner way to do it.
---
 py/nlrx64.S | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'py')

diff --git a/py/nlrx64.S b/py/nlrx64.S
index 55cb4d796..baed6cabd 100644
--- a/py/nlrx64.S
+++ b/py/nlrx64.S
@@ -32,6 +32,10 @@
 
 #if !defined(__CYGWIN__)
 
+#if (defined(__APPLE__) && defined(__MACH__))
+#define nlr_jump_fail _nlr_jump_fail
+#endif // (defined(__APPLE__) && defined(__MACH__))
+
 /* uint nlr_push(rdi=nlr_buf_t *nlr) */
 #if !(defined(__APPLE__) && defined(__MACH__))
     .globl  nlr_push
-- 
cgit v1.2.3


From da1fffaa093d2541f7374a7aaf16d2f00ed29ddc Mon Sep 17 00:00:00 2001
From: Antonin ENFRUN
Date: Mon, 12 May 2014 00:21:50 +0200
Subject: Fix some unused variables, and silence a clang warning about
 initialization override in vmentrytable.h

---
 py/modmath.c      | 1 +
 py/objexcept.c    | 6 ++++--
 py/vmentrytable.h | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'py')

diff --git a/py/modmath.c b/py/modmath.c
index f2253ab41..485d9462a 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -151,6 +151,7 @@ STATIC const mp_map_elem_t mp_module_math_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_copysign), (mp_obj_t)&mp_math_copysign_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_fabs), (mp_obj_t)&mp_math_fabs_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_floor), (mp_obj_t)&mp_math_floor_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_fmod), (mp_obj_t)&mp_math_fmod_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_frexp), (mp_obj_t)&mp_math_frexp_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ldexp), (mp_obj_t)&mp_math_ldexp_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_modf), (mp_obj_t)&mp_math_modf_obj },
diff --git a/py/objexcept.c b/py/objexcept.c
index 60b3565f6..7f5f9c73d 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -168,11 +168,13 @@ MP_DEFINE_EXCEPTION(Exception, BaseException)
     MP_DEFINE_EXCEPTION(KeyError, LookupError)
   MP_DEFINE_EXCEPTION(MemoryError, Exception)
   MP_DEFINE_EXCEPTION(NameError, Exception)
+    /*
     MP_DEFINE_EXCEPTION_BASE(NameError)
-    //MP_DEFINE_EXCEPTION(UnboundLocalError, NameError)
+    MP_DEFINE_EXCEPTION(UnboundLocalError, NameError)
+    */
   MP_DEFINE_EXCEPTION(OSError, Exception)
-    MP_DEFINE_EXCEPTION_BASE(OSError)
     /*
+    MP_DEFINE_EXCEPTION_BASE(OSError)
     MP_DEFINE_EXCEPTION(BlockingIOError, OSError)
     MP_DEFINE_EXCEPTION(ChildProcessError, OSError)
     MP_DEFINE_EXCEPTION(ConnectionError, OSError)
diff --git a/py/vmentrytable.h b/py/vmentrytable.h
index 217d84d3f..598b5b872 100644
--- a/py/vmentrytable.h
+++ b/py/vmentrytable.h
@@ -24,6 +24,11 @@
  * THE SOFTWARE.
  */
 
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winitializer-overrides"
+#endif // __clang__
+ 
 static void* entry_table[256] = {
     [0 ... 255] = &&entry_default,
     [MP_BC_LOAD_CONST_FALSE] = &&entry_MP_BC_LOAD_CONST_FALSE,
@@ -110,3 +115,7 @@ static void* entry_table[256] = {
     [MP_BC_IMPORT_FROM] = &&entry_MP_BC_IMPORT_FROM,
     [MP_BC_IMPORT_STAR] = &&entry_MP_BC_IMPORT_STAR,
 };
+
+#if __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
-- 
cgit v1.2.3