Merge changes I9118a04f,I4b5239af into pi-dev

* changes:
  Fix Mac build: Don't use the CFI directives on Mac
  Support unwinding though the switch interpreter.