From e0af4e43399dbe914b097cdab9e5e5662c3948f1 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Sun, 3 Mar 2019 11:35:11 +0800 Subject: [PATCH] Support Armbian arm64 --- ReadMe.md | 1 + ReadMe_zh-CN.md | 1 + src/smartdns.c | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ReadMe.md b/ReadMe.md index ab7549e..7706853 100755 --- a/ReadMe.md +++ b/ReadMe.md @@ -131,6 +131,7 @@ Download the matching version of the SmartDNS installation package. The correspo |system |package|Description |-----|-----|----- |Standard Linux system (Raspberry Pi)| smartdns.xxxxxxxx.armhf.deb|Support Raspberry Pi Raspbian stretch, Debian 9 system. +|Standard Linux system (Armbian arm64)| smartdns.xxxxxxxx.arm64.deb|Support Armbian debian stretch, Debian 9 system. |Standard Linux system (x86_64)| smartdns.xxxxxxxx.x86_64.tar.gz|Support for x86_64 Linux systems. |Windows 10 WSL (Ubuntu)| smartdns.xxxxxxxx.x86_64.tar.gz|Windows 10 WSL ubuntu. |Standard Linux system (x86)| smartdns.xxxxxxxx.x86.tar.gz|Support for x86_64 systems. diff --git a/ReadMe_zh-CN.md b/ReadMe_zh-CN.md index e3b3e39..036b6ef 100644 --- a/ReadMe_zh-CN.md +++ b/ReadMe_zh-CN.md @@ -134,6 +134,7 @@ rtt min/avg/max/mdev = 5.954/6.133/6.313/0.195 ms |系统 |安装包|说明 |-----|-----|----- |标准Linux系统(树莓派)| smartdns.xxxxxxxx.armhf.deb|支持树莓派Raspbian stretch，Debian 9系统。 +|标准Linux系统(Armbian arm64)| smartdns.xxxxxxxx.arm64.deb|支持ARM64的Debian stretch，Debian 9系统。 |标准Linux系统(x86_64)| smartdns.xxxxxxxx.x86_64.tar.gz|支持x86_64 Linux 系统。 |Windows 10 WSL (ubuntu)| smartdns.xxxxxxxx.x86_64.tar.gz|支持Windows 10 WSL ubuntu系统。 |标准Linux系统(x86)| smartdns.xxxxxxxx.x86.tar.gz|支持x86系统。 diff --git a/src/smartdns.c b/src/smartdns.c index fc3ff32..4552124 100644 --- a/src/smartdns.c +++ b/src/smartdns.c @@ -290,8 +290,10 @@ static void _sig_error_exit(int signo, siginfo_t *siginfo, void *ct) #elif defined(__x86_64__) int *pgregs = (int *)(&(context->uc_mcontext.gregs)); PC = pgregs[REG_RIP]; -#elif defined(__aarch64__) || defined(__arm__) +#elif defined(__arm__) PC = context->uc_mcontext.arm_pc; +#elif defined(__aarch64__) + PC = context->uc_mcontext.pc; #elif defined(__mips__) PC = context->uc_mcontext.pc; #endif