Merge 3.4 (faulthandler)

diff --cc Modules/faulthandler.c
index 568724b6f1710c2d565015bd706521569c7c98fd,01e7beb25500c00e5e47564eb56228120eafd6bf..6f7c71de1e1d7eb975e6459b27342f3694b7e175
--- 1/Modules/faulthandler.c
--- 2/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@@ -945,9 -929,9 +945,10 @@@ static PyObject 
  faulthandler_stack_overflow(PyObject *self)
  {
      size_t depth, size;
-     char *sp = (char *)&depth, *stop;
+     Py_uintptr_t sp = (Py_uintptr_t)&depth;
+     Py_uintptr_t stop;
  
 +    faulthandler_suppress_crash_report();
      depth = 0;
      stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,
                            sp + STACK_OVERFLOW_MAX_SIZE,