1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
diff --git a/lib/Makefile b/lib/Makefile
index f364b619..854357db 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -117,10 +117,10 @@ YASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I $i)
NASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I$i/)
ifneq ($(MINGW),0)
YASM_FLAGS := -f x64 -f win64 -X gnu -g dwarf2 -DWIN_ABI $(YASM_INCLUDES)
-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
+NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
else
YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ $(YASM_INCLUDES)
-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
+NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
endif
DEBUG_OPT ?= -O0
@@ -170,7 +170,6 @@ endif
# prevent SIMD optimizations for non-aesni modules
CFLAGS_NO_SIMD = $(CFLAGS) -O1
-CFLAGS += $(OPT)
# Set generic architectural optimizations
OPT_X86 := -msse4.2
@@ -746,7 +745,7 @@ install: $(LIB_DIR)/$(LIBNAME)
install -m 0444 $(MAN2) $(MAN_DIR)
install -d $(LIB_INSTALL_DIR)
ifeq ($(SHARED),y)
- install -s -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
+ install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
else
# must not strip symbol table for static libs
install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
diff --git a/lib/win_x64.mak b/lib/win_x64.mak
index 17c58f72..93da855a 100644
--- a/lib/win_x64.mak
+++ b/lib/win_x64.mak
@@ -131,7 +131,7 @@ LINK_TOOL = link
LINKFLAGS = $(DLFLAGS) /nologo /machine:X64
AS = nasm
-AFLAGS = $(DAFLAGS) -Werror -fwin64 -Xvc -DWIN_ABI -Iinclude/ \
+AFLAGS = $(DAFLAGS) -fwin64 -Xvc -DWIN_ABI -Iinclude/ \
-I./ -Iavx/ -Iavx2/ -Iavx512/ -Isse/
# dependency
diff --git a/perf/Makefile b/perf/Makefile
index f204e575..9db08180 100644
--- a/perf/Makefile
+++ b/perf/Makefile
@@ -45,9 +45,9 @@ endif
ifeq ($(MINGW),0)
CFLAGS += -DLINUX
-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
else
-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
+NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
endif
# if "-z ibt" is supported then assume "-z shstk, -z cet-report=error" are also supported
@@ -62,21 +62,21 @@ CFLAGS += -fcf-protection=full
endif
ifeq ($(MINGW),0)
-LDFLAGS = -fPIE -z noexecstack -z relro -z now -pthread
+LDFLAGS += -fPIE -z noexecstack -z relro -z now -pthread
endif
ifeq ($(CC_HAS_CET),1)
LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
endif
LDLIBS = -lIPSec_MB
-ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
+#ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
# library installed
-CFLAGS +=
-else
+#CFLAGS +=
+#else
# library not installed
CFLAGS += -I../lib/include -I../lib
LDFLAGS += -L$(LIB_DIR)
-endif
+#endif
DEBUG_OPT ?= -O0
ifeq ($(DEBUG),y)
diff --git a/perf/win_x64.mak b/perf/win_x64.mak
index b0b864db..03c3b584 100644
--- a/perf/win_x64.mak
+++ b/perf/win_x64.mak
@@ -75,7 +75,7 @@ LNK = link
LFLAGS = /out:$(APP).exe $(DLFLAGS)
AS = nasm
-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI
+AFLAGS = -fwin64 -Xvc -DWIN_ABI
OBJECTS = ipsec_perf.obj msr.obj misc.obj
diff --git a/test/Makefile b/test/Makefile
index b03700a5..380a954a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -66,15 +66,15 @@ endif
YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__
ifeq ($(MINGW),0)
CFLAGS += -DLINUX
-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
else
-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
+NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
endif
ifeq ($(MINGW),0)
-LDFLAGS = -fPIE -z noexecstack -z relro -z now
+LDFLAGS += -fPIE -z noexecstack -z relro -z now
else
-LDFLAGS = -fPIE
+LDFLAGS += -fPIE
endif
ifeq ($(CC_HAS_CET),1)
@@ -82,14 +82,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
endif
LDLIBS = -lIPSec_MB
-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
+#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
# library installed
-CFLAGS +=
-else
+#CFLAGS +=
+#else
# library not installed
CFLAGS += -I../lib/include -I../lib
LDFLAGS += -L$(LIB_DIR)
-endif
+#endif
FUZZ_CFLAGS = -I../lib -L../lib $(CFLAGS) -g -fsanitize=fuzzer,address,leak
diff --git a/test/win_x64.mak b/test/win_x64.mak
index a3bd0b00..a7ff51f5 100644
--- a/test/win_x64.mak
+++ b/test/win_x64.mak
@@ -74,7 +74,7 @@ TEST_LFLAGS = /out:$(TEST_APP).exe $(DLFLAGS)
XVALID_LFLAGS = /out:$(XVALID_APP).exe $(DLFLAGS)
AS = nasm
-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI
+AFLAGS = -fwin64 -Xvc -DWIN_ABI
# dependency
!ifndef DEPTOOL
|
