1 |
commit: 576128f60cd8613384cd4b76759b9b687523346a |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 15 19:47:13 2011 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 15 19:47:13 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=576128f6 |
7 |
|
8 |
Prepare release 0.3.2 |
9 |
|
10 |
--- |
11 |
ChangeLog | 3 +- |
12 |
autom4te.cache/output.0 | 24 ++-- |
13 |
autom4te.cache/output.1 | 24 ++-- |
14 |
autom4te.cache/requests | 38 +++--- |
15 |
autom4te.cache/traces.0 | 18 +- |
16 |
autom4te.cache/traces.1 | 68 +++++---- |
17 |
configure | 24 ++-- |
18 |
configure.ac | 2 +- |
19 |
tests/Makefile.in | 310 ++++++++++++++++++++++++-------------- |
20 |
tests/{ => gnustack}/Makefile.in | 10 +- |
21 |
tests/{ => pxtpax}/Makefile.in | 48 ++---- |
22 |
11 files changed, 324 insertions(+), 245 deletions(-) |
23 |
|
24 |
diff --git a/ChangeLog b/ChangeLog |
25 |
index f8cc7b9..4356ad5 100644 |
26 |
--- a/ChangeLog |
27 |
+++ b/ChangeLog |
28 |
@@ -1,3 +1,4 @@ |
29 |
+2011-11-15 Anthony G. Basile <blueness@g.o> |
30 |
|
31 |
* tests/pxtpax: compare pax flags on binary and process |
32 |
* fix-gnustack and paxctl-ng: fix exit code on success |
33 |
@@ -5,7 +6,7 @@ |
34 |
* paxctl-ng: if a file fails to open O_RDWR then |
35 |
don't do PT_PAX markings but continue with XT_PAX |
36 |
|
37 |
-2011-10-23 |
38 |
+2011-10-23 Anthony G. Basile <blueness@g.o> |
39 |
|
40 |
* Release 0.3.0 |
41 |
* add XT_PAX read/write in paxct-ng.c and paxmodule.c |
42 |
|
43 |
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 |
44 |
index f8c8e58..183ffc6 100644 |
45 |
--- a/autom4te.cache/output.0 |
46 |
+++ b/autom4te.cache/output.0 |
47 |
@@ -1,6 +1,6 @@ |
48 |
@%:@! /bin/sh |
49 |
@%:@ Guess values for system-dependent variables and create Makefiles. |
50 |
-@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1. |
51 |
+@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2. |
52 |
@%:@ |
53 |
@%:@ Report bugs to <http://bugs.gentoo.org/>. |
54 |
@%:@ |
55 |
@@ -560,8 +560,8 @@ MAKEFLAGS= |
56 |
# Identity of this package. |
57 |
PACKAGE_NAME='elfix' |
58 |
PACKAGE_TARNAME='elfix' |
59 |
-PACKAGE_VERSION='0.3.1' |
60 |
-PACKAGE_STRING='elfix 0.3.1' |
61 |
+PACKAGE_VERSION='0.3.2' |
62 |
+PACKAGE_STRING='elfix 0.3.2' |
63 |
PACKAGE_BUGREPORT='http://bugs.gentoo.org/' |
64 |
PACKAGE_URL='' |
65 |
|
66 |
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then |
67 |
# Omit some internal or obsolete options to make the list less imposing. |
68 |
# This message is too long to be a string in the A/UX 3.1 sh. |
69 |
cat <<_ACEOF |
70 |
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. |
71 |
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. |
72 |
|
73 |
Usage: $0 [OPTION]... [VAR=VALUE]... |
74 |
|
75 |
@@ -1313,7 +1313,7 @@ fi |
76 |
|
77 |
if test -n "$ac_init_help"; then |
78 |
case $ac_init_help in |
79 |
- short | recursive ) echo "Configuration of elfix 0.3.1:";; |
80 |
+ short | recursive ) echo "Configuration of elfix 0.3.2:";; |
81 |
esac |
82 |
cat <<\_ACEOF |
83 |
|
84 |
@@ -1401,7 +1401,7 @@ fi |
85 |
test -n "$ac_init_help" && exit $ac_status |
86 |
if $ac_init_version; then |
87 |
cat <<\_ACEOF |
88 |
-elfix configure 0.3.1 |
89 |
+elfix configure 0.3.2 |
90 |
generated by GNU Autoconf 2.68 |
91 |
|
92 |
Copyright (C) 2010 Free Software Foundation, Inc. |
93 |
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF |
94 |
This file contains any messages produced by compilers while |
95 |
running configure, to aid debugging if configure makes a mistake. |
96 |
|
97 |
-It was created by elfix $as_me 0.3.1, which was |
98 |
+It was created by elfix $as_me 0.3.2, which was |
99 |
generated by GNU Autoconf 2.68. Invocation command line was |
100 |
|
101 |
$ $0 $@ |
102 |
@@ -2698,7 +2698,7 @@ fi |
103 |
|
104 |
# Define the identity of the package. |
105 |
PACKAGE='elfix' |
106 |
- VERSION='0.3.1' |
107 |
+ VERSION='0.3.2' |
108 |
|
109 |
|
110 |
cat >>confdefs.h <<_ACEOF |
111 |
@@ -4581,7 +4581,7 @@ esac |
112 |
fi |
113 |
|
114 |
|
115 |
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile" |
116 |
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile" |
117 |
|
118 |
|
119 |
cat >confcache <<\_ACEOF |
120 |
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
121 |
# report actual input values of CONFIG_FILES etc. instead of their |
122 |
# values after options handling. |
123 |
ac_log=" |
124 |
-This file was extended by elfix $as_me 0.3.1, which was |
125 |
+This file was extended by elfix $as_me 0.3.2, which was |
126 |
generated by GNU Autoconf 2.68. Invocation command line was |
127 |
|
128 |
CONFIG_FILES = $CONFIG_FILES |
129 |
@@ -5188,7 +5188,7 @@ _ACEOF |
130 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
131 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
132 |
ac_cs_version="\\ |
133 |
-elfix config.status 0.3.1 |
134 |
+elfix config.status 0.3.2 |
135 |
configured by $0, generated by GNU Autoconf 2.68, |
136 |
with options \\"\$ac_cs_config\\" |
137 |
|
138 |
@@ -5324,6 +5324,8 @@ do |
139 |
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; |
140 |
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; |
141 |
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
142 |
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;; |
143 |
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;; |
144 |
|
145 |
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
146 |
esac |
147 |
|
148 |
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 |
149 |
index f8c8e58..183ffc6 100644 |
150 |
--- a/autom4te.cache/output.1 |
151 |
+++ b/autom4te.cache/output.1 |
152 |
@@ -1,6 +1,6 @@ |
153 |
@%:@! /bin/sh |
154 |
@%:@ Guess values for system-dependent variables and create Makefiles. |
155 |
-@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1. |
156 |
+@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2. |
157 |
@%:@ |
158 |
@%:@ Report bugs to <http://bugs.gentoo.org/>. |
159 |
@%:@ |
160 |
@@ -560,8 +560,8 @@ MAKEFLAGS= |
161 |
# Identity of this package. |
162 |
PACKAGE_NAME='elfix' |
163 |
PACKAGE_TARNAME='elfix' |
164 |
-PACKAGE_VERSION='0.3.1' |
165 |
-PACKAGE_STRING='elfix 0.3.1' |
166 |
+PACKAGE_VERSION='0.3.2' |
167 |
+PACKAGE_STRING='elfix 0.3.2' |
168 |
PACKAGE_BUGREPORT='http://bugs.gentoo.org/' |
169 |
PACKAGE_URL='' |
170 |
|
171 |
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then |
172 |
# Omit some internal or obsolete options to make the list less imposing. |
173 |
# This message is too long to be a string in the A/UX 3.1 sh. |
174 |
cat <<_ACEOF |
175 |
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. |
176 |
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. |
177 |
|
178 |
Usage: $0 [OPTION]... [VAR=VALUE]... |
179 |
|
180 |
@@ -1313,7 +1313,7 @@ fi |
181 |
|
182 |
if test -n "$ac_init_help"; then |
183 |
case $ac_init_help in |
184 |
- short | recursive ) echo "Configuration of elfix 0.3.1:";; |
185 |
+ short | recursive ) echo "Configuration of elfix 0.3.2:";; |
186 |
esac |
187 |
cat <<\_ACEOF |
188 |
|
189 |
@@ -1401,7 +1401,7 @@ fi |
190 |
test -n "$ac_init_help" && exit $ac_status |
191 |
if $ac_init_version; then |
192 |
cat <<\_ACEOF |
193 |
-elfix configure 0.3.1 |
194 |
+elfix configure 0.3.2 |
195 |
generated by GNU Autoconf 2.68 |
196 |
|
197 |
Copyright (C) 2010 Free Software Foundation, Inc. |
198 |
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF |
199 |
This file contains any messages produced by compilers while |
200 |
running configure, to aid debugging if configure makes a mistake. |
201 |
|
202 |
-It was created by elfix $as_me 0.3.1, which was |
203 |
+It was created by elfix $as_me 0.3.2, which was |
204 |
generated by GNU Autoconf 2.68. Invocation command line was |
205 |
|
206 |
$ $0 $@ |
207 |
@@ -2698,7 +2698,7 @@ fi |
208 |
|
209 |
# Define the identity of the package. |
210 |
PACKAGE='elfix' |
211 |
- VERSION='0.3.1' |
212 |
+ VERSION='0.3.2' |
213 |
|
214 |
|
215 |
cat >>confdefs.h <<_ACEOF |
216 |
@@ -4581,7 +4581,7 @@ esac |
217 |
fi |
218 |
|
219 |
|
220 |
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile" |
221 |
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile" |
222 |
|
223 |
|
224 |
cat >confcache <<\_ACEOF |
225 |
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
226 |
# report actual input values of CONFIG_FILES etc. instead of their |
227 |
# values after options handling. |
228 |
ac_log=" |
229 |
-This file was extended by elfix $as_me 0.3.1, which was |
230 |
+This file was extended by elfix $as_me 0.3.2, which was |
231 |
generated by GNU Autoconf 2.68. Invocation command line was |
232 |
|
233 |
CONFIG_FILES = $CONFIG_FILES |
234 |
@@ -5188,7 +5188,7 @@ _ACEOF |
235 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
236 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
237 |
ac_cs_version="\\ |
238 |
-elfix config.status 0.3.1 |
239 |
+elfix config.status 0.3.2 |
240 |
configured by $0, generated by GNU Autoconf 2.68, |
241 |
with options \\"\$ac_cs_config\\" |
242 |
|
243 |
@@ -5324,6 +5324,8 @@ do |
244 |
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; |
245 |
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; |
246 |
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
247 |
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;; |
248 |
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;; |
249 |
|
250 |
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
251 |
esac |
252 |
|
253 |
diff --git a/autom4te.cache/requests b/autom4te.cache/requests |
254 |
index 9162197..4be421f 100644 |
255 |
--- a/autom4te.cache/requests |
256 |
+++ b/autom4te.cache/requests |
257 |
@@ -64,8 +64,8 @@ |
258 |
'AM_SET_LEADING_DOT' => 1, |
259 |
'AM_SET_DEPDIR' => 1, |
260 |
'_AM_DEPENDENCIES' => 1, |
261 |
- 'AM_PROG_INSTALL_SH' => 1, |
262 |
'm4_include' => 1, |
263 |
+ 'AM_PROG_INSTALL_SH' => 1, |
264 |
'_AC_AM_CONFIG_HEADER_HOOK' => 1, |
265 |
'AU_DEFUN' => 1, |
266 |
'AM_MAKE_INCLUDE' => 1 |
267 |
@@ -83,55 +83,55 @@ |
268 |
'configure.ac' |
269 |
], |
270 |
{ |
271 |
- '_LT_AC_TAGCONFIG' => 1, |
272 |
'AM_PROG_F77_C_O' => 1, |
273 |
- 'AC_INIT' => 1, |
274 |
+ '_LT_AC_TAGCONFIG' => 1, |
275 |
'm4_pattern_forbid' => 1, |
276 |
- '_AM_COND_IF' => 1, |
277 |
+ 'AC_INIT' => 1, |
278 |
'AC_CANONICAL_TARGET' => 1, |
279 |
- 'AC_SUBST' => 1, |
280 |
+ '_AM_COND_IF' => 1, |
281 |
'AC_CONFIG_LIBOBJ_DIR' => 1, |
282 |
- 'AC_FC_SRCEXT' => 1, |
283 |
+ 'AC_SUBST' => 1, |
284 |
'AC_CANONICAL_HOST' => 1, |
285 |
+ 'AC_FC_SRCEXT' => 1, |
286 |
'AC_PROG_LIBTOOL' => 1, |
287 |
'AM_INIT_AUTOMAKE' => 1, |
288 |
- 'AM_PATH_GUILE' => 1, |
289 |
'AC_CONFIG_SUBDIRS' => 1, |
290 |
+ 'AM_PATH_GUILE' => 1, |
291 |
'AM_AUTOMAKE_VERSION' => 1, |
292 |
'LT_CONFIG_LTDL_DIR' => 1, |
293 |
- 'AC_REQUIRE_AUX_FILE' => 1, |
294 |
'AC_CONFIG_LINKS' => 1, |
295 |
- 'm4_sinclude' => 1, |
296 |
+ 'AC_REQUIRE_AUX_FILE' => 1, |
297 |
'LT_SUPPORTED_TAG' => 1, |
298 |
+ 'm4_sinclude' => 1, |
299 |
'AM_MAINTAINER_MODE' => 1, |
300 |
'AM_NLS' => 1, |
301 |
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, |
302 |
- 'AM_MAKEFILE_INCLUDE' => 1, |
303 |
'_m4_warn' => 1, |
304 |
+ 'AM_MAKEFILE_INCLUDE' => 1, |
305 |
'AM_PROG_CXX_C_O' => 1, |
306 |
- '_AM_COND_ENDIF' => 1, |
307 |
'_AM_MAKEFILE_INCLUDE' => 1, |
308 |
+ '_AM_COND_ENDIF' => 1, |
309 |
'AM_ENABLE_MULTILIB' => 1, |
310 |
'AM_SILENT_RULES' => 1, |
311 |
'AM_PROG_MOC' => 1, |
312 |
'AC_CONFIG_FILES' => 1, |
313 |
- 'include' => 1, |
314 |
'LT_INIT' => 1, |
315 |
- 'AM_PROG_AR' => 1, |
316 |
+ 'include' => 1, |
317 |
'AM_GNU_GETTEXT' => 1, |
318 |
+ 'AM_PROG_AR' => 1, |
319 |
'AC_LIBSOURCE' => 1, |
320 |
- 'AM_PROG_FC_C_O' => 1, |
321 |
'AC_CANONICAL_BUILD' => 1, |
322 |
+ 'AM_PROG_FC_C_O' => 1, |
323 |
'AC_FC_FREEFORM' => 1, |
324 |
'AH_OUTPUT' => 1, |
325 |
- '_AM_SUBST_NOTMAKE' => 1, |
326 |
'AC_CONFIG_AUX_DIR' => 1, |
327 |
- 'sinclude' => 1, |
328 |
- 'AM_PROG_CC_C_O' => 1, |
329 |
+ '_AM_SUBST_NOTMAKE' => 1, |
330 |
'm4_pattern_allow' => 1, |
331 |
- 'AM_XGETTEXT_OPTION' => 1, |
332 |
- 'AC_CANONICAL_SYSTEM' => 1, |
333 |
+ 'AM_PROG_CC_C_O' => 1, |
334 |
+ 'sinclude' => 1, |
335 |
'AM_CONDITIONAL' => 1, |
336 |
+ 'AC_CANONICAL_SYSTEM' => 1, |
337 |
+ 'AM_XGETTEXT_OPTION' => 1, |
338 |
'AC_CONFIG_HEADERS' => 1, |
339 |
'AC_DEFINE_TRACE_LITERAL' => 1, |
340 |
'AM_POT_TOOLS' => 1, |
341 |
|
342 |
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 |
343 |
index 469b21f..9909fcf 100644 |
344 |
--- a/autom4te.cache/traces.0 |
345 |
+++ b/autom4te.cache/traces.0 |
346 |
@@ -761,12 +761,12 @@ m4trace:configure.ac:46: -1- m4_pattern_allow([^_UINT8_T$]) |
347 |
m4trace:configure.ac:46: -1- m4_pattern_allow([^uint8_t$]) |
348 |
m4trace:configure.ac:47: -1- m4_pattern_allow([^uint16_t$]) |
349 |
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
350 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
351 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$]) |
352 |
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) |
353 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) |
354 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) |
355 |
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) |
356 |
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) |
357 |
-m4trace:configure.ac:58: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) |
358 |
-m4trace:configure.ac:58: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS |
359 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
360 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$]) |
361 |
+m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) |
362 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) |
363 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) |
364 |
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) |
365 |
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) |
366 |
+m4trace:configure.ac:62: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) |
367 |
+m4trace:configure.ac:62: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS |
368 |
|
369 |
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 |
370 |
index ff9cecc..e70c6c8 100644 |
371 |
--- a/autom4te.cache/traces.1 |
372 |
+++ b/autom4te.cache/traces.1 |
373 |
@@ -1,4 +1,4 @@ |
374 |
-m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.1], [http://bugs.gentoo.org/]) |
375 |
+m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.2], [http://bugs.gentoo.org/]) |
376 |
m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_]) |
377 |
m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_]) |
378 |
m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) |
379 |
@@ -430,34 +430,38 @@ m4trace:configure.ac:50: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS error.$ac_ob |
380 |
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) |
381 |
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
382 |
m4trace:configure.ac:50: -1- AC_LIBSOURCE([error.c]) |
383 |
-m4trace:configure.ac:52: -1- AC_CONFIG_FILES([Makefile |
384 |
- src/Makefile |
385 |
- scripts/Makefile |
386 |
- doc/Makefile |
387 |
- tests/Makefile]) |
388 |
-m4trace:configure.ac:58: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) |
389 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) |
390 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
391 |
-m4trace:configure.ac:58: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) |
392 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LTLIBOBJS]) |
393 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$]) |
394 |
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) |
395 |
-m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_TRUE]) |
396 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) |
397 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) |
398 |
-m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_FALSE]) |
399 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) |
400 |
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) |
401 |
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) |
402 |
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) |
403 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_builddir]) |
404 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_build_prefix]) |
405 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([srcdir]) |
406 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_srcdir]) |
407 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_srcdir]) |
408 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_srcdir]) |
409 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([builddir]) |
410 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_builddir]) |
411 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_builddir]) |
412 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([INSTALL]) |
413 |
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([MKDIR_P]) |
414 |
+m4trace:configure.ac:52: -1- AC_CONFIG_FILES([ |
415 |
+ Makefile |
416 |
+ src/Makefile |
417 |
+ scripts/Makefile |
418 |
+ doc/Makefile |
419 |
+ tests/Makefile |
420 |
+ tests/gnustack/Makefile |
421 |
+ tests/pxtpax/Makefile |
422 |
+]) |
423 |
+m4trace:configure.ac:62: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) |
424 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) |
425 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$]) |
426 |
+m4trace:configure.ac:62: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) |
427 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LTLIBOBJS]) |
428 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$]) |
429 |
+m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) |
430 |
+m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_TRUE]) |
431 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) |
432 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) |
433 |
+m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_FALSE]) |
434 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) |
435 |
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) |
436 |
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) |
437 |
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) |
438 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_builddir]) |
439 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_build_prefix]) |
440 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([srcdir]) |
441 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_srcdir]) |
442 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_srcdir]) |
443 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_srcdir]) |
444 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([builddir]) |
445 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_builddir]) |
446 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_builddir]) |
447 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([INSTALL]) |
448 |
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([MKDIR_P]) |
449 |
|
450 |
diff --git a/configure b/configure |
451 |
index 1b8c818..a9cc48b 100755 |
452 |
--- a/configure |
453 |
+++ b/configure |
454 |
@@ -1,6 +1,6 @@ |
455 |
#! /bin/sh |
456 |
# Guess values for system-dependent variables and create Makefiles. |
457 |
-# Generated by GNU Autoconf 2.68 for elfix 0.3.1. |
458 |
+# Generated by GNU Autoconf 2.68 for elfix 0.3.2. |
459 |
# |
460 |
# Report bugs to <http://bugs.gentoo.org/>. |
461 |
# |
462 |
@@ -560,8 +560,8 @@ MAKEFLAGS= |
463 |
# Identity of this package. |
464 |
PACKAGE_NAME='elfix' |
465 |
PACKAGE_TARNAME='elfix' |
466 |
-PACKAGE_VERSION='0.3.1' |
467 |
-PACKAGE_STRING='elfix 0.3.1' |
468 |
+PACKAGE_VERSION='0.3.2' |
469 |
+PACKAGE_STRING='elfix 0.3.2' |
470 |
PACKAGE_BUGREPORT='http://bugs.gentoo.org/' |
471 |
PACKAGE_URL='' |
472 |
|
473 |
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then |
474 |
# Omit some internal or obsolete options to make the list less imposing. |
475 |
# This message is too long to be a string in the A/UX 3.1 sh. |
476 |
cat <<_ACEOF |
477 |
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. |
478 |
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. |
479 |
|
480 |
Usage: $0 [OPTION]... [VAR=VALUE]... |
481 |
|
482 |
@@ -1313,7 +1313,7 @@ fi |
483 |
|
484 |
if test -n "$ac_init_help"; then |
485 |
case $ac_init_help in |
486 |
- short | recursive ) echo "Configuration of elfix 0.3.1:";; |
487 |
+ short | recursive ) echo "Configuration of elfix 0.3.2:";; |
488 |
esac |
489 |
cat <<\_ACEOF |
490 |
|
491 |
@@ -1401,7 +1401,7 @@ fi |
492 |
test -n "$ac_init_help" && exit $ac_status |
493 |
if $ac_init_version; then |
494 |
cat <<\_ACEOF |
495 |
-elfix configure 0.3.1 |
496 |
+elfix configure 0.3.2 |
497 |
generated by GNU Autoconf 2.68 |
498 |
|
499 |
Copyright (C) 2010 Free Software Foundation, Inc. |
500 |
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF |
501 |
This file contains any messages produced by compilers while |
502 |
running configure, to aid debugging if configure makes a mistake. |
503 |
|
504 |
-It was created by elfix $as_me 0.3.1, which was |
505 |
+It was created by elfix $as_me 0.3.2, which was |
506 |
generated by GNU Autoconf 2.68. Invocation command line was |
507 |
|
508 |
$ $0 $@ |
509 |
@@ -2698,7 +2698,7 @@ fi |
510 |
|
511 |
# Define the identity of the package. |
512 |
PACKAGE='elfix' |
513 |
- VERSION='0.3.1' |
514 |
+ VERSION='0.3.2' |
515 |
|
516 |
|
517 |
cat >>confdefs.h <<_ACEOF |
518 |
@@ -4581,7 +4581,7 @@ esac |
519 |
fi |
520 |
|
521 |
|
522 |
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile" |
523 |
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile" |
524 |
|
525 |
|
526 |
cat >confcache <<\_ACEOF |
527 |
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
528 |
# report actual input values of CONFIG_FILES etc. instead of their |
529 |
# values after options handling. |
530 |
ac_log=" |
531 |
-This file was extended by elfix $as_me 0.3.1, which was |
532 |
+This file was extended by elfix $as_me 0.3.2, which was |
533 |
generated by GNU Autoconf 2.68. Invocation command line was |
534 |
|
535 |
CONFIG_FILES = $CONFIG_FILES |
536 |
@@ -5188,7 +5188,7 @@ _ACEOF |
537 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
538 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
539 |
ac_cs_version="\\ |
540 |
-elfix config.status 0.3.1 |
541 |
+elfix config.status 0.3.2 |
542 |
configured by $0, generated by GNU Autoconf 2.68, |
543 |
with options \\"\$ac_cs_config\\" |
544 |
|
545 |
@@ -5324,6 +5324,8 @@ do |
546 |
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; |
547 |
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; |
548 |
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
549 |
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;; |
550 |
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;; |
551 |
|
552 |
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
553 |
esac |
554 |
|
555 |
diff --git a/configure.ac b/configure.ac |
556 |
index 9ccd9a0..98cb716 100644 |
557 |
--- a/configure.ac |
558 |
+++ b/configure.ac |
559 |
@@ -2,7 +2,7 @@ |
560 |
# Process this file with autoconf to produce a configure script. |
561 |
|
562 |
AC_PREREQ([2.65]) |
563 |
-AC_INIT([elfix], [0.3.1], [http://bugs.gentoo.org/]) |
564 |
+AC_INIT([elfix], [0.3.2], [http://bugs.gentoo.org/]) |
565 |
AC_CONFIG_SRCDIR([src/fix-gnustack.c]) |
566 |
AC_CONFIG_HEADERS([config.h]) |
567 |
AM_INIT_AUTOMAKE([1.11 foreign]) |
568 |
|
569 |
diff --git a/tests/Makefile.in b/tests/Makefile.in |
570 |
index f44395d..00fb601 100644 |
571 |
--- a/tests/Makefile.in |
572 |
+++ b/tests/Makefile.in |
573 |
@@ -14,7 +14,6 @@ |
574 |
# PARTICULAR PURPOSE. |
575 |
|
576 |
@SET_MAKE@ |
577 |
- |
578 |
VPATH = @srcdir@ |
579 |
pkgdatadir = $(datadir)/@PACKAGE@ |
580 |
pkgincludedir = $(includedir)/@PACKAGE@ |
581 |
@@ -32,7 +31,6 @@ POST_INSTALL = : |
582 |
NORMAL_UNINSTALL = : |
583 |
PRE_UNINSTALL = : |
584 |
POST_UNINSTALL = : |
585 |
-noinst_PROGRAMS = bad-gnustack$(EXEEXT) |
586 |
subdir = tests |
587 |
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
588 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
589 |
@@ -43,22 +41,49 @@ mkinstalldirs = $(install_sh) -d |
590 |
CONFIG_HEADER = $(top_builddir)/config.h |
591 |
CONFIG_CLEAN_FILES = |
592 |
CONFIG_CLEAN_VPATH_FILES = |
593 |
-PROGRAMS = $(noinst_PROGRAMS) |
594 |
-am_bad_gnustack_OBJECTS = bad-gnustack.$(OBJEXT) |
595 |
-bad_gnustack_OBJECTS = $(am_bad_gnustack_OBJECTS) |
596 |
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
597 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp |
598 |
-am__depfiles_maybe = depfiles |
599 |
-am__mv = mv -f |
600 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
601 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
602 |
-CCLD = $(CC) |
603 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
604 |
-SOURCES = $(bad_gnustack_SOURCES) |
605 |
-DIST_SOURCES = $(bad_gnustack_SOURCES) |
606 |
+SOURCES = |
607 |
+DIST_SOURCES = |
608 |
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
609 |
+ html-recursive info-recursive install-data-recursive \ |
610 |
+ install-dvi-recursive install-exec-recursive \ |
611 |
+ install-html-recursive install-info-recursive \ |
612 |
+ install-pdf-recursive install-ps-recursive install-recursive \ |
613 |
+ installcheck-recursive installdirs-recursive pdf-recursive \ |
614 |
+ ps-recursive uninstall-recursive |
615 |
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
616 |
+ distclean-recursive maintainer-clean-recursive |
617 |
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
618 |
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
619 |
+ distdir |
620 |
ETAGS = etags |
621 |
CTAGS = ctags |
622 |
+DIST_SUBDIRS = $(SUBDIRS) |
623 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
624 |
+am__relativize = \ |
625 |
+ dir0=`pwd`; \ |
626 |
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
627 |
+ sed_rest='s,^[^/]*/*,,'; \ |
628 |
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
629 |
+ sed_butlast='s,/*[^/]*$$,,'; \ |
630 |
+ while test -n "$$dir1"; do \ |
631 |
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
632 |
+ if test "$$first" != "."; then \ |
633 |
+ if test "$$first" = ".."; then \ |
634 |
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
635 |
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
636 |
+ else \ |
637 |
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
638 |
+ if test "$$first2" = "$$first"; then \ |
639 |
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
640 |
+ else \ |
641 |
+ dir2="../$$dir2"; \ |
642 |
+ fi; \ |
643 |
+ dir0="$$dir0"/"$$first"; \ |
644 |
+ fi; \ |
645 |
+ fi; \ |
646 |
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
647 |
+ done; \ |
648 |
+ reldir="$$dir2" |
649 |
ACLOCAL = @ACLOCAL@ |
650 |
AMTAR = @AMTAR@ |
651 |
AUTOCONF = @AUTOCONF@ |
652 |
@@ -146,18 +171,10 @@ target_alias = @target_alias@ |
653 |
top_build_prefix = @top_build_prefix@ |
654 |
top_builddir = @top_builddir@ |
655 |
top_srcdir = @top_srcdir@ |
656 |
-bad_gnustack_SOURCES = bad-gnustack.c |
657 |
-bad_gnustack_DEPENDENCIES = bad-asm.o |
658 |
-bad_gnustack_LDADD = bad-asm.o |
659 |
-EXTRA_DIST = bad64.asm bad32.asm |
660 |
-ARCH = $(shell uname -m | sed -e 's/i./x/') |
661 |
-check_SCRIPTS = test.sh |
662 |
-TEST = $(check_SCRIPTS) |
663 |
-CLEANFILES = bad-asm.o test.sh |
664 |
-all: all-am |
665 |
+SUBDIRS = gnustack pxtpax |
666 |
+all: all-recursive |
667 |
|
668 |
.SUFFIXES: |
669 |
-.SUFFIXES: .c .o .obj |
670 |
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
671 |
@for dep in $?; do \ |
672 |
case '$(am__configure_deps)' in \ |
673 |
@@ -189,33 +206,75 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
674 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
675 |
$(am__aclocal_m4_deps): |
676 |
|
677 |
-clean-noinstPROGRAMS: |
678 |
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) |
679 |
-bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCIES) |
680 |
- @rm -f bad-gnustack$(EXEEXT) |
681 |
- $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS) |
682 |
- |
683 |
-mostlyclean-compile: |
684 |
- -rm -f *.$(OBJEXT) |
685 |
- |
686 |
-distclean-compile: |
687 |
- -rm -f *.tab.c |
688 |
- |
689 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quote@ |
690 |
- |
691 |
-.c.o: |
692 |
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
693 |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
694 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
695 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
696 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
697 |
- |
698 |
-.c.obj: |
699 |
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
700 |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
701 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
702 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
703 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
704 |
+# This directory's subdirectories are mostly independent; you can cd |
705 |
+# into them and run `make' without going through this Makefile. |
706 |
+# To change the values of `make' variables: instead of editing Makefiles, |
707 |
+# (1) if the variable is set in `config.status', edit `config.status' |
708 |
+# (which will cause the Makefiles to be regenerated when you run `make'); |
709 |
+# (2) otherwise, pass the desired values on the `make' command line. |
710 |
+$(RECURSIVE_TARGETS): |
711 |
+ @fail= failcom='exit 1'; \ |
712 |
+ for f in x $$MAKEFLAGS; do \ |
713 |
+ case $$f in \ |
714 |
+ *=* | --[!k]*);; \ |
715 |
+ *k*) failcom='fail=yes';; \ |
716 |
+ esac; \ |
717 |
+ done; \ |
718 |
+ dot_seen=no; \ |
719 |
+ target=`echo $@ | sed s/-recursive//`; \ |
720 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \ |
721 |
+ echo "Making $$target in $$subdir"; \ |
722 |
+ if test "$$subdir" = "."; then \ |
723 |
+ dot_seen=yes; \ |
724 |
+ local_target="$$target-am"; \ |
725 |
+ else \ |
726 |
+ local_target="$$target"; \ |
727 |
+ fi; \ |
728 |
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
729 |
+ || eval $$failcom; \ |
730 |
+ done; \ |
731 |
+ if test "$$dot_seen" = "no"; then \ |
732 |
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
733 |
+ fi; test -z "$$fail" |
734 |
+ |
735 |
+$(RECURSIVE_CLEAN_TARGETS): |
736 |
+ @fail= failcom='exit 1'; \ |
737 |
+ for f in x $$MAKEFLAGS; do \ |
738 |
+ case $$f in \ |
739 |
+ *=* | --[!k]*);; \ |
740 |
+ *k*) failcom='fail=yes';; \ |
741 |
+ esac; \ |
742 |
+ done; \ |
743 |
+ dot_seen=no; \ |
744 |
+ case "$@" in \ |
745 |
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
746 |
+ *) list='$(SUBDIRS)' ;; \ |
747 |
+ esac; \ |
748 |
+ rev=''; for subdir in $$list; do \ |
749 |
+ if test "$$subdir" = "."; then :; else \ |
750 |
+ rev="$$subdir $$rev"; \ |
751 |
+ fi; \ |
752 |
+ done; \ |
753 |
+ rev="$$rev ."; \ |
754 |
+ target=`echo $@ | sed s/-recursive//`; \ |
755 |
+ for subdir in $$rev; do \ |
756 |
+ echo "Making $$target in $$subdir"; \ |
757 |
+ if test "$$subdir" = "."; then \ |
758 |
+ local_target="$$target-am"; \ |
759 |
+ else \ |
760 |
+ local_target="$$target"; \ |
761 |
+ fi; \ |
762 |
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
763 |
+ || eval $$failcom; \ |
764 |
+ done && test -z "$$fail" |
765 |
+tags-recursive: |
766 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \ |
767 |
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
768 |
+ done |
769 |
+ctags-recursive: |
770 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \ |
771 |
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
772 |
+ done |
773 |
|
774 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
775 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
776 |
@@ -227,10 +286,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
777 |
mkid -fID $$unique |
778 |
tags: TAGS |
779 |
|
780 |
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
781 |
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
782 |
$(TAGS_FILES) $(LISP) |
783 |
set x; \ |
784 |
here=`pwd`; \ |
785 |
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
786 |
+ include_option=--etags-include; \ |
787 |
+ empty_fix=.; \ |
788 |
+ else \ |
789 |
+ include_option=--include; \ |
790 |
+ empty_fix=; \ |
791 |
+ fi; \ |
792 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \ |
793 |
+ if test "$$subdir" = .; then :; else \ |
794 |
+ test ! -f $$subdir/TAGS || \ |
795 |
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
796 |
+ fi; \ |
797 |
+ done; \ |
798 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
799 |
unique=`for i in $$list; do \ |
800 |
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
801 |
@@ -249,7 +321,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
802 |
fi; \ |
803 |
fi |
804 |
ctags: CTAGS |
805 |
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
806 |
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
807 |
$(TAGS_FILES) $(LISP) |
808 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
809 |
unique=`for i in $$list; do \ |
810 |
@@ -299,20 +371,48 @@ distdir: $(DISTFILES) |
811 |
|| exit 1; \ |
812 |
fi; \ |
813 |
done |
814 |
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
815 |
+ if test "$$subdir" = .; then :; else \ |
816 |
+ test -d "$(distdir)/$$subdir" \ |
817 |
+ || $(MKDIR_P) "$(distdir)/$$subdir" \ |
818 |
+ || exit 1; \ |
819 |
+ fi; \ |
820 |
+ done |
821 |
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
822 |
+ if test "$$subdir" = .; then :; else \ |
823 |
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
824 |
+ $(am__relativize); \ |
825 |
+ new_distdir=$$reldir; \ |
826 |
+ dir1=$$subdir; dir2="$(top_distdir)"; \ |
827 |
+ $(am__relativize); \ |
828 |
+ new_top_distdir=$$reldir; \ |
829 |
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
830 |
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
831 |
+ ($(am__cd) $$subdir && \ |
832 |
+ $(MAKE) $(AM_MAKEFLAGS) \ |
833 |
+ top_distdir="$$new_top_distdir" \ |
834 |
+ distdir="$$new_distdir" \ |
835 |
+ am__remove_distdir=: \ |
836 |
+ am__skip_length_check=: \ |
837 |
+ am__skip_mode_fix=: \ |
838 |
+ distdir) \ |
839 |
+ || exit 1; \ |
840 |
+ fi; \ |
841 |
+ done |
842 |
check-am: all-am |
843 |
- $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) |
844 |
-check: check-am |
845 |
-all-am: Makefile $(PROGRAMS) |
846 |
-installdirs: |
847 |
-install: install-am |
848 |
-install-exec: install-exec-am |
849 |
-install-data: install-data-am |
850 |
-uninstall: uninstall-am |
851 |
+check: check-recursive |
852 |
+all-am: Makefile |
853 |
+installdirs: installdirs-recursive |
854 |
+installdirs-am: |
855 |
+install: install-recursive |
856 |
+install-exec: install-exec-recursive |
857 |
+install-data: install-data-recursive |
858 |
+uninstall: uninstall-recursive |
859 |
|
860 |
install-am: all-am |
861 |
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
862 |
|
863 |
-installcheck: installcheck-am |
864 |
+installcheck: installcheck-recursive |
865 |
install-strip: |
866 |
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
867 |
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
868 |
@@ -321,7 +421,6 @@ install-strip: |
869 |
mostlyclean-generic: |
870 |
|
871 |
clean-generic: |
872 |
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
873 |
|
874 |
distclean-generic: |
875 |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
876 |
@@ -330,105 +429,88 @@ distclean-generic: |
877 |
maintainer-clean-generic: |
878 |
@echo "This command is intended for maintainers to use" |
879 |
@echo "it deletes files that may require special tools to rebuild." |
880 |
-clean: clean-am |
881 |
+clean: clean-recursive |
882 |
|
883 |
-clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am |
884 |
+clean-am: clean-generic mostlyclean-am |
885 |
|
886 |
-distclean: distclean-am |
887 |
- -rm -rf ./$(DEPDIR) |
888 |
+distclean: distclean-recursive |
889 |
-rm -f Makefile |
890 |
-distclean-am: clean-am distclean-compile distclean-generic \ |
891 |
- distclean-tags |
892 |
+distclean-am: clean-am distclean-generic distclean-tags |
893 |
|
894 |
-dvi: dvi-am |
895 |
+dvi: dvi-recursive |
896 |
|
897 |
dvi-am: |
898 |
|
899 |
-html: html-am |
900 |
+html: html-recursive |
901 |
|
902 |
html-am: |
903 |
|
904 |
-info: info-am |
905 |
+info: info-recursive |
906 |
|
907 |
info-am: |
908 |
|
909 |
install-data-am: |
910 |
|
911 |
-install-dvi: install-dvi-am |
912 |
+install-dvi: install-dvi-recursive |
913 |
|
914 |
install-dvi-am: |
915 |
|
916 |
install-exec-am: |
917 |
|
918 |
-install-html: install-html-am |
919 |
+install-html: install-html-recursive |
920 |
|
921 |
install-html-am: |
922 |
|
923 |
-install-info: install-info-am |
924 |
+install-info: install-info-recursive |
925 |
|
926 |
install-info-am: |
927 |
|
928 |
install-man: |
929 |
|
930 |
-install-pdf: install-pdf-am |
931 |
+install-pdf: install-pdf-recursive |
932 |
|
933 |
install-pdf-am: |
934 |
|
935 |
-install-ps: install-ps-am |
936 |
+install-ps: install-ps-recursive |
937 |
|
938 |
install-ps-am: |
939 |
|
940 |
installcheck-am: |
941 |
|
942 |
-maintainer-clean: maintainer-clean-am |
943 |
- -rm -rf ./$(DEPDIR) |
944 |
+maintainer-clean: maintainer-clean-recursive |
945 |
-rm -f Makefile |
946 |
maintainer-clean-am: distclean-am maintainer-clean-generic |
947 |
|
948 |
-mostlyclean: mostlyclean-am |
949 |
+mostlyclean: mostlyclean-recursive |
950 |
|
951 |
-mostlyclean-am: mostlyclean-compile mostlyclean-generic |
952 |
+mostlyclean-am: mostlyclean-generic |
953 |
|
954 |
-pdf: pdf-am |
955 |
+pdf: pdf-recursive |
956 |
|
957 |
pdf-am: |
958 |
|
959 |
-ps: ps-am |
960 |
+ps: ps-recursive |
961 |
|
962 |
ps-am: |
963 |
|
964 |
uninstall-am: |
965 |
|
966 |
-.MAKE: check-am install-am install-strip |
967 |
- |
968 |
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
969 |
- clean-noinstPROGRAMS ctags distclean distclean-compile \ |
970 |
- distclean-generic distclean-tags distdir dvi dvi-am html \ |
971 |
- html-am info info-am install install-am install-data \ |
972 |
- install-data-am install-dvi install-dvi-am install-exec \ |
973 |
- install-exec-am install-html install-html-am install-info \ |
974 |
- install-info-am install-man install-pdf install-pdf-am \ |
975 |
- install-ps install-ps-am install-strip installcheck \ |
976 |
- installcheck-am installdirs maintainer-clean \ |
977 |
- maintainer-clean-generic mostlyclean mostlyclean-compile \ |
978 |
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ |
979 |
- uninstall-am |
980 |
- |
981 |
- |
982 |
-bad-asm.o: bad64.asm bad32.asm |
983 |
- [[ "$(ARCH)" == "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad32.o bad-asm.o || true |
984 |
- [[ "$(ARCH)" == "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv bad64.o bad-asm.o || true |
985 |
- |
986 |
-test.sh: |
987 |
- @echo "================================================================================" |
988 |
- @echo |
989 |
- @echo "Fixing Bad GNU_STACK Elf" |
990 |
- @../src/fix-gnustack -f bad-gnustack |
991 |
- @echo |
992 |
- @echo "Fixed Bad GNU_STACK Elf" |
993 |
- @../src/fix-gnustack bad-gnustack |
994 |
- @echo |
995 |
- @echo "================================================================================" |
996 |
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
997 |
+ install-am install-strip tags-recursive |
998 |
+ |
999 |
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1000 |
+ all all-am check check-am clean clean-generic ctags \ |
1001 |
+ ctags-recursive distclean distclean-generic distclean-tags \ |
1002 |
+ distdir dvi dvi-am html html-am info info-am install \ |
1003 |
+ install-am install-data install-data-am install-dvi \ |
1004 |
+ install-dvi-am install-exec install-exec-am install-html \ |
1005 |
+ install-html-am install-info install-info-am install-man \ |
1006 |
+ install-pdf install-pdf-am install-ps install-ps-am \ |
1007 |
+ install-strip installcheck installcheck-am installdirs \ |
1008 |
+ installdirs-am maintainer-clean maintainer-clean-generic \ |
1009 |
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ |
1010 |
+ tags-recursive uninstall uninstall-am |
1011 |
+ |
1012 |
|
1013 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
1014 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
1015 |
|
1016 |
diff --git a/tests/Makefile.in b/tests/gnustack/Makefile.in |
1017 |
similarity index 98% |
1018 |
copy from tests/Makefile.in |
1019 |
copy to tests/gnustack/Makefile.in |
1020 |
index f44395d..954ccb1 100644 |
1021 |
--- a/tests/Makefile.in |
1022 |
+++ b/tests/gnustack/Makefile.in |
1023 |
@@ -33,7 +33,7 @@ NORMAL_UNINSTALL = : |
1024 |
PRE_UNINSTALL = : |
1025 |
POST_UNINSTALL = : |
1026 |
noinst_PROGRAMS = bad-gnustack$(EXEEXT) |
1027 |
-subdir = tests |
1028 |
+subdir = tests/gnustack |
1029 |
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
1030 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1031 |
am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
1032 |
@@ -167,9 +167,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
1033 |
exit 1;; \ |
1034 |
esac; \ |
1035 |
done; \ |
1036 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ |
1037 |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/gnustack/Makefile'; \ |
1038 |
$(am__cd) $(top_srcdir) && \ |
1039 |
- $(AUTOMAKE) --foreign tests/Makefile |
1040 |
+ $(AUTOMAKE) --foreign tests/gnustack/Makefile |
1041 |
.PRECIOUS: Makefile |
1042 |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1043 |
@case '$?' in \ |
1044 |
@@ -423,10 +423,10 @@ test.sh: |
1045 |
@echo "================================================================================" |
1046 |
@echo |
1047 |
@echo "Fixing Bad GNU_STACK Elf" |
1048 |
- @../src/fix-gnustack -f bad-gnustack |
1049 |
+ @../../src/fix-gnustack -f bad-gnustack |
1050 |
@echo |
1051 |
@echo "Fixed Bad GNU_STACK Elf" |
1052 |
- @../src/fix-gnustack bad-gnustack |
1053 |
+ @../../src/fix-gnustack bad-gnustack |
1054 |
@echo |
1055 |
@echo "================================================================================" |
1056 |
|
1057 |
|
1058 |
diff --git a/tests/Makefile.in b/tests/pxtpax/Makefile.in |
1059 |
similarity index 89% |
1060 |
copy from tests/Makefile.in |
1061 |
copy to tests/pxtpax/Makefile.in |
1062 |
index f44395d..0b0d61e 100644 |
1063 |
--- a/tests/Makefile.in |
1064 |
+++ b/tests/pxtpax/Makefile.in |
1065 |
@@ -32,8 +32,8 @@ POST_INSTALL = : |
1066 |
NORMAL_UNINSTALL = : |
1067 |
PRE_UNINSTALL = : |
1068 |
POST_UNINSTALL = : |
1069 |
-noinst_PROGRAMS = bad-gnustack$(EXEEXT) |
1070 |
-subdir = tests |
1071 |
+noinst_PROGRAMS = daemon$(EXEEXT) |
1072 |
+subdir = tests/pxtpax |
1073 |
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
1074 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1075 |
am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
1076 |
@@ -44,8 +44,9 @@ CONFIG_HEADER = $(top_builddir)/config.h |
1077 |
CONFIG_CLEAN_FILES = |
1078 |
CONFIG_CLEAN_VPATH_FILES = |
1079 |
PROGRAMS = $(noinst_PROGRAMS) |
1080 |
-am_bad_gnustack_OBJECTS = bad-gnustack.$(OBJEXT) |
1081 |
-bad_gnustack_OBJECTS = $(am_bad_gnustack_OBJECTS) |
1082 |
+am_daemon_OBJECTS = daemon.$(OBJEXT) |
1083 |
+daemon_OBJECTS = $(am_daemon_OBJECTS) |
1084 |
+daemon_LDADD = $(LDADD) |
1085 |
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
1086 |
depcomp = $(SHELL) $(top_srcdir)/depcomp |
1087 |
am__depfiles_maybe = depfiles |
1088 |
@@ -54,8 +55,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
1089 |
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
1090 |
CCLD = $(CC) |
1091 |
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
1092 |
-SOURCES = $(bad_gnustack_SOURCES) |
1093 |
-DIST_SOURCES = $(bad_gnustack_SOURCES) |
1094 |
+SOURCES = $(daemon_SOURCES) |
1095 |
+DIST_SOURCES = $(daemon_SOURCES) |
1096 |
ETAGS = etags |
1097 |
CTAGS = ctags |
1098 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1099 |
@@ -146,14 +147,11 @@ target_alias = @target_alias@ |
1100 |
top_build_prefix = @top_build_prefix@ |
1101 |
top_builddir = @top_builddir@ |
1102 |
top_srcdir = @top_srcdir@ |
1103 |
-bad_gnustack_SOURCES = bad-gnustack.c |
1104 |
-bad_gnustack_DEPENDENCIES = bad-asm.o |
1105 |
-bad_gnustack_LDADD = bad-asm.o |
1106 |
-EXTRA_DIST = bad64.asm bad32.asm |
1107 |
-ARCH = $(shell uname -m | sed -e 's/i./x/') |
1108 |
+daemon_SOURCES = daemon.c |
1109 |
+EXTRA_DIST = init.sh dotest.sh |
1110 |
check_SCRIPTS = test.sh |
1111 |
TEST = $(check_SCRIPTS) |
1112 |
-CLEANFILES = bad-asm.o test.sh |
1113 |
+CLEANFILES = daemon.pid |
1114 |
all: all-am |
1115 |
|
1116 |
.SUFFIXES: |
1117 |
@@ -167,9 +165,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
1118 |
exit 1;; \ |
1119 |
esac; \ |
1120 |
done; \ |
1121 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ |
1122 |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/pxtpax/Makefile'; \ |
1123 |
$(am__cd) $(top_srcdir) && \ |
1124 |
- $(AUTOMAKE) --foreign tests/Makefile |
1125 |
+ $(AUTOMAKE) --foreign tests/pxtpax/Makefile |
1126 |
.PRECIOUS: Makefile |
1127 |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1128 |
@case '$?' in \ |
1129 |
@@ -191,9 +189,9 @@ $(am__aclocal_m4_deps): |
1130 |
|
1131 |
clean-noinstPROGRAMS: |
1132 |
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) |
1133 |
-bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCIES) |
1134 |
- @rm -f bad-gnustack$(EXEEXT) |
1135 |
- $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS) |
1136 |
+daemon$(EXEEXT): $(daemon_OBJECTS) $(daemon_DEPENDENCIES) |
1137 |
+ @rm -f daemon$(EXEEXT) |
1138 |
+ $(LINK) $(daemon_OBJECTS) $(daemon_LDADD) $(LIBS) |
1139 |
|
1140 |
mostlyclean-compile: |
1141 |
-rm -f *.$(OBJEXT) |
1142 |
@@ -201,7 +199,7 @@ mostlyclean-compile: |
1143 |
distclean-compile: |
1144 |
-rm -f *.tab.c |
1145 |
|
1146 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quote@ |
1147 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemon.Po@am__quote@ |
1148 |
|
1149 |
.c.o: |
1150 |
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
1151 |
@@ -415,20 +413,8 @@ uninstall-am: |
1152 |
uninstall-am |
1153 |
|
1154 |
|
1155 |
-bad-asm.o: bad64.asm bad32.asm |
1156 |
- [[ "$(ARCH)" == "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad32.o bad-asm.o || true |
1157 |
- [[ "$(ARCH)" == "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv bad64.o bad-asm.o || true |
1158 |
- |
1159 |
test.sh: |
1160 |
- @echo "================================================================================" |
1161 |
- @echo |
1162 |
- @echo "Fixing Bad GNU_STACK Elf" |
1163 |
- @../src/fix-gnustack -f bad-gnustack |
1164 |
- @echo |
1165 |
- @echo "Fixed Bad GNU_STACK Elf" |
1166 |
- @../src/fix-gnustack bad-gnustack |
1167 |
- @echo |
1168 |
- @echo "================================================================================" |
1169 |
+ ./dotest.sh |
1170 |
|
1171 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
1172 |
# Otherwise a system limit (for SysV at least) may be exceeded. |