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
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
Description: Explicitly link against -latomic, because some platforms don't.
Patch generated via command:
grep -rl '[-]lm ' * | xargs -rn1 perl -pe 's/-lm /-lm -latomic /g;' -i
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 8a81a34..9d486cb 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../script $(ICU_FLAGS)
-LDADD = ../script/libfstscript.la ../lib/libfst.la -lm $(DL_LIBS)
+LDADD = ../script/libfstscript.la ../lib/libfst.la -lm -latomic $(DL_LIBS)
if HAVE_BIN
bin_PROGRAMS = fstarcsort fstclosure fstcompile fstcompose fstconcat \
diff --git a/src/extensions/compact/Makefile.am b/src/extensions/compact/Makefile.am
index a7559e6..be03c58 100644
--- a/src/extensions/compact/Makefile.am
+++ b/src/extensions/compact/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
libfstdir = @libfstdir@
libfst_LTLIBRARIES = compact8_acceptor-fst.la compact8_string-fst.la compact8_unweighted-fst.la compact8_unweighted_acceptor-fst.la compact8_weighted_string-fst.la compact16_acceptor-fst.la compact16_string-fst.la compact16_unweighted-fst.la compact16_unweighted_acceptor-fst.la compact16_weighted_string-fst.la compact64_acceptor-fst.la compact64_string-fst.la compact64_unweighted-fst.la compact64_unweighted_acceptor-fst.la compact64_weighted_string-fst.la
diff --git a/src/extensions/compress/Makefile.am b/src/extensions/compress/Makefile.am
index 94728c8..34b7932 100644
--- a/src/extensions/compress/Makefile.am
+++ b/src/extensions/compress/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = fstcompress
LDADD = libfstcompressscript.la \
../../script/libfstscript.la \
../../lib/libfst.la \
- -lm $(DL_LIBS)
+ -lm -latomic $(DL_LIBS)
fstcompress_SOURCES = fstcompress.cc fstcompress-main.cc
endif
@@ -16,7 +16,7 @@ libfstcompressscript_la_SOURCES = compressscript.cc
libfstcompressscript_la_LDFLAGS = -version-info 26:0:0
libfstcompressscript_la_LIBADD = ../../script/libfstscript.la \
../../lib/libfst.la \
- -lm $(DL_LIBS)
+ -lm -latomic $(DL_LIBS)
endif
if HAVE_SCRIPT
diff --git a/src/extensions/const/Makefile.am b/src/extensions/const/Makefile.am
index fe67550..3568879 100644
--- a/src/extensions/const/Makefile.am
+++ b/src/extensions/const/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
libfstdir = @libfstdir@
libfst_LTLIBRARIES = const8-fst.la const16-fst.la const64-fst.la
diff --git a/src/extensions/far/Makefile.am b/src/extensions/far/Makefile.am
index 7c6879d..1970f78 100644
--- a/src/extensions/far/Makefile.am
+++ b/src/extensions/far/Makefile.am
@@ -10,14 +10,14 @@ endif
libfstfar_la_SOURCES = sttable.cc stlist.cc
libfstfar_la_LDFLAGS = -version-info 26:0:0
-libfstfar_la_LIBADD = ../../lib/libfst.la -lm $(DL_LIBS)
+libfstfar_la_LIBADD = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
if HAVE_SCRIPT
libfstfarscript_la_SOURCES = compile-strings.cc far-class.cc farscript.cc \
getters.cc script-impl.cc sttable.cc stlist.cc
libfstfarscript_la_LDFLAGS = -version-info 26:0:0
libfstfarscript_la_LIBADD = libfstfar.la ../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
endif
if HAVE_BIN
@@ -25,7 +25,7 @@ bin_PROGRAMS = farcompilestrings farconvert farcreate farencode farequal \
farextract farinfo farisomorphic farprintstrings
LDADD = libfstfarscript.la ../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
farcompilestrings_SOURCES = farcompilestrings.cc farcompilestrings-main.cc
diff --git a/src/extensions/linear/Makefile.am b/src/extensions/linear/Makefile.am
index 258b796..f47d565 100644
--- a/src/extensions/linear/Makefile.am
+++ b/src/extensions/linear/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
if HAVE_BIN
bin_PROGRAMS = fstlinear fstloglinearapply
diff --git a/src/extensions/lookahead/Makefile.am b/src/extensions/lookahead/Makefile.am
index 7ce68ad..94c671b 100644
--- a/src/extensions/lookahead/Makefile.am
+++ b/src/extensions/lookahead/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
libfstdir = @libfstdir@
libfst_LTLIBRARIES = arc_lookahead-fst.la \
diff --git a/src/extensions/mpdt/Makefile.am b/src/extensions/mpdt/Makefile.am
index 4c57b40..95447ad 100644
--- a/src/extensions/mpdt/Makefile.am
+++ b/src/extensions/mpdt/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = mpdtcompose mpdtexpand mpdtinfo mpdtreverse
LDADD = libfstmpdtscript.la \
../pdt/libfstpdtscript.la \
../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
mpdtcompose_SOURCES = mpdtcompose.cc mpdtcompose-main.cc
@@ -22,5 +22,5 @@ lib_LTLIBRARIES = libfstmpdtscript.la
libfstmpdtscript_la_SOURCES = mpdtscript.cc
libfstmpdtscript_la_LDFLAGS = -version-info 26:0:0
libfstmpdtscript_la_LIBADD = ../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
endif
diff --git a/src/extensions/ngram/Makefile.am b/src/extensions/ngram/Makefile.am
index 4dd98e0..dbc18b4 100644
--- a/src/extensions/ngram/Makefile.am
+++ b/src/extensions/ngram/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
libfstdir = @libfstdir@
libfst_LTLIBRARIES = ngram-fst.la
diff --git a/src/extensions/pdt/Makefile.am b/src/extensions/pdt/Makefile.am
index f12bbe2..54ad27c 100644
--- a/src/extensions/pdt/Makefile.am
+++ b/src/extensions/pdt/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = pdtcompose pdtexpand pdtinfo pdtreplace pdtreverse \
LDADD = libfstpdtscript.la \
../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
pdtcompose_SOURCES = pdtcompose.cc pdtcompose-main.cc
@@ -26,5 +26,5 @@ lib_LTLIBRARIES = libfstpdtscript.la
libfstpdtscript_la_SOURCES = getters.cc pdtscript.cc
libfstpdtscript_la_LDFLAGS = -version-info 26:0:0
libfstpdtscript_la_LIBADD = ../../script/libfstscript.la \
- ../../lib/libfst.la -lm $(DL_LIBS)
+ ../../lib/libfst.la -lm -latomic $(DL_LIBS)
endif
diff --git a/src/extensions/python/Makefile.am b/src/extensions/python/Makefile.am
index 273fd06..b1dfed9 100644
--- a/src/extensions/python/Makefile.am
+++ b/src/extensions/python/Makefile.am
@@ -12,7 +12,7 @@ pywrapfst_la_CXXFLAGS = -fexceptions
pywrapfst_la_LDFLAGS = -avoid-version -module
pywrapfst_la_LIBADD = ../far/libfstfarscript.la ../far/libfstfar.la \
../../script/libfstscript.la ../../lib/libfst.la \
- -lm $(DL_LIBS) $(PYTHON_LIBS)
+ -lm -latomic $(DL_LIBS) $(PYTHON_LIBS)
# Exports the *.pxd/*.pxd source files.
EXTRA_DIST = cios.pxd cmemory.pxd cpywrapfst.pxd pywrapfst.pxd pywrapfst.pyx
diff --git a/src/extensions/special/Makefile.am b/src/extensions/special/Makefile.am
index 3f7c4f6..a4416a1 100644
--- a/src/extensions/special/Makefile.am
+++ b/src/extensions/special/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../../include -I$(srcdir)/../../bin $(ICU_CPPFLAGS)
-LIBS = ../../lib/libfst.la -lm $(DL_LIBS)
+LIBS = ../../lib/libfst.la -lm -latomic $(DL_LIBS)
if HAVE_BIN
bin_PROGRAMS = fstspecial
diff --git a/src/script/Makefile.am b/src/script/Makefile.am
index 0926203..79ce6ac 100644
--- a/src/script/Makefile.am
+++ b/src/script/Makefile.am
@@ -12,6 +12,6 @@ randgen.cc relabel.cc replace.cc reverse.cc reweight.cc rmepsilon.cc \
shortest-distance.cc shortest-path.cc stateiterator-class.cc synchronize.cc \
text-io.cc topsort.cc union.cc weight-class.cc verify.cc
-libfstscript_la_LIBADD = ../lib/libfst.la -lm $(DL_LIBS)
+libfstscript_la_LIBADD = ../lib/libfst.la -lm -latomic $(DL_LIBS)
libfstscript_la_LDFLAGS = -version-info 26:0:0
endif
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index a2754e5..e10b863 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(srcdir)/../include $(ICU_CPPFLAGS)
-LDADD = ../lib/libfst.la -lm $(DL_LIBS)
+LDADD = ../lib/libfst.la -lm -latomic $(DL_LIBS)
check_PROGRAMS = fst_test weight_test
|
