From 652e9bf9e8946659f897ba5dacbd0bf587e83013 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 11 Dec 2020 04:53:25 -0800
Subject: [PATCH 1/3] kern: fix cfi (requires x18 not cleared on return to
 userland)

---
 .../libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
index 435cafb4a..79f2d511a 100644
--- a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
+++ b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
@@ -217,7 +217,6 @@ _ZN3ams4kern4arch5arm6412SvcHandler64Ev:
     mov     x15, xzr
     mov     x16, xzr
     mov     x17, xzr
-    mov     x18, xzr
 
     /* Return. */
     add     sp, sp, #0x120

From 569e1bc650f8d995b1392772a5b53fd0a05bbf3f Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 11 Dec 2020 04:59:20 -0800
Subject: [PATCH 2/3] kern: cfi fix pt 2

---
 .../libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
index 79f2d511a..3de6e3c88 100644
--- a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
+++ b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
@@ -201,6 +201,7 @@ _ZN3ams4kern4arch5arm6412SvcHandler64Ev:
     ldp     x30, x8,  [sp, #(8 * 30)]
     ldp     x9,  x10, [sp, #(8 * 32)]
     ldr     x11,      [sp, #(8 * 34)]
+    ldr     x18,      [sp, #(8 * 18)]
     msr     sp_el0, x8
     msr     elr_el1, x9
     msr     spsr_el1, x10

From 1ec2c0c2cb7a3b61a4ccb595f3149f1596d24d06 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 11 Dec 2020 05:02:58 -0800
Subject: [PATCH 3/3] git subrepo push libraries

subrepo:
  subdir:   "libraries"
  merged:   "59b4e750"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "59b4e750"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"
---
 libraries/.gitrepo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/.gitrepo b/libraries/.gitrepo
index d04a7ab3d..1a3528350 100644
--- a/libraries/.gitrepo
+++ b/libraries/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 5a18bea64545105c52d642d7789029b5ca875864
-	parent = 17c8c390fc84d059b89f563a8fae6936649d0d45
+	commit = 59b4e75021fbaf3fcf4c0e8dd2c07e309e1869d1
+	parent = 569e1bc650f8d995b1392772a5b53fd0a05bbf3f
 	method = merge
 	cmdver = 0.4.1