From de2c2af523596d0a602668a2f0cf71ada7567f6e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 6 Jul 2020 21:16:32 +0800
Subject: [PATCH] use new exception vectors

---
 default.nix        |  2 +-
 src/Cargo.lock     | 10 +++++-----
 src/runtime/link.x | 12 +-----------
 src/szl/link.x     | 12 +-----------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/default.nix b/default.nix
index 680769a..131f60c 100644
--- a/default.nix
+++ b/default.nix
@@ -15,7 +15,7 @@ let
       version = "0.1.0";
 
       src = ./src;
-      cargoSha256 = "1vapk3xjaj4q3xz312nwwbdb7c9fr4439x2rchigh21d5yqfdpr7";
+      cargoSha256 = "0pzk76a47fn6haiw300084c925wx6j40i8k3kmv5rlczg30c6zk7";
 
       nativeBuildInputs = [
         pkgs.gnumake
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 6fb9bb7..e73662a 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -200,7 +200,7 @@ dependencies = [
 [[package]]
 name = "libasync"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#f68b5896ce9287900f585723e76558f4755cbd78"
 dependencies = [
  "embedded-hal",
  "libcortex_a9",
@@ -212,7 +212,7 @@ dependencies = [
 [[package]]
 name = "libboard_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#f68b5896ce9287900f585723e76558f4755cbd78"
 dependencies = [
  "bit_field",
  "embedded-hal",
@@ -236,7 +236,7 @@ dependencies = [
 [[package]]
 name = "libcortex_a9"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#f68b5896ce9287900f585723e76558f4755cbd78"
 dependencies = [
  "bit_field",
  "libregister",
@@ -245,7 +245,7 @@ dependencies = [
 [[package]]
 name = "libregister"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#f68b5896ce9287900f585723e76558f4755cbd78"
 dependencies = [
  "bit_field",
  "vcell",
@@ -255,7 +255,7 @@ dependencies = [
 [[package]]
 name = "libsupport_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#f68b5896ce9287900f585723e76558f4755cbd78"
 dependencies = [
  "compiler_builtins",
  "libboard_zynq",
diff --git a/src/runtime/link.x b/src/runtime/link.x
index 615d2ed..91159ad 100644
--- a/src/runtime/link.x
+++ b/src/runtime/link.x
@@ -1,14 +1,4 @@
-ENTRY(_boot_cores);
-
-/* Provide some defaults */
-PROVIDE(Reset = _boot_cores);
-PROVIDE(UndefinedInstruction = Reset);
-PROVIDE(SoftwareInterrupt = Reset);
-PROVIDE(PrefetchAbort = Reset);
-PROVIDE(DataAbort = Reset);
-PROVIDE(ReservedException = Reset);
-PROVIDE(IRQ = Reset);
-PROVIDE(FIQ = Reset);
+ENTRY(Reset);
 
 MEMORY
 {
diff --git a/src/szl/link.x b/src/szl/link.x
index 3dfe31c..d8f6782 100644
--- a/src/szl/link.x
+++ b/src/szl/link.x
@@ -1,14 +1,4 @@
-ENTRY(_boot_cores);
-
-/* Provide some defaults */
-PROVIDE(Reset = _boot_cores);
-PROVIDE(UndefinedInstruction = Reset);
-PROVIDE(SoftwareInterrupt = Reset);
-PROVIDE(PrefetchAbort = Reset);
-PROVIDE(DataAbort = Reset);
-PROVIDE(ReservedException = Reset);
-PROVIDE(IRQ = Reset);
-PROVIDE(FIQ = Reset);
+ENTRY(Reset);
 
 MEMORY
 {