* [gentoo-commits] proj/elfix:elfix-0.3.x commit in: /, tests/gnustack/, autom4te.cache/, tests/, tests/pxtpax/
@ 2011-11-15 19:47 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2011-11-15 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 576128f60cd8613384cd4b76759b9b687523346a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 19:47:13 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 19:47:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=576128f6
Prepare release 0.3.2
---
ChangeLog | 3 +-
autom4te.cache/output.0 | 24 ++--
autom4te.cache/output.1 | 24 ++--
autom4te.cache/requests | 38 +++---
autom4te.cache/traces.0 | 18 +-
autom4te.cache/traces.1 | 68 +++++----
configure | 24 ++--
configure.ac | 2 +-
tests/Makefile.in | 310 ++++++++++++++++++++++++--------------
tests/{ => gnustack}/Makefile.in | 10 +-
tests/{ => pxtpax}/Makefile.in | 48 ++----
11 files changed, 324 insertions(+), 245 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f8cc7b9..4356ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+2011-11-15 Anthony G. Basile <blueness@gentoo.org>
* tests/pxtpax: compare pax flags on binary and process
* fix-gnustack and paxctl-ng: fix exit code on success
@@ -5,7 +6,7 @@
* paxctl-ng: if a file fails to open O_RDWR then
don't do PT_PAX markings but continue with XT_PAX
-2011-10-23
+2011-10-23 Anthony G. Basile <blueness@gentoo.org>
* Release 0.3.0
* add XT_PAX read/write in paxct-ng.c and paxmodule.c
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index f8c8e58..183ffc6 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1.
+@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2.
@%:@
@%:@ Report bugs to <http://bugs.gentoo.org/>.
@%:@
@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='elfix'
PACKAGE_TARNAME='elfix'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='elfix 0.3.1'
+PACKAGE_VERSION='0.3.2'
+PACKAGE_STRING='elfix 0.3.2'
PACKAGE_BUGREPORT='http://bugs.gentoo.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems.
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of elfix 0.3.1:";;
+ short | recursive ) echo "Configuration of elfix 0.3.2:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-elfix configure 0.3.1
+elfix configure 0.3.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by elfix $as_me 0.3.1, which was
+It was created by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2698,7 +2698,7 @@ fi
# Define the identity of the package.
PACKAGE='elfix'
- VERSION='0.3.1'
+ VERSION='0.3.2'
cat >>confdefs.h <<_ACEOF
@@ -4581,7 +4581,7 @@ esac
fi
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile"
cat >confcache <<\_ACEOF
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by elfix $as_me 0.3.1, which was
+This file was extended by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5188,7 +5188,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-elfix config.status 0.3.1
+elfix config.status 0.3.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -5324,6 +5324,8 @@ do
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;;
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index f8c8e58..183ffc6 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1.
+@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2.
@%:@
@%:@ Report bugs to <http://bugs.gentoo.org/>.
@%:@
@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='elfix'
PACKAGE_TARNAME='elfix'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='elfix 0.3.1'
+PACKAGE_VERSION='0.3.2'
+PACKAGE_STRING='elfix 0.3.2'
PACKAGE_BUGREPORT='http://bugs.gentoo.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems.
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of elfix 0.3.1:";;
+ short | recursive ) echo "Configuration of elfix 0.3.2:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-elfix configure 0.3.1
+elfix configure 0.3.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by elfix $as_me 0.3.1, which was
+It was created by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2698,7 +2698,7 @@ fi
# Define the identity of the package.
PACKAGE='elfix'
- VERSION='0.3.1'
+ VERSION='0.3.2'
cat >>confdefs.h <<_ACEOF
@@ -4581,7 +4581,7 @@ esac
fi
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile"
cat >confcache <<\_ACEOF
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by elfix $as_me 0.3.1, which was
+This file was extended by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5188,7 +5188,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-elfix config.status 0.3.1
+elfix config.status 0.3.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -5324,6 +5324,8 @@ do
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;;
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 9162197..4be421f 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -64,8 +64,8 @@
'AM_SET_LEADING_DOT' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
'AM_MAKE_INCLUDE' => 1
@@ -83,55 +83,55 @@
'configure.ac'
],
{
- '_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
- 'AC_INIT' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
- '_AM_COND_IF' => 1,
+ 'AC_INIT' => 1,
'AC_CANONICAL_TARGET' => 1,
- 'AC_SUBST' => 1,
+ '_AM_COND_IF' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_FC_SRCEXT' => 1,
+ 'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1,
+ 'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'AM_PATH_GUILE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
+ 'AM_PATH_GUILE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
- 'm4_sinclude' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'LT_SUPPORTED_TAG' => 1,
+ 'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_NLS' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
'_m4_warn' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
'AM_PROG_CXX_C_O' => 1,
- '_AM_COND_ENDIF' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
+ '_AM_COND_ENDIF' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_SILENT_RULES' => 1,
'AM_PROG_MOC' => 1,
'AC_CONFIG_FILES' => 1,
- 'include' => 1,
'LT_INIT' => 1,
- 'AM_PROG_AR' => 1,
+ 'include' => 1,
'AM_GNU_GETTEXT' => 1,
+ 'AM_PROG_AR' => 1,
'AC_LIBSOURCE' => 1,
- 'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- 'sinclude' => 1,
- 'AM_PROG_CC_C_O' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'm4_pattern_allow' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'sinclude' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_POT_TOOLS' => 1,
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index 469b21f..9909fcf 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -761,12 +761,12 @@ m4trace:configure.ac:46: -1- m4_pattern_allow([^_UINT8_T$])
m4trace:configure.ac:46: -1- m4_pattern_allow([^uint8_t$])
m4trace:configure.ac:47: -1- m4_pattern_allow([^uint16_t$])
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:58: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:58: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:62: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:62: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index ff9cecc..e70c6c8 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -1,4 +1,4 @@
-m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.1], [http://bugs.gentoo.org/])
+m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.2], [http://bugs.gentoo.org/])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -430,34 +430,38 @@ m4trace:configure.ac:50: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS error.$ac_ob
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:50: -1- AC_LIBSOURCE([error.c])
-m4trace:configure.ac:52: -1- AC_CONFIG_FILES([Makefile
- src/Makefile
- scripts/Makefile
- doc/Makefile
- tests/Makefile])
-m4trace:configure.ac:58: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:58: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:58: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:52: -1- AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ scripts/Makefile
+ doc/Makefile
+ tests/Makefile
+ tests/gnustack/Makefile
+ tests/pxtpax/Makefile
+])
+m4trace:configure.ac:62: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:62: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:62: -1- AC_SUBST_TRACE([MKDIR_P])
diff --git a/configure b/configure
index 1b8c818..a9cc48b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for elfix 0.3.1.
+# Generated by GNU Autoconf 2.68 for elfix 0.3.2.
#
# Report bugs to <http://bugs.gentoo.org/>.
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='elfix'
PACKAGE_TARNAME='elfix'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='elfix 0.3.1'
+PACKAGE_VERSION='0.3.2'
+PACKAGE_STRING='elfix 0.3.2'
PACKAGE_BUGREPORT='http://bugs.gentoo.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures elfix 0.3.1 to adapt to many kinds of systems.
+\`configure' configures elfix 0.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of elfix 0.3.1:";;
+ short | recursive ) echo "Configuration of elfix 0.3.2:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-elfix configure 0.3.1
+elfix configure 0.3.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by elfix $as_me 0.3.1, which was
+It was created by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2698,7 +2698,7 @@ fi
# Define the identity of the package.
PACKAGE='elfix'
- VERSION='0.3.1'
+ VERSION='0.3.2'
cat >>confdefs.h <<_ACEOF
@@ -4581,7 +4581,7 @@ esac
fi
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makefile"
cat >confcache <<\_ACEOF
@@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by elfix $as_me 0.3.1, which was
+This file was extended by elfix $as_me 0.3.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5188,7 +5188,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-elfix config.status 0.3.1
+elfix config.status 0.3.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -5324,6 +5324,8 @@ do
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tests/gnustack/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gnustack/Makefile" ;;
+ "tests/pxtpax/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pxtpax/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/configure.ac b/configure.ac
index 9ccd9a0..98cb716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([elfix], [0.3.1], [http://bugs.gentoo.org/])
+AC_INIT([elfix], [0.3.2], [http://bugs.gentoo.org/])
AC_CONFIG_SRCDIR([src/fix-gnustack.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 foreign])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f44395d..00fb601 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,7 +14,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -32,7 +31,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-noinst_PROGRAMS = bad-gnustack$(EXEEXT)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -43,22 +41,49 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_bad_gnustack_OBJECTS = bad-gnustack.$(OBJEXT)
-bad_gnustack_OBJECTS = $(am_bad_gnustack_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(bad_gnustack_SOURCES)
-DIST_SOURCES = $(bad_gnustack_SOURCES)
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
@@ -146,18 +171,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-bad_gnustack_SOURCES = bad-gnustack.c
-bad_gnustack_DEPENDENCIES = bad-asm.o
-bad_gnustack_LDADD = bad-asm.o
-EXTRA_DIST = bad64.asm bad32.asm
-ARCH = $(shell uname -m | sed -e 's/i./x/')
-check_SCRIPTS = test.sh
-TEST = $(check_SCRIPTS)
-CLEANFILES = bad-asm.o test.sh
-all: all-am
+SUBDIRS = gnustack pxtpax
+all: all-recursive
.SUFFIXES:
-.SUFFIXES: .c .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -189,33 +206,75 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-noinstPROGRAMS:
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCIES)
- @rm -f bad-gnustack$(EXEEXT)
- $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -227,10 +286,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -249,7 +321,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -299,20 +371,48 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -321,7 +421,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -330,105 +429,88 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
-clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-generic mostlyclean-am
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am:
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-generic
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am:
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-noinstPROGRAMS ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am
-
-
-bad-asm.o: bad64.asm bad32.asm
- [[ "$(ARCH)" == "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad32.o bad-asm.o || true
- [[ "$(ARCH)" == "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv bad64.o bad-asm.o || true
-
-test.sh:
- @echo "================================================================================"
- @echo
- @echo "Fixing Bad GNU_STACK Elf"
- @../src/fix-gnustack -f bad-gnustack
- @echo
- @echo "Fixed Bad GNU_STACK Elf"
- @../src/fix-gnustack bad-gnustack
- @echo
- @echo "================================================================================"
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/Makefile.in b/tests/gnustack/Makefile.in
similarity index 98%
copy from tests/Makefile.in
copy to tests/gnustack/Makefile.in
index f44395d..954ccb1 100644
--- a/tests/Makefile.in
+++ b/tests/gnustack/Makefile.in
@@ -33,7 +33,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
noinst_PROGRAMS = bad-gnustack$(EXEEXT)
-subdir = tests
+subdir = tests/gnustack
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -167,9 +167,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/gnustack/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ $(AUTOMAKE) --foreign tests/gnustack/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -423,10 +423,10 @@ test.sh:
@echo "================================================================================"
@echo
@echo "Fixing Bad GNU_STACK Elf"
- @../src/fix-gnustack -f bad-gnustack
+ @../../src/fix-gnustack -f bad-gnustack
@echo
@echo "Fixed Bad GNU_STACK Elf"
- @../src/fix-gnustack bad-gnustack
+ @../../src/fix-gnustack bad-gnustack
@echo
@echo "================================================================================"
diff --git a/tests/Makefile.in b/tests/pxtpax/Makefile.in
similarity index 89%
copy from tests/Makefile.in
copy to tests/pxtpax/Makefile.in
index f44395d..0b0d61e 100644
--- a/tests/Makefile.in
+++ b/tests/pxtpax/Makefile.in
@@ -32,8 +32,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-noinst_PROGRAMS = bad-gnustack$(EXEEXT)
-subdir = tests
+noinst_PROGRAMS = daemon$(EXEEXT)
+subdir = tests/pxtpax
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -44,8 +44,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
-am_bad_gnustack_OBJECTS = bad-gnustack.$(OBJEXT)
-bad_gnustack_OBJECTS = $(am_bad_gnustack_OBJECTS)
+am_daemon_OBJECTS = daemon.$(OBJEXT)
+daemon_OBJECTS = $(am_daemon_OBJECTS)
+daemon_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -54,8 +55,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(bad_gnustack_SOURCES)
-DIST_SOURCES = $(bad_gnustack_SOURCES)
+SOURCES = $(daemon_SOURCES)
+DIST_SOURCES = $(daemon_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -146,14 +147,11 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-bad_gnustack_SOURCES = bad-gnustack.c
-bad_gnustack_DEPENDENCIES = bad-asm.o
-bad_gnustack_LDADD = bad-asm.o
-EXTRA_DIST = bad64.asm bad32.asm
-ARCH = $(shell uname -m | sed -e 's/i./x/')
+daemon_SOURCES = daemon.c
+EXTRA_DIST = init.sh dotest.sh
check_SCRIPTS = test.sh
TEST = $(check_SCRIPTS)
-CLEANFILES = bad-asm.o test.sh
+CLEANFILES = daemon.pid
all: all-am
.SUFFIXES:
@@ -167,9 +165,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/pxtpax/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ $(AUTOMAKE) --foreign tests/pxtpax/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -191,9 +189,9 @@ $(am__aclocal_m4_deps):
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCIES)
- @rm -f bad-gnustack$(EXEEXT)
- $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS)
+daemon$(EXEEXT): $(daemon_OBJECTS) $(daemon_DEPENDENCIES)
+ @rm -f daemon$(EXEEXT)
+ $(LINK) $(daemon_OBJECTS) $(daemon_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -201,7 +199,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemon.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -415,20 +413,8 @@ uninstall-am:
uninstall-am
-bad-asm.o: bad64.asm bad32.asm
- [[ "$(ARCH)" == "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad32.o bad-asm.o || true
- [[ "$(ARCH)" == "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv bad64.o bad-asm.o || true
-
test.sh:
- @echo "================================================================================"
- @echo
- @echo "Fixing Bad GNU_STACK Elf"
- @../src/fix-gnustack -f bad-gnustack
- @echo
- @echo "Fixed Bad GNU_STACK Elf"
- @../src/fix-gnustack bad-gnustack
- @echo
- @echo "================================================================================"
+ ./dotest.sh
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-15 19:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-15 19:47 [gentoo-commits] proj/elfix:elfix-0.3.x commit in: /, tests/gnustack/, autom4te.cache/, tests/, tests/pxtpax/ Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox