1 | 1 |
Last-Update: Tue, 14 Feb 2017 17:37:55 +0100
|
2 | 2 |
Description: Enable propagation of hardening options
|
3 | 3 |
|
4 | |
--- a/examl/Makefile.AVX.gcc
|
5 | |
+++ b/examl/Makefile.AVX.gcc
|
6 | |
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_O
|
|
4 |
--- examl.orig/examl/Makefile.AVX.gcc
|
|
5 |
+++ examl/examl/Makefile.AVX.gcc
|
|
6 |
@@ -8,7 +8,7 @@
|
7 | 7 |
OPT_FLAG_1 = -O1
|
8 | 8 |
OPT_FLAG_2 = -O2
|
9 | 9 |
|
|
12 | 12 |
|
13 | 13 |
LIBRARIES = -lm -mavx
|
14 | 14 |
|
15 | |
@@ -21,7 +21,7 @@ all : clean examl-AVX
|
|
15 |
@@ -21,13 +21,13 @@
|
16 | 16 |
GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
|
17 | 17 |
|
18 | 18 |
examl-AVX : $(objs)
|
|
20 | 20 |
+ $(CC) -o examl-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
|
21 | 21 |
|
22 | 22 |
avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
|
23 | |
$(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
|
24 | |
--- a/examl/Makefile.OMP.AVX.gcc
|
25 | |
+++ b/examl/Makefile.OMP.AVX.gcc
|
26 | |
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_U
|
|
23 |
- $(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
|
|
24 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
|
|
25 |
|
|
26 |
models.o : models.c $(GLOBAL_DEPS)
|
|
27 |
- $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
|
|
28 |
+ $(CC) $(CFLAGS) $(COMMON_FLAGS) $(OPT_FLAG_1) $(CPPFLAGS) -c -o models.o models.c
|
|
29 |
|
|
30 |
bipartitionList.o : bipartitionList.c $(GLOBAL_DEPS)
|
|
31 |
evaluatePartialSpecialGeneric.o : evaluatePartialSpecialGeneric.c $(GLOBAL_DEPS)
|
|
32 |
--- examl.orig/examl/Makefile.OMP.AVX.gcc
|
|
33 |
+++ examl/examl/Makefile.OMP.AVX.gcc
|
|
34 |
@@ -8,7 +8,7 @@
|
27 | 35 |
OPT_FLAG_1 = -O1
|
28 | 36 |
OPT_FLAG_2 = -O2
|
29 | 37 |
|
|
32 | 40 |
|
33 | 41 |
LIBRARIES = -lm -mavx -fopenmp
|
34 | 42 |
|
35 | |
@@ -21,7 +21,7 @@ all : clean examl-OMP-AVX
|
|
43 |
@@ -21,7 +21,7 @@
|
36 | 44 |
GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
|
37 | 45 |
|
38 | 46 |
examl-OMP-AVX : $(objs)
|
|
41 | 49 |
|
42 | 50 |
avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
|
43 | 51 |
$(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
|
44 | |
--- a/examl/Makefile.OMP.SSE3.gcc
|
45 | |
+++ b/examl/Makefile.OMP.SSE3.gcc
|
46 | |
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D_USE_OMP -fopenmp -D_GN
|
|
52 |
--- examl.orig/examl/Makefile.OMP.SSE3.gcc
|
|
53 |
+++ examl/examl/Makefile.OMP.SSE3.gcc
|
|
54 |
@@ -8,7 +8,7 @@
|
47 | 55 |
OPT_FLAG_1 = -O1
|
48 | 56 |
OPT_FLAG_2 = -O2
|
49 | 57 |
|
|
52 | 60 |
|
53 | 61 |
LIBRARIES = -lm -fopenmp
|
54 | 62 |
|
55 | |
@@ -21,7 +21,7 @@ all : clean examl-OMP
|
|
63 |
@@ -21,7 +21,7 @@
|
56 | 64 |
GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
|
57 | 65 |
|
58 | 66 |
examl-OMP : $(objs)
|
|
61 | 69 |
|
62 | 70 |
models.o : models.c $(GLOBAL_DEPS)
|
63 | 71 |
$(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
|
64 | |
--- a/examl/Makefile.SSE3.gcc
|
65 | |
+++ b/examl/Makefile.SSE3.gcc
|
66 | |
@@ -9,7 +9,7 @@ COMMON_FLAGS = -D_GNU_SOURCE -D__SIM_SSE
|
|
72 |
--- examl.orig/examl/Makefile.SSE3.gcc
|
|
73 |
+++ examl/examl/Makefile.SSE3.gcc
|
|
74 |
@@ -9,7 +9,7 @@
|
67 | 75 |
OPT_FLAG_1 = -O1
|
68 | 76 |
OPT_FLAG_2 = -O2
|
69 | 77 |
|
|
72 | 80 |
|
73 | 81 |
LIBRARIES = -lm
|
74 | 82 |
|
75 | |
@@ -22,7 +22,7 @@ all : clean examl
|
|
83 |
@@ -22,7 +22,7 @@
|
76 | 84 |
GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
|
77 | 85 |
|
78 | 86 |
examl : $(objs)
|
|
81 | 89 |
|
82 | 90 |
models.o : models.c $(GLOBAL_DEPS)
|
83 | 91 |
$(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
|
84 | |
--- a/parser/Makefile.SSE3.gcc
|
85 | |
+++ b/parser/Makefile.SSE3.gcc
|
|
92 |
--- examl.orig/parser/Makefile.SSE3.gcc
|
|
93 |
+++ examl/parser/Makefile.SSE3.gcc
|
86 | 94 |
@@ -2,7 +2,7 @@
|
87 | 95 |
# Makefile cleanup October 2006, Courtesy of Peter Cordes <peter@cordes.ca>
|
88 | 96 |
|
|
92 | 100 |
|
93 | 101 |
|
94 | 102 |
LIBRARIES = -lm
|
95 | |
@@ -16,7 +16,7 @@ all : clean parse-examl
|
|
103 |
@@ -16,7 +16,7 @@
|
96 | 104 |
GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
|
97 | 105 |
|
98 | 106 |
parse-examl : $(objs)
|