Codebase list examl / 66d565a
improve hardening Michael R. Crusoe 4 years ago
3 changed file(s) with 33 addition(s) and 24 deletion(s). Raw diff Collapse all Expand all
77 * Rules-Requires-Root: no (routine-update)
88 * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
99 Repository-Browse.
10 * Improve hardening, no more BLHC compliants
1011
1112 -- Michael R. Crusoe <michael.crusoe@gmail.com> Sun, 19 Apr 2020 12:42:07 +0200
1213
11 Last-Update: Tue, 14 Feb 2017 17:37:55 +0100
22 Description: Enable propagation of hardening options
33
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 @@
77 OPT_FLAG_1 = -O1
88 OPT_FLAG_2 = -O2
99
1212
1313 LIBRARIES = -lm -mavx
1414
15 @@ -21,7 +21,7 @@ all : clean examl-AVX
15 @@ -21,13 +21,13 @@
1616 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
1717
1818 examl-AVX : $(objs)
2020 + $(CC) -o examl-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
2121
2222 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 @@
2735 OPT_FLAG_1 = -O1
2836 OPT_FLAG_2 = -O2
2937
3240
3341 LIBRARIES = -lm -mavx -fopenmp
3442
35 @@ -21,7 +21,7 @@ all : clean examl-OMP-AVX
43 @@ -21,7 +21,7 @@
3644 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
3745
3846 examl-OMP-AVX : $(objs)
4149
4250 avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
4351 $(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 @@
4755 OPT_FLAG_1 = -O1
4856 OPT_FLAG_2 = -O2
4957
5260
5361 LIBRARIES = -lm -fopenmp
5462
55 @@ -21,7 +21,7 @@ all : clean examl-OMP
63 @@ -21,7 +21,7 @@
5664 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
5765
5866 examl-OMP : $(objs)
6169
6270 models.o : models.c $(GLOBAL_DEPS)
6371 $(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 @@
6775 OPT_FLAG_1 = -O1
6876 OPT_FLAG_2 = -O2
6977
7280
7381 LIBRARIES = -lm
7482
75 @@ -22,7 +22,7 @@ all : clean examl
83 @@ -22,7 +22,7 @@
7684 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
7785
7886 examl : $(objs)
8189
8290 models.o : models.c $(GLOBAL_DEPS)
8391 $(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
8694 @@ -2,7 +2,7 @@
8795 # Makefile cleanup October 2006, Courtesy of Peter Cordes <peter@cordes.ca>
8896
92100
93101
94102 LIBRARIES = -lm
95 @@ -16,7 +16,7 @@ all : clean parse-examl
103 @@ -16,7 +16,7 @@
96104 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
97105
98106 parse-examl : $(objs)
61136113 -all : clean examl-AVX
61146114 +SFX :=""
61156115 +
6116 +all: examl$(SFX)
6116 +all : clean examl$(SFX)
61176117
61186118 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
61196119
61236123 + $(CC) -o $@ $(objs) $(LIBRARIES) $(LDFLAGS)
61246124
61256125 avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
6126 - $(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
6127 + $(CC) $(CFLAGS) -c -o avxLikelihood.o avxLikelihood.c
6126 - $(CC) $(CFLAGS) $(CPPFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
6127 + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o avxLikelihood.o avxLikelihood.c
61286128
61296129 models.o : models.c $(GLOBAL_DEPS)
6130 $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
6130 $(CC) $(CFLAGS) $(COMMON_FLAGS) $(OPT_FLAG_1) $(CPPFLAGS) -c -o models.o models.c
61316131 @@ -49,6 +51,6 @@
61326132
61336133