-From 1c0a3b8bfe45eebe16cb034bb3f911f869840f33 Mon Sep 17 00:00:00 2001
+From 7852e18a504f8224cb3f8fa0127b885a7d5e3844 Mon Sep 17 00:00:00 2001
 From: Yvan Roux <yvan.roux@linaro.org>
-Date: Thu, 25 Apr 2013 12:26:20 +0200
+Date: Fri, 3 May 2013 15:51:14 +0200
 Subject: [PATCH] AArch64 port.
 
-Edited-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+Edited-by: Riku Voipio <riku.voipio@linaro.org>
 
 s/unreachable/_builtin_unreachable/ to get it working.
 
-Upstream-status: pending
+Upstream-status: Accepted (expected 1.2)
+
 ---
- Makefile.am                          |   6 +
- README                               |   1 +
- configure.ac                         |   7 +-
- include/libunwind-aarch64.h          | 186 ++++++++++++++++++++++
- include/libunwind.h.in               |   4 +-
- include/tdep-aarch64/dwarf-config.h  |  51 ++++++
- include/tdep-aarch64/jmpbuf.h        |  32 ++++
- include/tdep-aarch64/libunwind_i.h   | 294 +++++++++++++++++++++++++++++++++++
- include/tdep/dwarf-config.h          |   4 +-
- include/tdep/jmpbuf.h                |   2 +
- include/tdep/libunwind_i.h.in        |   4 +-
- src/Makefile.am                      |  38 ++++-
- src/aarch64/Gcreate_addr_space.c     |  59 +++++++
- src/aarch64/Gget_proc_info.c         |  39 +++++
- src/aarch64/Gget_save_loc.c          |  99 ++++++++++++
- src/aarch64/Gglobal.c                |  56 +++++++
- src/aarch64/Ginit.c                  | 186 ++++++++++++++++++++++
- src/aarch64/Ginit_local.c            |  55 +++++++
- src/aarch64/Ginit_remote.c           |  45 ++++++
- src/aarch64/Gis_signal_frame.c       |  63 ++++++++
- src/aarch64/Gregs.c                  | 112 +++++++++++++
- src/aarch64/Gresume.c                | 182 ++++++++++++++++++++++
- src/aarch64/Gstep.c                  | 129 +++++++++++++++
- src/aarch64/Lcreate_addr_space.c     |   5 +
- src/aarch64/Lget_proc_info.c         |   5 +
- src/aarch64/Lget_save_loc.c          |   5 +
- src/aarch64/Lglobal.c                |   5 +
- src/aarch64/Linit.c                  |   5 +
- src/aarch64/Linit_local.c            |   5 +
- src/aarch64/Linit_remote.c           |   5 +
- src/aarch64/Lis_signal_frame.c       |   5 +
- src/aarch64/Lregs.c                  |   5 +
- src/aarch64/Lresume.c                |   5 +
- src/aarch64/Lstep.c                  |   5 +
- src/aarch64/gen-offsets.c            |  68 ++++++++
- src/aarch64/init.h                   | 125 +++++++++++++++
- src/aarch64/is_fpreg.c               |  31 ++++
- src/aarch64/offsets.h                |  49 ++++++
- src/aarch64/regname.c                | 105 +++++++++++++
- src/aarch64/siglongjmp.S             |  12 ++
- src/aarch64/unwind_i.h               |  42 +++++
- src/coredump/_UCD_access_reg_linux.c |   5 +-
- src/ptrace/_UPT_reg_offset.c         |  35 +++++
- 43 files changed, 2174 insertions(+), 7 deletions(-)
+ Makefile.am                          |    6 +
+ README                               |    1 +
+ configure.ac                         |    6 +-
+ include/libunwind-aarch64.h          |  187 +++++++++++++++++++++
+ include/libunwind.h.in               |    4 +-
+ include/tdep-aarch64/dwarf-config.h  |   52 ++++++
+ include/tdep-aarch64/jmpbuf.h        |   33 ++++
+ include/tdep-aarch64/libunwind_i.h   |  294 ++++++++++++++++++++++++++++++++++
+ include/tdep/dwarf-config.h          |    4 +-
+ include/tdep/jmpbuf.h                |    2 +
+ include/tdep/libunwind_i.h.in        |    4 +-
+ src/Makefile.am                      |   39 ++++-
+ src/aarch64/Gcreate_addr_space.c     |   60 +++++++
+ src/aarch64/Gget_proc_info.c         |   39 +++++
+ src/aarch64/Gget_save_loc.c          |  100 ++++++++++++
+ src/aarch64/Gglobal.c                |   57 +++++++
+ src/aarch64/Ginit.c                  |  187 +++++++++++++++++++++
+ src/aarch64/Ginit_local.c            |   55 +++++++
+ src/aarch64/Ginit_remote.c           |   45 ++++++
+ src/aarch64/Gis_signal_frame.c       |   64 ++++++++
+ src/aarch64/Gregs.c                  |  113 +++++++++++++
+ src/aarch64/Gresume.c                |  177 ++++++++++++++++++++
+ src/aarch64/Gstep.c                  |  129 +++++++++++++++
+ src/aarch64/Lcreate_addr_space.c     |    5 +
+ src/aarch64/Lget_proc_info.c         |    5 +
+ src/aarch64/Lget_save_loc.c          |    5 +
+ src/aarch64/Lglobal.c                |    5 +
+ src/aarch64/Linit.c                  |    5 +
+ src/aarch64/Linit_local.c            |    5 +
+ src/aarch64/Linit_remote.c           |    5 +
+ src/aarch64/Lis_signal_frame.c       |    5 +
+ src/aarch64/Lregs.c                  |    5 +
+ src/aarch64/Lresume.c                |    5 +
+ src/aarch64/Lstep.c                  |    5 +
+ src/aarch64/gen-offsets.c            |   68 ++++++++
+ src/aarch64/init.h                   |  127 +++++++++++++++
+ src/aarch64/is_fpreg.c               |   32 ++++
+ src/aarch64/offsets.h                |   49 ++++++
+ src/aarch64/regname.c                |  106 ++++++++++++
+ src/aarch64/siglongjmp.S             |   12 ++
+ src/aarch64/unwind_i.h               |   43 +++++
+ src/coredump/_UCD_access_reg_linux.c |    5 +-
+ src/ptrace/_UPT_reg_offset.c         |   36 +++++
+ 43 files changed, 2184 insertions(+), 7 deletions(-)
  create mode 100644 include/libunwind-aarch64.h
  create mode 100644 include/tdep-aarch64/dwarf-config.h
  create mode 100644 include/tdep-aarch64/jmpbuf.h

 		$(libunwind_la_SOURCES_hppa)			\
 		$(libunwind_la_SOURCES_ia64)			\
 		$(libunwind_la_SOURCES_mips)			\
@@ -589,6 +624,7 @@ EXTRA_DIST =	$(libunwind_la_SOURCES_arm)			\
 		$(libunwind_la_SOURCES_common)			\
 		$(libunwind_la_SOURCES_local)			\
 		$(libunwind_la_SOURCES_generic)			\

   arm*) enable_cxx_exceptions=no;;
   mips*) enable_cxx_exceptions=no;;
   *) enable_cxx_exceptions=yes;;
diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h
new file mode 100644
index 0000000..d50da8f
--- /dev/null
+++ b/include/libunwind-aarch64.h
@@ -0,0 +1,187 @@
+/* libunwind - a platform-independent unwind library
+   Copyright (C) 2001-2004 Hewlett-Packard Co
+	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+   Copyright (C) 2013 Linaro Limited
+
+This file is part of libunwind.
+
