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
|
--- src/Makefile
+++ src/Makefile
@@ -6,7 +6,7 @@
#
CC = gcc
-STRIP = strip
+STRIP = true
AR = ar
RANLIB = ranlib
O = .o
@@ -15,7 +15,7 @@
E =
LIBRARY = libmatrixssl$(SO)
-STATIC = libmatrixsslstatic$(A)
+STATIC = libmatrixssl$(A)
OBJECTS = \
cipherSuite$(O) \
@@ -50,7 +50,6 @@
STRIP = test
else
#DFLAGS = -Os
-DFLAGS = -O3
endif
ifdef MATRIXSSL_PROFILE
@@ -62,14 +61,14 @@
# Override variables for compilation on x86-64 (AMD64, Nacona, etc)
#
ifeq ($(shell uname -m),x86_64)
-DFLAGS += -march=k8 -fPIC -DFP_64BIT -DTFM_X86_64 -DRDTSC
+DFLAGS += -DFP_64BIT -DTFM_X86_64 -DRDTSC
endif
#
# Compile options
#
-SHARED = -shared
+SHARED = -shared -Wl,-soname,$@
-CFLAGS = $(DFLAGS) -fPIC -DLINUX -I./
+CFLAGS += $(DFLAGS) -fPIC -DLINUX -I./
LDFLAGS += -lc -lpthread
#
--- src/os/linux/linux.c
+++ src/os/linux/linux.c
@@ -31,6 +31,8 @@
*/
/******************************************************************************/
#ifdef LINUX
+#define _XOPEN_SOURCE 600
+#include <strings.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
@@ -40,7 +42,6 @@
#include "../osLayer.h"
#if defined(USE_RDTSCLL_TIME) || defined(RDTSC)
-#include <asm/timex.h>
/*
As defined in asm/timex.h for x386:
*/
|
GitWeb
