diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-07-07 06:29:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-08 16:39:10 +0100 |
commit | 2c81d95059544fa792f40644d5bc1633f0626a1b (patch) | |
tree | d2ed8cf11ed6a2d64d2823f974709753db27ddb2 /meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff | |
parent | 860d8fdd276014d0d5e379993c4ac355176df6ca (diff) | |
download | poky-2c81d95059544fa792f40644d5bc1633f0626a1b.tar.gz |
elfutils: fix compilations issue with the gcc 4.7
(From OE-Core rev: 291483a20933cc70a49c2acadc9891bea2158564)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff')
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff | 339 |
1 files changed, 0 insertions, 339 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff deleted file mode 100644 index dd35c577cf..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff +++ /dev/null | |||
@@ -1,339 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Generated by copying the whole dir, running `sh debian/autogen.sh` and diffing. | ||
4 | |||
5 | Index: elfutils-0.148/backends/Makefile.in | ||
6 | =================================================================== | ||
7 | --- elfutils-0.148.orig/backends/Makefile.in 2010-07-03 13:07:10.000000000 +0000 | ||
8 | +++ elfutils-0.148/backends/Makefile.in 2010-07-03 13:13:52.000000000 +0000 | ||
9 | @@ -77,39 +77,54 @@ | ||
10 | am__objects_4 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \ | ||
11 | ia64_regs.$(OBJEXT) ia64_retval.$(OBJEXT) | ||
12 | libebl_ia64_pic_a_OBJECTS = $(am_libebl_ia64_pic_a_OBJECTS) | ||
13 | +libebl_m68k_pic_a_AR = $(AR) $(ARFLAGS) | ||
14 | +libebl_m68k_pic_a_LIBADD = | ||
15 | +am__objects_5 = m68k_init.$(OBJEXT) m68k_symbol.$(OBJEXT) \ | ||
16 | + m68k_regs.$(OBJEXT) | ||
17 | +libebl_m68k_pic_a_OBJECTS = $(am_libebl_m68k_pic_a_OBJECTS) | ||
18 | +libebl_mips_pic_a_AR = $(AR) $(ARFLAGS) | ||
19 | +libebl_mips_pic_a_LIBADD = | ||
20 | +am__objects_6 = mips_init.$(OBJEXT) mips_symbol.$(OBJEXT) \ | ||
21 | + mips_regs.$(OBJEXT) mips_retval.$(OBJEXT) | ||
22 | +libebl_mips_pic_a_OBJECTS = $(am_libebl_mips_pic_a_OBJECTS) | ||
23 | +libebl_parisc_pic_a_AR = $(AR) $(ARFLAGS) | ||
24 | +libebl_parisc_pic_a_LIBADD = | ||
25 | +am__objects_7 = parisc_init.$(OBJEXT) parisc_symbol.$(OBJEXT) \ | ||
26 | + parisc_regs.$(OBJEXT) parisc_retval.$(OBJEXT) | ||
27 | +libebl_parisc_pic_a_OBJECTS = $(am_libebl_parisc_pic_a_OBJECTS) | ||
28 | libebl_ppc64_pic_a_AR = $(AR) $(ARFLAGS) | ||
29 | libebl_ppc64_pic_a_LIBADD = | ||
30 | -am__objects_5 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ | ||
31 | +am__objects_8 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ | ||
32 | ppc64_retval.$(OBJEXT) ppc64_corenote.$(OBJEXT) \ | ||
33 | ppc_regs.$(OBJEXT) ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) \ | ||
34 | ppc_syscall.$(OBJEXT) | ||
35 | libebl_ppc64_pic_a_OBJECTS = $(am_libebl_ppc64_pic_a_OBJECTS) | ||
36 | libebl_ppc_pic_a_AR = $(AR) $(ARFLAGS) | ||
37 | libebl_ppc_pic_a_LIBADD = | ||
38 | -am__objects_6 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ | ||
39 | +am__objects_9 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ | ||
40 | ppc_retval.$(OBJEXT) ppc_regs.$(OBJEXT) ppc_corenote.$(OBJEXT) \ | ||
41 | ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) ppc_syscall.$(OBJEXT) | ||
42 | libebl_ppc_pic_a_OBJECTS = $(am_libebl_ppc_pic_a_OBJECTS) | ||
43 | libebl_s390_pic_a_AR = $(AR) $(ARFLAGS) | ||
44 | libebl_s390_pic_a_LIBADD = | ||
45 | -am__objects_7 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ | ||
46 | +am__objects_10 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ | ||
47 | s390_regs.$(OBJEXT) s390_retval.$(OBJEXT) | ||
48 | libebl_s390_pic_a_OBJECTS = $(am_libebl_s390_pic_a_OBJECTS) | ||
49 | libebl_sh_pic_a_AR = $(AR) $(ARFLAGS) | ||
50 | libebl_sh_pic_a_LIBADD = | ||
51 | -am__objects_8 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ | ||
52 | +am__objects_11 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ | ||
53 | sh_corenote.$(OBJEXT) sh_regs.$(OBJEXT) sh_retval.$(OBJEXT) | ||
54 | libebl_sh_pic_a_OBJECTS = $(am_libebl_sh_pic_a_OBJECTS) | ||
55 | libebl_sparc_pic_a_AR = $(AR) $(ARFLAGS) | ||
56 | libebl_sparc_pic_a_LIBADD = | ||
57 | -am__objects_9 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ | ||
58 | +am__objects_12 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ | ||
59 | sparc_regs.$(OBJEXT) sparc_retval.$(OBJEXT) \ | ||
60 | sparc_corenote.$(OBJEXT) sparc64_corenote.$(OBJEXT) \ | ||
61 | sparc_auxv.$(OBJEXT) | ||
62 | libebl_sparc_pic_a_OBJECTS = $(am_libebl_sparc_pic_a_OBJECTS) | ||
63 | libebl_x86_64_pic_a_AR = $(AR) $(ARFLAGS) | ||
64 | libebl_x86_64_pic_a_LIBADD = | ||
65 | -am__objects_10 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ | ||
66 | +am__objects_13 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ | ||
67 | x86_64_corenote.$(OBJEXT) x86_64_cfi.$(OBJEXT) \ | ||
68 | x86_64_retval.$(OBJEXT) x86_64_regs.$(OBJEXT) \ | ||
69 | i386_auxv.$(OBJEXT) x86_64_syscall.$(OBJEXT) | ||
70 | @@ -124,15 +139,18 @@ | ||
71 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
72 | SOURCES = $(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \ | ||
73 | $(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \ | ||
74 | - $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ | ||
75 | - $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ | ||
76 | - $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) | ||
77 | -DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ | ||
78 | - $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ | ||
79 | - $(libebl_ia64_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ | ||
80 | + $(libebl_m68k_pic_a_SOURCES) $(libebl_mips_pic_a_SOURCES) \ | ||
81 | + $(libebl_parisc_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ | ||
82 | $(libebl_ppc_pic_a_SOURCES) $(libebl_s390_pic_a_SOURCES) \ | ||
83 | $(libebl_sh_pic_a_SOURCES) $(libebl_sparc_pic_a_SOURCES) \ | ||
84 | $(libebl_x86_64_pic_a_SOURCES) | ||
85 | +DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ | ||
86 | + $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ | ||
87 | + $(libebl_ia64_pic_a_SOURCES) $(libebl_m68k_pic_a_SOURCES) \ | ||
88 | + $(libebl_mips_pic_a_SOURCES) $(libebl_parisc_pic_a_SOURCES) \ | ||
89 | + $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ | ||
90 | + $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ | ||
91 | + $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) | ||
92 | DATA = $(noinst_DATA) | ||
93 | HEADERS = $(noinst_HEADERS) | ||
94 | ETAGS = etags | ||
95 | @@ -270,11 +288,12 @@ | ||
96 | CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ | ||
97 | libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) | ||
98 | textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi | ||
99 | -modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 | ||
100 | +modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 parisc mips m68k | ||
101 | libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ | ||
102 | libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ | ||
103 | libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ | ||
104 | - libebl_s390_pic.a | ||
105 | + libebl_s390_pic.a libebl_parisc_pic.a libebl_mips_pic.a \ | ||
106 | + libebl_m68k_pic.a | ||
107 | |||
108 | noinst_LIBRARIES = $(libebl_pic) | ||
109 | noinst_DATA = $(libebl_pic:_pic.a=.so) | ||
110 | @@ -328,6 +347,15 @@ | ||
111 | s390_SRCS = s390_init.c s390_symbol.c s390_regs.c s390_retval.c | ||
112 | libebl_s390_pic_a_SOURCES = $(s390_SRCS) | ||
113 | am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) | ||
114 | +parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c | ||
115 | +libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) | ||
116 | +am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) | ||
117 | +mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c | ||
118 | +libebl_mips_pic_a_SOURCES = $(mips_SRCS) | ||
119 | +am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) | ||
120 | +m68k_SRCS = m68k_init.c m68k_symbol.c m68k_regs.c | ||
121 | +libebl_m68k_pic_a_SOURCES = $(m68k_SRCS) | ||
122 | +am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os) | ||
123 | noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c | ||
124 | EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) | ||
125 | all: all-am | ||
126 | @@ -383,6 +411,18 @@ | ||
127 | -rm -f libebl_ia64_pic.a | ||
128 | $(libebl_ia64_pic_a_AR) libebl_ia64_pic.a $(libebl_ia64_pic_a_OBJECTS) $(libebl_ia64_pic_a_LIBADD) | ||
129 | $(RANLIB) libebl_ia64_pic.a | ||
130 | +libebl_m68k_pic.a: $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_DEPENDENCIES) | ||
131 | + -rm -f libebl_m68k_pic.a | ||
132 | + $(libebl_m68k_pic_a_AR) libebl_m68k_pic.a $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_LIBADD) | ||
133 | + $(RANLIB) libebl_m68k_pic.a | ||
134 | +libebl_mips_pic.a: $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_DEPENDENCIES) | ||
135 | + -rm -f libebl_mips_pic.a | ||
136 | + $(libebl_mips_pic_a_AR) libebl_mips_pic.a $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_LIBADD) | ||
137 | + $(RANLIB) libebl_mips_pic.a | ||
138 | +libebl_parisc_pic.a: $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_DEPENDENCIES) | ||
139 | + -rm -f libebl_parisc_pic.a | ||
140 | + $(libebl_parisc_pic_a_AR) libebl_parisc_pic.a $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_LIBADD) | ||
141 | + $(RANLIB) libebl_parisc_pic.a | ||
142 | libebl_ppc64_pic.a: $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_DEPENDENCIES) | ||
143 | -rm -f libebl_ppc64_pic.a | ||
144 | $(libebl_ppc64_pic_a_AR) libebl_ppc64_pic.a $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_LIBADD) | ||
145 | @@ -439,6 +479,17 @@ | ||
146 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_regs.Po@am__quote@ | ||
147 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_retval.Po@am__quote@ | ||
148 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_symbol.Po@am__quote@ | ||
149 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_init.Po@am__quote@ | ||
150 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_regs.Po@am__quote@ | ||
151 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_symbol.Po@am__quote@ | ||
152 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_init.Po@am__quote@ | ||
153 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_regs.Po@am__quote@ | ||
154 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_retval.Po@am__quote@ | ||
155 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_symbol.Po@am__quote@ | ||
156 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_init.Po@am__quote@ | ||
157 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_regs.Po@am__quote@ | ||
158 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_retval.Po@am__quote@ | ||
159 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_symbol.Po@am__quote@ | ||
160 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_corenote.Po@am__quote@ | ||
161 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_init.Po@am__quote@ | ||
162 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_retval.Po@am__quote@ | ||
163 | Index: elfutils-0.148/configure | ||
164 | =================================================================== | ||
165 | --- elfutils-0.148.orig/configure 2010-07-03 13:06:16.000000000 +0000 | ||
166 | +++ elfutils-0.148/configure 2010-07-03 13:13:49.000000000 +0000 | ||
167 | @@ -602,6 +602,8 @@ | ||
168 | base_cpu | ||
169 | NATIVE_LD_FALSE | ||
170 | NATIVE_LD_TRUE | ||
171 | +LD_AS_NEEDED | ||
172 | +WEXTRA | ||
173 | LEXLIB | ||
174 | LEX_OUTPUT_ROOT | ||
175 | LEX | ||
176 | @@ -3852,6 +3854,130 @@ | ||
177 | as_fn_error "gcc with C99 support required" "$LINENO" 5 | ||
178 | fi | ||
179 | |||
180 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5 | ||
181 | +$as_echo_n "checking for -Wextra option to $CC... " >&6; } | ||
182 | +if test "${ac_cv_cc_wextra+set}" = set; then : | ||
183 | + $as_echo_n "(cached) " >&6 | ||
184 | +else | ||
185 | + old_CFLAGS="$CFLAGS" | ||
186 | +CFLAGS="$CFLAGS -Wextra" | ||
187 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
188 | +/* end confdefs.h. */ | ||
189 | +void foo (void) { } | ||
190 | +_ACEOF | ||
191 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
192 | + ac_cv_cc_wextra=yes | ||
193 | +else | ||
194 | + ac_cv_cc_wextra=no | ||
195 | +fi | ||
196 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
197 | +CFLAGS="$old_CFLAGS" | ||
198 | +fi | ||
199 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5 | ||
200 | +$as_echo "$ac_cv_cc_wextra" >&6; } | ||
201 | + | ||
202 | +if test "x$ac_cv_cc_wextra" = xyes; then : | ||
203 | + WEXTRA=-Wextra | ||
204 | +else | ||
205 | + WEXTRA=-W | ||
206 | +fi | ||
207 | + | ||
208 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5 | ||
209 | +$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; } | ||
210 | +if test "${ac_cv_cc_gnu89_inline+set}" = set; then : | ||
211 | + $as_echo_n "(cached) " >&6 | ||
212 | +else | ||
213 | + old_CFLAGS="$CFLAGS" | ||
214 | +CFLAGS="$CFLAGS -fgnu89-inline -Werror" | ||
215 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
216 | +/* end confdefs.h. */ | ||
217 | + | ||
218 | +void foo (void) | ||
219 | +{ | ||
220 | + inline void bar (void) {} | ||
221 | + bar (); | ||
222 | +} | ||
223 | +extern inline void baz (void) {} | ||
224 | + | ||
225 | +_ACEOF | ||
226 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
227 | + ac_cv_cc_gnu89_inline=yes | ||
228 | +else | ||
229 | + ac_cv_cc_gnu89_inline=no | ||
230 | +fi | ||
231 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
232 | +CFLAGS="$old_CFLAGS" | ||
233 | +fi | ||
234 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5 | ||
235 | +$as_echo "$ac_cv_cc_gnu89_inline" >&6; } | ||
236 | +if test "x$ac_cv_cc_gnu89_inline" = xyes; then : | ||
237 | + WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline" | ||
238 | +fi | ||
239 | + | ||
240 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5 | ||
241 | +$as_echo_n "checking for --as-needed linker option... " >&6; } | ||
242 | +if test "${ac_cv_as_needed+set}" = set; then : | ||
243 | + $as_echo_n "(cached) " >&6 | ||
244 | +else | ||
245 | + cat > conftest.c <<EOF | ||
246 | +int main (void) { return 0; } | ||
247 | +EOF | ||
248 | +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS | ||
249 | + -fPIC -shared -o conftest.so conftest.c | ||
250 | + -Wl,--as-needed 1>&5' | ||
251 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 | ||
252 | + (eval $ac_try) 2>&5 | ||
253 | + ac_status=$? | ||
254 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
255 | + test $ac_status = 0; }; } | ||
256 | +then | ||
257 | + ac_cv_as_needed=yes | ||
258 | +else | ||
259 | + ac_cv_as_needed=no | ||
260 | +fi | ||
261 | +rm -f conftest* | ||
262 | +fi | ||
263 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5 | ||
264 | +$as_echo "$ac_cv_as_needed" >&6; } | ||
265 | +if test "x$ac_cv_as_needed" = xyes; then : | ||
266 | + LD_AS_NEEDED=-Wl,--as-needed | ||
267 | +else | ||
268 | + LD_AS_NEEDED= | ||
269 | +fi | ||
270 | + | ||
271 | + | ||
272 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 | ||
273 | +$as_echo_n "checking for __builtin_popcount... " >&6; } | ||
274 | +if test "${ac_cv_popcount+set}" = set; then : | ||
275 | + $as_echo_n "(cached) " >&6 | ||
276 | +else | ||
277 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
278 | +/* end confdefs.h. */ | ||
279 | + | ||
280 | +int | ||
281 | +main () | ||
282 | +{ | ||
283 | +exit (__builtin_popcount (127)); | ||
284 | + ; | ||
285 | + return 0; | ||
286 | +} | ||
287 | +_ACEOF | ||
288 | +if ac_fn_c_try_link "$LINENO"; then : | ||
289 | + ac_cv_popcount=yes | ||
290 | +else | ||
291 | + ac_cv_popcount=no | ||
292 | +fi | ||
293 | +rm -f core conftest.err conftest.$ac_objext \ | ||
294 | + conftest$ac_exeext conftest.$ac_ext | ||
295 | +fi | ||
296 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5 | ||
297 | +$as_echo "$ac_cv_popcount" >&6; } | ||
298 | +if test "x$ac_cv_popcount" = xyes; then : | ||
299 | + | ||
300 | +$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h | ||
301 | + | ||
302 | +fi | ||
303 | + | ||
304 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5 | ||
305 | $as_echo_n "checking for __thread support... " >&6; } | ||
306 | if test "${ac_cv_tls+set}" = set; then : | ||
307 | @@ -3888,7 +4014,13 @@ | ||
308 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5 | ||
309 | $as_echo "$ac_cv_tls" >&6; } | ||
310 | if test "x$ac_cv_tls" != xyes; then : | ||
311 | - as_fn_error "__thread support required" "$LINENO" 5 | ||
312 | + if test "$use_locks" = yes; then : | ||
313 | + as_fn_error "--enable-thread-safety requires __thread support" "$LINENO" 5 | ||
314 | +else | ||
315 | + | ||
316 | +$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h | ||
317 | + | ||
318 | +fi | ||
319 | fi | ||
320 | |||
321 | # Check whether --enable-largefile was given. | ||
322 | @@ -4874,7 +5006,7 @@ | ||
323 | |||
324 | # 1.234<whatever> -> 1234<whatever> | ||
325 | case "$PACKAGE_VERSION" in | ||
326 | -[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; | ||
327 | +[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; | ||
328 | *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; | ||
329 | esac | ||
330 | case "$eu_version" in | ||
331 | @@ -4903,7 +5035,7 @@ | ||
332 | esac | ||
333 | |||
334 | # Round up to the next release API (x.y) version. | ||
335 | -eu_version=$[($eu_version + 999) / 1000] | ||
336 | +eu_version=`expr \( $eu_version + 999 \) / 1000` | ||
337 | |||
338 | cat >confcache <<\_ACEOF | ||
339 | # This file is a shell script that caches the results of configure | ||