aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/Kbuild
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-01-24 04:50:35 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2017-02-13 21:55:17 +0100
commitd78302d1ec947665f9d880e25b3a7e79fb56fc0e (patch)
treeb9d56e1b4ef5ae40e539a7a44b68651f43c078ee /src/Kbuild
parentsocket: synchronize net on socket tear down (diff)
downloadwireguard-monolithic-historical-d78302d1ec947665f9d880e25b3a7e79fb56fc0e.tar.xz
wireguard-monolithic-historical-d78302d1ec947665f9d880e25b3a7e79fb56fc0e.zip
compat: backport siphash & dst_cache from mainline
Diffstat (limited to 'src/Kbuild')
-rw-r--r--src/Kbuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Kbuild b/src/Kbuild
index 1f83d53..6425f6a 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -1,9 +1,9 @@
ccflags-y := -O3 -fvisibility=hidden
ccflags-$(CONFIG_WIREGUARD_DEBUG) := -DDEBUG -g
ccflags-y += -Wframe-larger-than=8192
-ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt' -include $(src)/compat.h
+ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
wireguard-y := main.o noise.o device.o peer.o timers.o data.o send.o receive.o socket.o config.o hashtables.o routingtable.o ratelimiter.o cookie.o
-wireguard-y += crypto/curve25519.o crypto/chacha20poly1305.o crypto/blake2s.o crypto/siphash.o
+wireguard-y += crypto/curve25519.o crypto/chacha20poly1305.o crypto/blake2s.o
ifeq ($(CONFIG_X86_64),y)
wireguard-y += crypto/chacha20-ssse3-x86_64.o crypto/poly1305-sse2-x86_64.o
avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1$(comma)4)$(comma)%ymm2,yes,no)
@@ -12,6 +12,8 @@ ifeq ($(avx2_supported),yes)
endif
endif
+include $(src)/compat/Kbuild.include
+
ifneq ($(KBUILD_EXTMOD),)
CONFIG_WIREGUARD := m
ifeq ($(CONFIG_WIREGUARD_PARALLEL),)