mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-07 04:53:44 +02:00
Merge pull request #848 from darkain/master
Fix compile on FreeBSD targeting ARMv6 (Raspberry Pi)
This commit is contained in:
commit
ef48d11266
4 changed files with 67 additions and 1 deletions
46
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
46
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Create a report to help us improve
|
||||||
|
|
||||||
|
---
|
||||||
|
**Alternative, faster ways to get help**
|
||||||
|
If you have just started using ZeroTier, here are some places to get help:
|
||||||
|
- my.zerotier.com has a _Community_ tab. It's a live chat with other users and the developers.
|
||||||
|
- [ZeroTier Knowledge Base](https://support.zerotier.com/knowledgebase.php?s=MQ__)
|
||||||
|
- www.zerotier.com has a Contact Us button
|
||||||
|
- email contact@zerotier.com
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
|
**To Reproduce**
|
||||||
|
Steps to reproduce the behavior:
|
||||||
|
1. Create a Network '...'
|
||||||
|
2. Install zerotier-one '....'
|
||||||
|
3. '....'
|
||||||
|
4. See error
|
||||||
|
|
||||||
|
**Expected behavior**
|
||||||
|
A clear and concise description of what you expected to happen.
|
||||||
|
|
||||||
|
**Screenshots**
|
||||||
|
If applicable, add screenshots or console output to help explain your problem.
|
||||||
|
|
||||||
|
**Desktop (please complete the following information):**
|
||||||
|
- OS: [e.g. Mac, Linux, Windows, BSD]
|
||||||
|
- OS/Distribution Version
|
||||||
|
- ZeroTier Version [e.g. 1.2.4]
|
||||||
|
- Hardware [e.g. raspberry pi 3]
|
||||||
|
|
||||||
|
**Smartphone (please complete the following information):**
|
||||||
|
- Device: [e.g. iPhone6]
|
||||||
|
- OS: [e.g. iOS8.1]
|
||||||
|
- Version [e.g. 1.2.4]
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context about the problem here.
|
||||||
|
- ZeroTier Network Configuration
|
||||||
|
- Router Config
|
||||||
|
- Firewall Config (try turning the firewall off)
|
||||||
|
- General Network Environment: [ e.g Home, University Campus, Corporate LAN ]
|
||||||
|
|
17
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
17
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
---
|
||||||
|
name: Feature request
|
||||||
|
about: Suggest an idea for this project
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Is your feature request related to a problem? Please describe.**
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
|
||||||
|
**Describe the solution you'd like**
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
|
||||||
|
**Describe alternatives you've considered**
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context or screenshots about the feature request here.
|
|
@ -5,8 +5,10 @@
|
||||||
#include <sys/auxv.h>
|
#include <sys/auxv.h>
|
||||||
#include <asm/hwcap.h>
|
#include <asm/hwcap.h>
|
||||||
#define zt_arm_has_neon() ((getauxval(AT_HWCAP) & HWCAP_NEON) != 0)
|
#define zt_arm_has_neon() ((getauxval(AT_HWCAP) & HWCAP_NEON) != 0)
|
||||||
#else
|
#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
|
||||||
#define zt_arm_has_neon() (true)
|
#define zt_arm_has_neon() (true)
|
||||||
|
#else
|
||||||
|
#define zt_arm_has_neon() (false)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -123,6 +123,7 @@ endif
|
||||||
ifeq ($(ZT_USE_ARM32_NEON_ASM_SALSA2012),1)
|
ifeq ($(ZT_USE_ARM32_NEON_ASM_SALSA2012),1)
|
||||||
override DEFS+=-DZT_USE_ARM32_NEON_ASM_SALSA2012
|
override DEFS+=-DZT_USE_ARM32_NEON_ASM_SALSA2012
|
||||||
override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
|
override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
|
||||||
|
override ASFLAGS+=-meabi=5
|
||||||
endif
|
endif
|
||||||
|
|
||||||
override DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
|
override DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
|
||||||
|
|
Loading…
Add table
Reference in a new issue