Merge ~paelzer/ubuntu/+source/libseccomp:fix-ftbfs-1849785-focal into ubuntu/+source/libseccomp:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This is a bit odd in git-ubuntu.
As part of the python transition this was already made a sync [1] in Focal (by I guess doko).

But due to that being FTBFS it never entered proposed so far.
Due to that git-ubuntu is on 2.4.1-2 while rmadison and co report 2.4.1-0ubuntu0.19.10.3.

Build test PPA is at: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1849785-libseccomp-ftbfs

[1]: https://launchpad.net/ubuntu/+source/libseccomp/2.4.1-2

1af91f9... by Christian Ehrhardt  on 2019-11-11

New upstream version 2.4.2

8449cbb... by Christian Ehrhardt  on 2019-11-11

debian/changelog: New upstream release 2.4.2 (LP: #1849785)

Signed-off-by: Christian Ehrhardt <email address hidden>

01624a7... by Christian Ehrhardt  on 2019-11-11

drop d/p/python_install_dir.patch (now upstream)

Signed-off-by: Christian Ehrhardt <email address hidden>

37d1514... by Christian Ehrhardt  on 2019-11-11

d/rules: python 3.8 includes lack the m modifier (https://wiki.debian.org/Python/Python3.8)

Signed-off-by: Christian Ehrhardt <email address hidden>

4c863f2... by Christian Ehrhardt  on 2019-11-12

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Interim Report:
- Fixed to get new upstream 2.4.2 (fixing old kernel header issue)
- Then Fixed to support python 3.8 which changed imports.
- ATM remaining is an arm breakage around __NR_open being missing.

56e3b9d... by Christian Ehrhardt  on 2019-11-12

d/p/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch: fix build time test on arm64

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

The above commit fixed the arm64 build time test

[Christian Ehrhardt  (paelzer)]

FYI Debian MP to get it in there as well:
=> https://salsa.debian.org/debian/libseccomp/merge_requests/1

Hopefully they like my MP there and we can soon sync this again.
We might even consider waiting a few days to not do the extra found of uploading this just to sync it.
But a timely review would be nice still to be ready to upload as-needed.

Unmerged commits

4c863f2... by Christian Ehrhardt  on 2019-11-12

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

8449cbb... by Christian Ehrhardt  on 2019-11-11

debian/changelog: New upstream release 2.4.2 (LP: #1849785)

Signed-off-by: Christian Ehrhardt <email address hidden>

56e3b9d... by Christian Ehrhardt  on 2019-11-12

d/p/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch: fix build time test on arm64

Signed-off-by: Christian Ehrhardt <email address hidden>

37d1514... by Christian Ehrhardt  on 2019-11-11

d/rules: python 3.8 includes lack the m modifier (https://wiki.debian.org/Python/Python3.8)

Signed-off-by: Christian Ehrhardt <email address hidden>

01624a7... by Christian Ehrhardt  on 2019-11-11

drop d/p/python_install_dir.patch (now upstream)

Signed-off-by: Christian Ehrhardt <email address hidden>

1af91f9... by Christian Ehrhardt  on 2019-11-11

New upstream version 2.4.2

72a1ca2... by Felix Geyer on 2019-07-18

Release to unstable.

e169c18... by Felix Geyer on 2019-07-18

Set Rules-Requires-Root: no.

197edee... by Felix Geyer on 2019-07-18

Remove build-dependency on valgrind for mipsel and x32 as it's broken on those archs.

2d61f3d... by Felix Geyer on 2019-07-17

Release to unstable.

diff --git a/CHANGELOG b/CHANGELOG
index a65bc5b..e1a732c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,20 @@ libseccomp: Releases
 ===============================================================================
 https://github.com/seccomp/libseccomp
 
+<<<<<<< CHANGELOG
+=======
+* Version 2.4.2 - November 7, 2019
+- Update the syscall table for Linux v5.4-rc4
+- Stop defining __NR_x values for syscalls that don't exist.  Libseccomp
+  now uses __SNR_x internally
+- Update the Cython language level to "3str"
+- Add support for io-uring related system calls
+- Clarify the maintainer documentation and release process
+- Fix python module name issue introduced in the v2.4.0 release.  The module
+  is now named "seccomp" as it was previously
+- Deliver the SECURITY.md file in releases
+
+>>>>>>> CHANGELOG
 * Version 2.4.1 - April 17, 2019
 - Fix a BPF generation bug where the optimizer mistakenly identified duplicate
   BPF code blocks
diff --git a/CREDITS b/CREDITS
index 2be42d9..fc6e203 100644
--- a/CREDITS
+++ b/CREDITS
@@ -13,6 +13,10 @@ David Drysdale <[e-mail]>
 Eduardo Otubo <[e-mail]>
 Eric Paris <[e-mail]>
 Felix Abecassis <[e-mail]>
+<<<<<<< CREDITS
+=======
+Felix Geyer <[e-mail]>
+>>>>>>> CREDITS
 Heiko Carstens <[e-mail]>
 Helge Deller <[e-mail]>
 Jake Edge <[e-mail]>
@@ -35,6 +39,11 @@ Mike Frysinger <[e-mail]>
 Mike Strosaker <[e-mail]>
 Paul Moore <[e-mail]>
 Serge Hallyn <[e-mail]>
+<<<<<<< CREDITS
+=======
+Stéphane Graber <[e-mail]>
+Stephen Coleman <[e-mail]>
+>>>>>>> CREDITS
 Thiago Marcos P. Santos <[e-mail]>
 Tobias Klauser <[e-mail]>
 Tom Hromatka <[e-mail]>
diff --git a/Makefile.am b/Makefile.am
index b69cec5..dbc974d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,11 @@ pkgconf_DATA = libseccomp.pc
 
 EXTRA_DIST = \
 	CHANGELOG CREDITS LICENSE \
+<<<<<<< Makefile.am
 	README.md CONTRIBUTING.md RELEASE_PROCESS.md
+=======
+	README.md CONTRIBUTING.md SECURITY.md
+>>>>>>> Makefile.am
 
 # support silent builds
 AM_MAKEFLAGS_0 = --quiet --no-print-directory
diff --git a/Makefile.in b/Makefile.in
index a9b4f40..b462964 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -407,7 +407,11 @@ pkgconfdir = ${libdir}/pkgconfig
 pkgconf_DATA = libseccomp.pc
 EXTRA_DIST = \
 	CHANGELOG CREDITS LICENSE \
+<<<<<<< Makefile.in
 	README.md CONTRIBUTING.md RELEASE_PROCESS.md
+=======
+	README.md CONTRIBUTING.md SECURITY.md
+>>>>>>> Makefile.in
 
 
 # support silent builds
diff --git a/README.md b/README.md
index cf67e47..953d315 100644
--- a/README.md
+++ b/README.md
@@ -110,4 +110,8 @@ these tools are installed by default.
 
 Problems with the libseccomp library can be reported using the GitHub issue
 tracking system or the mailing list.  Those who wish to privately report
+<<<<<<< README.md
 potential vulnerabilities can send mail to [e-mail].
+=======
+potential vulnerabilities should follow the directions in SECURITY.md.
+>>>>>>> README.md
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..3a173cc
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,45 @@
+The libseccomp Security Vulnerability Handling Process
+===============================================================================
+https://github.com/seccomp/libseccomp
+
+This document document attempts to describe the processes through which
+sensitive security relevant bugs can be responsibly disclosed to the libseccomp
+project and how the project maintainers should handle these reports.  Just like
+the other libseccomp process documents, this document should be treated as a
+guiding document and not a hard, unyielding set of regulations; the bug
+reporters and project maintainers are encouraged to work together to address
+the issues as best they can, in a manner which works best for all parties
+involved.
+
+### Reporting Problems
+
+Problems with the libseccomp library that are not suitable for immediate public
+disclosure should be emailed to the current libseccomp maintainers, the list is
+below.  We typically request at most a 90 day time period to address the issue
+before it is made public, but we will make every effort to address the issue as
+quickly as possible and shorten the disclosure window.
+
+* Paul Moore, [e-mail]
+* Tom Hromatka, [e-mail]
+
+### Resolving Sensitive Security Issues
+
+Upon disclosure of a bug, the maintainers should work together to investigate
+the problem and decide on a solution.  In order to prevent an early disclosure
+of the problem, those working on the solution should do so privately and
+outside of the traditional libseccomp development practices.  One possible
+solution to this is to leverage the GitHub "Security" functionality to create a
+private development fork that can be shared among the maintainers, and
+optionally the reporter.  A placeholder GitHub issue may be created, but
+details should remain extremely limited until such time as the problem has been
+fixed and responsibly disclosed.  If a CVE, or other tag, has been assigned to
+the problem, the GitHub issue title should include the vulnerability tag once
+the problem has been disclosed.
+
+### Public Disclosure
+
+Whenever possible, responsible reporting and patching practices should be
+followed, including notification to the linux-distros and oss-security mailing
+lists.
+
+* https://oss-security.openwall.org/wiki/mailing-lists/distros
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 256083a..e686b38 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,11 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
+<<<<<<< build-aux/config.guess
 timestamp='2018-03-08'
+=======
+timestamp='2018-08-29'
+>>>>>>> build-aux/config.guess
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -84,8 +88,11 @@ if test $# != 0; then
   exit 1
 fi
 
+<<<<<<< build-aux/config.guess
 trap 'exit 1' 1 2 15
 
+=======
+>>>>>>> build-aux/config.guess
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,6 +103,7 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
+<<<<<<< build-aux/config.guess
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
@@ -124,6 +132,41 @@ esac ; set_cc_for_build= ;'
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # ([e-mail] 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+=======
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# ([e-mail] 1994-08-24)
+if test -f /.attbin/uname ; then
+>>>>>>> build-aux/config.guess
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +181,11 @@ Linux|GNU|GNU/*)
 	# We could probably try harder.
 	LIBC=gnu
 
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
@@ -199,7 +246,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+<<<<<<< build-aux/config.guess
 		eval "$set_cc_for_build"
+=======
+		set_cc_for_build
+>>>>>>> build-aux/config.guess
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -237,7 +288,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+<<<<<<< build-aux/config.guess
 	echo "$machine-${os}${release}${abi}"
+=======
+	echo "$machine-${os}${release}${abi-}"
+>>>>>>> build-aux/config.guess
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -389,6 +444,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
@@ -403,6 +459,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	    fi
 	fi
 	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+=======
+	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	case `isainfo -b` in
+	    32)
+		echo i386-pc-solaris2"$UNAME_REL"
+		;;
+	    64)
+		echo x86_64-pc-solaris2"$UNAME_REL"
+		;;
+	esac
+>>>>>>> build-aux/config.guess
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -482,7 +549,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -579,7 +650,11 @@ EOF
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+<<<<<<< build-aux/config.guess
 		eval "$set_cc_for_build"
+=======
+		set_cc_for_build
+>>>>>>> build-aux/config.guess
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -660,7 +735,11 @@ EOF
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
+<<<<<<< build-aux/config.guess
 		    eval "$set_cc_for_build"
+=======
+		    set_cc_for_build
+>>>>>>> build-aux/config.guess
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -700,7 +779,11 @@ EOF
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
+<<<<<<< build-aux/config.guess
 	    eval "$set_cc_for_build"
+=======
+	    set_cc_for_build
+>>>>>>> build-aux/config.guess
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -726,7 +809,11 @@ EOF
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -840,6 +927,20 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+<<<<<<< build-aux/config.guess
+=======
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
+>>>>>>> build-aux/config.guess
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@@ -894,8 +995,13 @@ EOF
 	# other systems with GNU libc and userland
 	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 	exit ;;
+<<<<<<< build-aux/config.guess
     i*86:Minix:*:*)
 	echo "$UNAME_MACHINE"-pc-minix
+=======
+    *:Minix:*:*)
+	echo "$UNAME_MACHINE"-unknown-minix
+>>>>>>> build-aux/config.guess
 	exit ;;
     aarch64:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -922,7 +1028,11 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -971,7 +1081,11 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
 	#undef ${UNAME_MACHINE}
@@ -1285,7 +1399,11 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+<<<<<<< build-aux/config.guess
 	eval "$set_cc_for_build"
+=======
+	set_cc_for_build
+>>>>>>> build-aux/config.guess
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
@@ -1358,6 +1476,10 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
+<<<<<<< build-aux/config.guess
+=======
+	# shellcheck disable=SC2154
+>>>>>>> build-aux/config.guess
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 9ccf09a..d712ba5 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,11 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
+<<<<<<< build-aux/config.sub
 timestamp='2018-03-08'
+=======
+timestamp='2018-08-29'
+>>>>>>> build-aux/config.sub
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -110,6 +114,7 @@ case $# in
     exit 1;;
 esac
 
+<<<<<<< build-aux/config.sub
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
@@ -1317,16 +1322,1170 @@ case $basic_machine in
 	*)
 		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
+=======
+# Split fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <<EOF
+$1
+EOF
+
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
+		;;
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		os=$field3-$field4
+		;;
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				os=$field3
+				;;
+		esac
+		;;
+	*-*)
+		# A lone config we happen to match not fitting any patern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
+		esac
+		;;
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				os=sysv3
+				;;
+			hp300)
+				basic_machine=m68k-hp
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				os=bsd
+				;;
+			hp300hpux)
+				basic_machine=m68k-hp
+				os=hpux
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				os=mach
+				;;
+			vsta)
+				basic_machine=i386-pc
+				os=vsta
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				os=linux
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				os=vms
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				os=unicos
+				;;
+			*)
+				basic_machine=$1
+				os=
+				;;
+		esac
+		;;
+esac
+
+# Decode 1-component or ad-hoc basic machines
+case $basic_machine in
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
+		;;
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	ibm*)
+		cpu=i370
+		vendor=ibm
+		;;
+	orion105)
+		cpu=clipper
+		vendor=highlevel
+		;;
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
+		;;
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
+		;;
+
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		cpu=m68000
+		vendor=att
+		;;
+	3b*)
+		cpu=we32k
+		vendor=att
+		;;
+	bluegene*)
+		cpu=powerpc
+		vendor=ibm
+		os=cnk
+		;;
+	decsystem10* | dec10*)
+		cpu=pdp10
+		vendor=dec
+		os=tops10
+		;;
+	decsystem20* | dec20*)
+		cpu=pdp10
+		vendor=dec
+		os=tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		cpu=m68k
+		vendor=motorola
+		;;
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		os=sysv3
+		;;
+	encore | umax | mmax)
+		cpu=ns32k
+		vendor=encore
+		;;
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		os=${os:-bsd}
+		;;
+	fx2800)
+		cpu=i860
+		vendor=alliant
+		;;
+	genix)
+		cpu=ns32k
+		vendor=ns
+		;;
+	h3050r* | hiux*)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		cpu=m68000
+		vendor=hp
+		;;
+	hp9k3[2-9][0-9])
+		cpu=m68k
+		vendor=hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	i*86v32)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv32
+		;;
+	i*86v4*)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv4
+		;;
+	i*86v)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv
+		;;
+	i*86sol2)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=solaris2
+		;;
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		os=${os:-unicos}
+		;;
+	iris | iris4d)
+		cpu=mips
+		vendor=sgi
+		case $os in
+		    irix*)
+			;;
+		    *)
+			os=irix4
+			;;
+		esac
+		;;
+	miniframe)
+		cpu=m68000
+		vendor=convergent
+		;;
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		os=mint
+		;;
+	news-3600 | risc-news)
+		cpu=mips
+		vendor=sony
+		os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $os in
+		    nextstep* )
+			;;
+		    ns2*)
+		      os=nextstep2
+			;;
+		    *)
+		      os=nextstep3
+			;;
+		esac
+		;;
+	np1)
+		cpu=np1
+		vendor=gould
+		;;
+	op50n-* | op60c-*)
+		cpu=hppa1.1
+		vendor=oki
+		os=proelf
+		;;
+	pa-hitachi)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	pbd)
+		cpu=sparc
+		vendor=tti
+		;;
+	pbb)
+		cpu=m68k
+		vendor=tti
+		;;
+	pc532)
+		cpu=ns32k
+		vendor=pc532
+		;;
+	pn)
+		cpu=pn
+		vendor=gould
+		;;
+	power)
+		cpu=power
+		vendor=ibm
+		;;
+	ps2)
+		cpu=i386
+		vendor=ibm
+		;;
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
+		;;
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
+		;;
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		os=${os:-elf}
+		;;
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		os=vxworks
+		;;
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
+		;;
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
+		;;
+	w65)
+		cpu=w65
+		vendor=wdc
+		;;
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		os=proelf
+		;;
+	none)
+		cpu=none
+		vendor=none
+		;;
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
+		;;
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+		;;
+
+	*-*)
+		IFS="-" read -r cpu vendor <<EOF
+$basic_machine
+EOF
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
+		;;
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
+		;;
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
+		;;
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
+		;;
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		os=${os:-unicosmp}
+		;;
+	c90-unknown | c90-cray)
+		vendor=cray
+		os=${os:-unicos}
+		;;
+	fx80-unknown)
+		vendor=alliant
+		;;
+	romp-unknown)
+		vendor=ibm
+		;;
+	mmix-unknown)
+		vendor=knuth
+		;;
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
+		;;
+	rs6000-unknown)
+		vendor=ibm
+		;;
+	vax-unknown)
+		vendor=dec
+		;;
+	pdp11-unknown)
+		vendor=dec
+		;;
+	we32k-unknown)
+		vendor=att
+		;;
+	cydra-unknown)
+		vendor=cydrome
+		;;
+	i370-ibm*)
+		vendor=ibm
+		;;
+	orion-unknown)
+		vendor=highlevel
+		;;
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
+		;;
+
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		os=${os:-bosx}
+		;;
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
+		;;
+	blackfin-*)
+		cpu=bfin
+		os=linux
+		;;
+	c54x-*)
+		cpu=tic54x
+		;;
+	c55x-*)
+		cpu=tic55x
+		;;
+	c6x-*)
+		cpu=tic6x
+		;;
+	e500v[12]-*)
+		cpu=powerpc
+		os=$os"spe"
+		;;
+	mips3*-*)
+		cpu=mips64
+		;;
+	ms1-*)
+		cpu=mt
+		;;
+	m68knommu-*)
+		cpu=m68k
+		os=linux
+		;;
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
+		;;
+	openrisc-*)
+		cpu=or32
+		;;
+	parisc-*)
+		cpu=hppa
+		os=linux
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
+		;;
+	pentium4-*)
+		cpu=i786
+		;;
+	pc98-*)
+		cpu=i386
+		;;
+	ppc-* | ppcbe-*)
+		cpu=powerpc
+		;;
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
+		;;
+	ppc64-*)
+		cpu=powerpc64
+		;;
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
+		;;
+	sb1-*)
+		cpu=mipsisa64sb1
+		;;
+	sb1el-*)
+		cpu=mipsisa64sb1el
+		;;
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+		;;
+	spur-*)
+		cpu=spur
+		;;
+	strongarm-* | thumb-*)
+		cpu=arm
+		;;
+	tx39-*)
+		cpu=mipstx39
+		;;
+	tx39el-*)
+		cpu=mipstx39el
+		;;
+	x64-*)
+		cpu=x86_64
+		;;
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		;;
+
+	# Recognize the cannonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		os=${os:-elf}
+		;;
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
+		;;
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
+		;;
+	crx-*)
+		os=${os:-elf}
+		;;
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
+		;;
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
+		;;
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
+		;;
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
+		;;
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
+		;;
+	s390-*)
+		cpu=s390
+		vendor=ibm
+		;;
+	s390x-*)
+		cpu=s390x
+		vendor=ibm
+		;;
+	tile*-*)
+		os=${os:-linux-gnu}
+		;;
+
+	*)
+		# Recognize the cannonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| arc | arceb \
+			| arm  | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv64 \
+			| rl78 | romp | rs6000 | rx \
+			| score \
+			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| wasm32 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
+>>>>>>> build-aux/config.sub
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
+<<<<<<< build-aux/config.sub
 case $basic_machine in
 	*-digital*)
 		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
 		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+=======
+case $vendor in
+	digital*)
+		vendor=dec
+		;;
+	commodore*)
+		vendor=cbm
+>>>>>>> build-aux/config.sub
 		;;
 	*)
 		;;
@@ -1334,11 +2493,16 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
+<<<<<<< build-aux/config.sub
 if [ x"$os" != x"" ]
+=======
+if [ x$os != x ]
+>>>>>>> build-aux/config.sub
 then
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
+<<<<<<< build-aux/config.sub
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@@ -1358,10 +2522,66 @@ case $os in
 	# es1800 is here to avoid being matched by es* (a different OS)
 	-es1800*)
 		os=-ose
+=======
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
+		;;
+	bluegene*)
+		os=cnk
+		;;
+	solaris1 | solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	solaris)
+		os=solaris2
+		;;
+	unixware*)
+		os=sysv4.2uw
+		;;
+	gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
+		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
+>>>>>>> build-aux/config.sub
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
+<<<<<<< build-aux/config.sub
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1527,6 +2747,185 @@ case $os in
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
+=======
+	# sysv* is not here because it comes later, after sysvr4.
+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* | kopensolaris* | plan9* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | knetbsd* | mirbsd* | netbsd* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
+	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+	     | linux-newlib* | linux-musl* | linux-uclibc* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+	     | morphos* | superux* | rtmk* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	qnx*)
+		case $cpu in
+		    x86 | i*86)
+			;;
+		    *)
+			os=nto-$os
+			;;
+		esac
+		;;
+	hiux*)
+		os=hiuxwe2
+		;;
+	nto-qnx*)
+		;;
+	nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	sim | xray | os68k* | v88r* \
+	    | windows* | osx | abug | netware* | os9* \
+	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+		;;
+	linux-dietlibc)
+		os=linux-dietlibc
+		;;
+	linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	lynx*178)
+		os=lynxos178
+		;;
+	lynx*5)
+		os=lynxos5
+		;;
+	lynx*)
+		os=lynxos
+		;;
+	mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
+		;;
+	opened*)
+		os=openedition
+		;;
+	os400*)
+		os=os400
+		;;
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		;;
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		;;
+	wince*)
+		os=wince
+		;;
+	utek*)
+		os=bsd
+		;;
+	dynix*)
+		os=bsd
+		;;
+	acis*)
+		os=aos
+		;;
+	atheos*)
+		os=atheos
+		;;
+	syllable*)
+		os=syllable
+		;;
+	386bsd)
+		os=bsd
+		;;
+	ctix* | uts*)
+		os=sysv
+		;;
+	nova*)
+		os=rtmk-nova
+		;;
+	ns2)
+		os=nextstep2
+		;;
+	nsk*)
+		os=nsk
+		;;
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	sinix*)
+		os=sysv4
+		;;
+	tpf*)
+		os=tpf
+		;;
+	triton*)
+		os=sysv3
+		;;
+	oss*)
+		os=sysv3
+		;;
+	svr4*)
+		os=sysv4
+		;;
+	svr3)
+		os=sysv3
+		;;
+	sysvr4)
+		os=sysv4
+		;;
+	# This must come after sysvr4.
+	sysv*)
+		;;
+	ose*)
+		os=ose
+		;;
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
+		;;
+	zvmoe)
+		os=zvmoe
+		;;
+	dicos*)
+		os=dicos
+		;;
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
+		;;
+	nacl*)
+		;;
+	ios)
+		;;
+	none)
+		;;
+	*-eabi)
+		;;
+	*)
+>>>>>>> build-aux/config.sub
 		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
@@ -1543,6 +2942,7 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
+<<<<<<< build-aux/config.sub
 case $basic_machine in
 	score-*)
 		os=-elf
@@ -1712,12 +3112,190 @@ case $basic_machine in
 		;;
 	*)
 		os=-none
+=======
+case $cpu-$vendor in
+	score-*)
+		os=elf
+		;;
+	spu-*)
+		os=elf
+		;;
+	*-acorn)
+		os=riscix1.2
+		;;
+	arm*-rebel)
+		os=linux
+		;;
+	arm*-semi)
+		os=aout
+		;;
+	c4x-* | tic4x-*)
+		os=coff
+		;;
+	c8051-*)
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
+		;;
+	hexagon-*)
+		os=elf
+		;;
+	tic54x-*)
+		os=coff
+		;;
+	tic55x-*)
+		os=coff
+		;;
+	tic6x-*)
+		os=coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=tops20
+		;;
+	pdp11-*)
+		os=none
+		;;
+	*-dec | vax-*)
+		os=ultrix4.2
+		;;
+	m68*-apollo)
+		os=domain
+		;;
+	i386-sun)
+		os=sunos4.0.2
+		;;
+	m68000-sun)
+		os=sunos3
+		;;
+	m68*-cisco)
+		os=aout
+		;;
+	mep-*)
+		os=elf
+		;;
+	mips*-cisco)
+		os=elf
+		;;
+	mips*-*)
+		os=elf
+		;;
+	or32-*)
+		os=coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=sysv3
+		;;
+	sparc-* | *-sun)
+		os=sunos4.1.1
+		;;
+	pru-*)
+		os=elf
+		;;
+	*-be)
+		os=beos
+		;;
+	*-ibm)
+		os=aix
+		;;
+	*-knuth)
+		os=mmixware
+		;;
+	*-wec)
+		os=proelf
+		;;
+	*-winbond)
+		os=proelf
+		;;
+	*-oki)
+		os=proelf
+		;;
+	*-hp)
+		os=hpux
+		;;
+	*-hitachi)
+		os=hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=sysv
+		;;
+	*-cbm)
+		os=amigaos
+		;;
+	*-dg)
+		os=dgux
+		;;
+	*-dolphin)
+		os=sysv3
+		;;
+	m68k-ccur)
+		os=rtu
+		;;
+	m88k-omron*)
+		os=luna
+		;;
+	*-next)
+		os=nextstep
+		;;
+	*-sequent)
+		os=ptx
+		;;
+	*-crds)
+		os=unos
+		;;
+	*-ns)
+		os=genix
+		;;
+	i370-*)
+		os=mvs
+		;;
+	*-gould)
+		os=sysv
+		;;
+	*-highlevel)
+		os=bsd
+		;;
+	*-encore)
+		os=bsd
+		;;
+	*-sgi)
+		os=irix
+		;;
+	*-siemens)
+		os=sysv4
+		;;
+	*-masscomp)
+		os=rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=uxpv
+		;;
+	*-rom68k)
+		os=coff
+		;;
+	*-*bug)
+		os=coff
+		;;
+	*-apple)
+		os=macos
+		;;
+	*-atari*)
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
+		;;
+	*)
+		os=none
+>>>>>>> build-aux/config.sub
 		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
+<<<<<<< build-aux/config.sub
 vendor=unknown
 case $basic_machine in
 	*-unknown)
@@ -1791,6 +3369,82 @@ case $basic_machine in
 esac
 
 echo "$basic_machine$os"
+=======
+case $vendor in
+	unknown)
+		case $os in
+			riscix*)
+				vendor=acorn
+				;;
+			sunos*)
+				vendor=sun
+				;;
+			cnk*|-aix*)
+				vendor=ibm
+				;;
+			beos*)
+				vendor=be
+				;;
+			hpux*)
+				vendor=hp
+				;;
+			mpeix*)
+				vendor=hp
+				;;
+			hiux*)
+				vendor=hitachi
+				;;
+			unos*)
+				vendor=crds
+				;;
+			dgux*)
+				vendor=dg
+				;;
+			luna*)
+				vendor=omron
+				;;
+			genix*)
+				vendor=ns
+				;;
+			clix*)
+				vendor=intergraph
+				;;
+			mvs* | opened*)
+				vendor=ibm
+				;;
+			os400*)
+				vendor=ibm
+				;;
+			ptx*)
+				vendor=sequent
+				;;
+			tpf*)
+				vendor=ibm
+				;;
+			vxsim* | vxworks* | windiss*)
+				vendor=wrs
+				;;
+			aux*)
+				vendor=apple
+				;;
+			hms*)
+				vendor=hitachi
+				;;
+			mpw* | macos*)
+				vendor=apple
+				;;
+			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+				vendor=atari
+				;;
+			vos*)
+				vendor=stratus
+				;;
+		esac
+		;;
+esac
+
+echo "$cpu-$vendor-$os"
+>>>>>>> build-aux/config.sub
 exit
 
 # Local variables:
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index d3ab94d..ffe298c 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1,5 +1,6 @@
 #! /bin/sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+<<<<<<< build-aux/ltmain.sh
 ##               by inline-source v2018-07-24.06
 
 # libtool (GNU libtool) 2.4.6.42-b88ce
@@ -7,6 +8,15 @@
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996-2018 Free Software Foundation, Inc.
+=======
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <[e-mail]>, 1996
+
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+>>>>>>> build-aux/ltmain.sh
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +41,13 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
+<<<<<<< build-aux/ltmain.sh
 VERSION=2.4.6.42-b88ce
 package_revision=2.4.6.42
+=======
+VERSION=2.4.6
+package_revision=2.4.6
+>>>>>>> build-aux/ltmain.sh
 
 
 ## ------ ##
@@ -64,11 +79,16 @@ package_revision=2.4.6.42
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
+<<<<<<< build-aux/ltmain.sh
 scriptversion=2018-07-24.06; # UTC
+=======
+scriptversion=2015-01-20.17; # UTC
+>>>>>>> build-aux/ltmain.sh
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
+<<<<<<< build-aux/ltmain.sh
 # This is free software.  There is NO warranty; not even for
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
@@ -83,6 +103,31 @@ scriptversion=2018-07-24.06; # UTC
 
 # Please report bugs or propose patches to:
 # <https://github.com/gnulib-modules/bootstrap/issues>
+=======
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to [e-mail].
+>>>>>>> build-aux/ltmain.sh
 
 
 ## ------ ##
@@ -131,6 +176,12 @@ do
 	fi"
 done
 
+<<<<<<< build-aux/ltmain.sh
+=======
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+>>>>>>> build-aux/ltmain.sh
 # Make sure IFS has a sensible default
 sp=' '
 nl='
@@ -147,6 +198,7 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
+<<<<<<< build-aux/ltmain.sh
 # func_unset VAR
 # --------------
 # Portably unset VAR.
@@ -167,6 +219,8 @@ func_unset CDPATH
 # Make sure ${,E,F}GREP behave sanely.
 func_unset GREP_OPTIONS
 
+=======
+>>>>>>> build-aux/ltmain.sh
 
 ## ------------------------- ##
 ## Locate command utilities. ##
@@ -267,7 +321,11 @@ test -z "$SED" && {
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
+<<<<<<< build-aux/ltmain.sh
   func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
+=======
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+>>>>>>> build-aux/ltmain.sh
   rm -f conftest.sed
   SED=$func_path_progs_result
 }
@@ -303,7 +361,11 @@ test -z "$GREP" && {
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
+<<<<<<< build-aux/ltmain.sh
   func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
+=======
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+>>>>>>> build-aux/ltmain.sh
   GREP=$func_path_progs_result
 }
 
@@ -588,16 +650,26 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then
   {
     $debug_cmd
 
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$2"
     eval "$1+=\\ \$func_quote_arg_result"
+=======
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
   }'
 else
   func_append_quoted ()
   {
     $debug_cmd
 
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$2"
     eval "$1=\$$1\\ \$func_quote_arg_result"
+=======
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
   }
 fi
 
@@ -1099,6 +1171,7 @@ func_relative_path ()
 }
 
 
+<<<<<<< build-aux/ltmain.sh
 # func_quote_portable EVAL ARG
 # ----------------------------
 # Internal function to portably implement func_quote_arg.  Note that we still
@@ -1292,6 +1365,87 @@ func_quote ()
       fi
       shift
     done
+=======
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -1337,8 +1491,13 @@ func_show_eval ()
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty,expand "$_G_cmd"
     eval "func_notquiet $func_quote_arg_result"
+=======
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+>>>>>>> build-aux/ltmain.sh
 
     $opt_dry_run || {
       eval "$_G_cmd"
@@ -1363,8 +1522,13 @@ func_show_eval_locale ()
     _G_fail_exp=${2-':'}
 
     $opt_quiet || {
+<<<<<<< build-aux/ltmain.sh
       func_quote_arg expand,pretty "$_G_cmd"
       eval "func_echo $func_quote_arg_result"
+=======
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+>>>>>>> build-aux/ltmain.sh
     }
 
     $opt_dry_run || {
@@ -1491,6 +1655,7 @@ func_lt_ver ()
 # End:
 #! /bin/sh
 
+<<<<<<< build-aux/ltmain.sh
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
@@ -1511,6 +1676,32 @@ func_lt_ver ()
 
 # Set a version string for this script.
 scriptversion=2018-07-24.06; # UTC
+=======
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to [e-mail].
+>>>>>>> build-aux/ltmain.sh
 
 
 ## ------ ##
@@ -1533,7 +1724,11 @@ scriptversion=2018-07-24.06; # UTC
 #
 # In order for the '--version' option to work, you will need to have a
 # suitably formatted comment like the one at the top of this file
+<<<<<<< build-aux/ltmain.sh
 # starting with '# Written by ' and ending with '# Copyright'.
+=======
+# starting with '# Written by ' and ending with '# warranty; '.
+>>>>>>> build-aux/ltmain.sh
 #
 # For '-h' and '--help' to work, you will also need a one line
 # description of your script's purpose in a comment directly above the
@@ -1545,7 +1740,11 @@ scriptversion=2018-07-24.06; # UTC
 # to display verbose messages only when your user has specified
 # '--verbose'.
 #
+<<<<<<< build-aux/ltmain.sh
 # After sourcing this file, you can plug in processing for additional
+=======
+# After sourcing this file, you can plug processing for additional
+>>>>>>> build-aux/ltmain.sh
 # options by amending the variables from the 'Configuration' section
 # below, and following the instructions in the 'Option parsing'
 # section further down.
@@ -1594,8 +1793,13 @@ fatal_help="Try '\$progname --help' for more information."
 ## ------------------------- ##
 
 # This section contains functions for adding, removing, and running hooks
+<<<<<<< build-aux/ltmain.sh
 # in the main code.  A hook is just a list of function names that can be
 # run in order later on.
+=======
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+>>>>>>> build-aux/ltmain.sh
 
 # func_hookable FUNC_NAME
 # -----------------------
@@ -1628,8 +1832,12 @@ func_add_hook ()
 
 # func_remove_hook FUNC_NAME HOOK_FUNC
 # ------------------------------------
+<<<<<<< build-aux/ltmain.sh
 # Remove HOOK_FUNC from the list of hook functions to be called by
 # FUNC_NAME.
+=======
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+>>>>>>> build-aux/ltmain.sh
 func_remove_hook ()
 {
     $debug_cmd
@@ -1638,6 +1846,7 @@ func_remove_hook ()
 }
 
 
+<<<<<<< build-aux/ltmain.sh
 # func_propagate_result FUNC_NAME_A FUNC_NAME_B
 # ---------------------------------------------
 # If the *_result variable of FUNC_NAME_A _is set_, assign its value to
@@ -1660,6 +1869,12 @@ func_propagate_result ()
 # ---------------------------------
 # Run all hook functions registered to FUNC_NAME.
 # It's assumed that the list of hook functions contains nothing more
+=======
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+>>>>>>> build-aux/ltmain.sh
 # than a whitespace-delimited list of legal shell function names, and
 # no effort is wasted trying to catch shell meta-characters or preserve
 # whitespace.
@@ -1669,12 +1884,17 @@ func_run_hooks ()
 
     case " $hookable_fns " in
       *" $1 "*) ;;
+<<<<<<< build-aux/ltmain.sh
       *) func_fatal_error "'$1' does not support hook functions." ;;
+=======
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+>>>>>>> build-aux/ltmain.sh
     esac
 
     eval _G_hook_fns=\$$1_hooks; shift
 
     for _G_hook in $_G_hook_fns; do
+<<<<<<< build-aux/ltmain.sh
       func_unset "${_G_hook}_result"
       eval $_G_hook '${1+"$@"}'
       func_propagate_result $_G_hook func_run_hooks
@@ -1682,6 +1902,18 @@ func_run_hooks ()
         eval set dummy "$func_run_hooks_result"; shift
       fi
     done
+=======
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -1691,6 +1923,7 @@ func_run_hooks ()
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
+<<<<<<< build-aux/ltmain.sh
 # full positional parameter list from your hook function.  You may remove
 # or edit any options that you action, and then pass back the remaining
 # unprocessed options in '<hooked_function_name>_result', escaped
@@ -1703,6 +1936,12 @@ func_run_hooks ()
 # machines).
 #
 # Like this:
+=======
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+>>>>>>> build-aux/ltmain.sh
 #
 #    my_options_prep ()
 #    {
@@ -1712,8 +1951,14 @@ func_run_hooks ()
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
+<<<<<<< build-aux/ltmain.sh
 #        # No change in '$@' (ignored completely by this hook).  Leave
 #        # my_options_prep_result variable intact.
+=======
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@@ -1722,22 +1967,31 @@ func_run_hooks ()
 #    {
 #        $debug_cmd
 #
+<<<<<<< build-aux/ltmain.sh
 #        args_changed=false
 #
 #        # Note that, for efficiency, we parse as many options as we can
+=======
+#        # Note that for efficiency, we parse as many options as we can
+>>>>>>> build-aux/ltmain.sh
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
 #          opt=$1; shift
 #          case $opt in
+<<<<<<< build-aux/ltmain.sh
 #            --silent|-s) opt_silent=:
 #                         args_changed=:
 #                         ;;
+=======
+#            --silent|-s) opt_silent=: ;;
+>>>>>>> build-aux/ltmain.sh
 #            # Separate non-argument short options:
 #            -s*)         func_split_short_opt "$_G_opt"
 #                         set dummy "$func_split_short_opt_name" \
 #                             "-$func_split_short_opt_arg" ${1+"$@"}
 #                         shift
+<<<<<<< build-aux/ltmain.sh
 #                         args_changed=:
 #                         ;;
 #            *)           # Make sure the first unrecognised option "$_G_opt"
@@ -1752,6 +2006,15 @@ func_run_hooks ()
 #          func_quote eval ${1+"$@"}
 #          my_silent_option_result=$func_quote_result
 #        fi
+=======
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@@ -1762,14 +2025,25 @@ func_run_hooks ()
 #
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
+<<<<<<< build-aux/ltmain.sh
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
 # You'll also need to manually amend $usage_message to reflect the extra
+=======
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+>>>>>>> build-aux/ltmain.sh
 # options you parse.  It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 
 
+<<<<<<< build-aux/ltmain.sh
 # func_options_finish [ARG]...
 # ----------------------------
 # Finishing the option parse loop (call 'func_options' hooks ATM).
@@ -1782,6 +2056,8 @@ func_options_finish ()
 }
 
 
+=======
+>>>>>>> build-aux/ltmain.sh
 # func_options [ARG]...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@@ -1791,6 +2067,7 @@ func_options ()
 {
     $debug_cmd
 
+<<<<<<< build-aux/ltmain.sh
     _G_options_quoted=false
 
     for my_func in options_prep parse_options validate_options options_finish
@@ -1812,6 +2089,19 @@ func_options ()
       func_quote eval ${1+"$@"}
       func_options_result=$func_quote_result
     }
+=======
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -1820,8 +2110,14 @@ func_options ()
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
+<<<<<<< build-aux/ltmain.sh
 # needs to propagate that back to rest of this script, then the complete
 # modified list must be put in 'func_run_hooks_result' before returning.
+=======
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+>>>>>>> build-aux/ltmain.sh
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1832,7 +2128,13 @@ func_options_prep ()
     opt_warning_types=
 
     func_run_hooks func_options_prep ${1+"$@"}
+<<<<<<< build-aux/ltmain.sh
     func_propagate_result func_run_hooks func_options_prep
+=======
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -1844,12 +2146,18 @@ func_parse_options ()
 {
     $debug_cmd
 
+<<<<<<< build-aux/ltmain.sh
     _G_parse_options_requote=false
+=======
+    func_parse_options_result=
+
+>>>>>>> build-aux/ltmain.sh
     # this just eases exit handling
     while test $# -gt 0; do
       # Defer to hook functions for initial option parsing, so they
       # get priority in the event of reusing an option name.
       func_run_hooks func_parse_options ${1+"$@"}
+<<<<<<< build-aux/ltmain.sh
       func_propagate_result func_run_hooks func_parse_options
       if $func_propagate_result_result; then
         eval set dummy "$func_parse_options_result"; shift
@@ -1858,18 +2166,30 @@ func_parse_options ()
         # this if-branch).  No need to quote it again.
         _G_parse_options_requote=false
       fi
+=======
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+>>>>>>> build-aux/ltmain.sh
 
       # Break out of the loop if we already parsed every option.
       test $# -gt 0 || break
 
+<<<<<<< build-aux/ltmain.sh
       # We expect that one of the options parsed in this function matches
       # and thus we remove _G_opt from "$@" and need to re-quote.
       _G_match_parse_options=:
+=======
+>>>>>>> build-aux/ltmain.sh
       _G_opt=$1
       shift
       case $_G_opt in
         --debug|-x)   debug_cmd='set -x'
+<<<<<<< build-aux/ltmain.sh
                       func_echo "enabling shell trace mode" >&2
+=======
+                      func_echo "enabling shell trace mode"
+>>>>>>> build-aux/ltmain.sh
                       $debug_cmd
                       ;;
 
@@ -1879,10 +2199,14 @@ func_parse_options ()
 		      ;;
 
         --warnings|--warning|-W)
+<<<<<<< build-aux/ltmain.sh
                       if test $# = 0 && func_missing_arg $_G_opt; then
                         _G_parse_options_requote=:
                         break
                       fi
+=======
+                      test $# = 0 && func_missing_arg $_G_opt && break
+>>>>>>> build-aux/ltmain.sh
                       case " $warning_categories $1" in
                         *" $1 "*)
                           # trailing space prevents matching last $1 above
@@ -1935,6 +2259,7 @@ func_parse_options ()
                       shift
                       ;;
 
+<<<<<<< build-aux/ltmain.sh
         --)           _G_parse_options_requote=: ; break ;;
         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
         *)            set dummy "$_G_opt" ${1+"$@"}; shift
@@ -1953,6 +2278,17 @@ func_parse_options ()
       func_quote eval ${1+"$@"}
       func_parse_options_result=$func_quote_result
     fi
+=======
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -1969,10 +2305,19 @@ func_validate_options ()
     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
     func_run_hooks func_validate_options ${1+"$@"}
+<<<<<<< build-aux/ltmain.sh
     func_propagate_result func_run_hooks func_validate_options
 
     # Bail if the options were screwed!
     $exit_cmd $EXIT_FAILURE
+=======
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+>>>>>>> build-aux/ltmain.sh
 }
 
 
@@ -2028,8 +2373,13 @@ func_missing_arg ()
 
 # func_split_equals STRING
 # ------------------------
+<<<<<<< build-aux/ltmain.sh
 # Set func_split_equals_lhs and func_split_equals_rhs shell variables
 # after splitting STRING at the '=' sign.
+=======
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+>>>>>>> build-aux/ltmain.sh
 test -z "$_G_HAVE_XSI_OPS" \
     && (eval 'x=a/b/c;
       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@@ -2044,9 +2394,14 @@ then
 
       func_split_equals_lhs=${1%%=*}
       func_split_equals_rhs=${1#*=}
+<<<<<<< build-aux/ltmain.sh
       if test "x$func_split_equals_lhs" = "x$1"; then
         func_split_equals_rhs=
       fi
+=======
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+>>>>>>> build-aux/ltmain.sh
   }'
 else
   # ...otherwise fall back to using expr, which is often a shell builtin.
@@ -2124,6 +2479,7 @@ func_usage_message ()
 # func_version
 # ------------
 # Echo version message to standard output and exit.
+<<<<<<< build-aux/ltmain.sh
 # The version message is extracted from the calling file's header
 # comments, with leading '# ' stripped:
 #   1. First display the progname and version
@@ -2133,12 +2489,15 @@ func_usage_message ()
 #   4. Immediately followed by any lines between the previous matches,
 #      except lines preceding the intervening completely blank line.
 # For example, see the header comments of this file.
+=======
+>>>>>>> build-aux/ltmain.sh
 func_version ()
 {
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
     $SED -n '
+<<<<<<< build-aux/ltmain.sh
         /^# Written by /!b
         s|^# ||; p; n
 
@@ -2162,6 +2521,27 @@ func_version ()
         G
         s|\(\n\)\n*|\1|g
         p; q' < "$progpath"
+=======
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+>>>>>>> build-aux/ltmain.sh
 
     exit $?
 }
@@ -2171,12 +2551,20 @@ func_version ()
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
+<<<<<<< build-aux/ltmain.sh
 # time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+=======
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+>>>>>>> build-aux/ltmain.sh
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string.
+<<<<<<< build-aux/ltmain.sh
 scriptversion='(GNU libtool) 2.4.6.42-b88ce'
+=======
+scriptversion='(GNU libtool) 2.4.6'
+>>>>>>> build-aux/ltmain.sh
 
 
 # func_echo ARG...
@@ -2267,12 +2655,20 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
+<<<<<<< build-aux/ltmain.sh
        version:        $progname (GNU libtool) 2.4.6.42-b88ce
+=======
+       version:        $progname (GNU libtool) 2.4.6
+>>>>>>> build-aux/ltmain.sh
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to <[e-mail]>.
+<<<<<<< build-aux/ltmain.sh
 GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+=======
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+>>>>>>> build-aux/ltmain.sh
 General help using GNU software: <http://www.gnu.org/gethelp/>."
     exit 0
 }
@@ -2469,8 +2865,11 @@ libtool_options_prep ()
     nonopt=
     preserve_args=
 
+<<<<<<< build-aux/ltmain.sh
     _G_rc_lt_options_prep=:
 
+=======
+>>>>>>> build-aux/ltmain.sh
     # Shorthand for --mode=foo, only valid as the first argument
     case $1 in
     clean|clea|cle|cl)
@@ -2494,6 +2893,7 @@ libtool_options_prep ()
     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
       shift; set dummy --mode uninstall ${1+"$@"}; shift
       ;;
+<<<<<<< build-aux/ltmain.sh
     *)
       _G_rc_lt_options_prep=false
       ;;
@@ -2504,6 +2904,13 @@ libtool_options_prep ()
       func_quote eval ${1+"$@"}
       libtool_options_prep_result=$func_quote_result
     fi
+=======
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2515,12 +2922,18 @@ libtool_parse_options ()
 {
     $debug_cmd
 
+<<<<<<< build-aux/ltmain.sh
     _G_rc_lt_parse_options=false
 
     # Perform our own loop to consume as many options as possible in
     # each iteration.
     while test $# -gt 0; do
       _G_match_lt_parse_options=:
+=======
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+>>>>>>> build-aux/ltmain.sh
       _G_opt=$1
       shift
       case $_G_opt in
@@ -2595,6 +3008,7 @@ libtool_parse_options ()
                         func_append preserve_args " $_G_opt"
                         ;;
 
+<<<<<<< build-aux/ltmain.sh
         # An option not handled by this hook function:
         *)              set dummy "$_G_opt" ${1+"$@"} ; shift
                         _G_match_lt_parse_options=false
@@ -2609,6 +3023,17 @@ libtool_parse_options ()
       func_quote eval ${1+"$@"}
       libtool_parse_options_result=$func_quote_result
     fi
+=======
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -2665,8 +3090,13 @@ libtool_validate_options ()
     }
 
     # Pass back the unparsed argument list
+<<<<<<< build-aux/ltmain.sh
     func_quote eval ${1+"$@"}
     libtool_validate_options_result=$func_quote_result
+=======
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 }
 func_add_hook func_validate_options libtool_validate_options
 
@@ -3632,8 +4062,13 @@ func_mode_compile ()
       esac
     done
 
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$libobj"
     test "X$libobj" != "X$func_quote_arg_result" \
+=======
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+>>>>>>> build-aux/ltmain.sh
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
       && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
@@ -3706,8 +4141,13 @@ compiler."
 
     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$srcfile"
     qsrcfile=$func_quote_arg_result
+=======
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 
     # Only build a PIC object if we are building libtool libraries.
     if test yes = "$build_libtool_libs"; then
@@ -4310,8 +4750,13 @@ func_mode_install ()
        case $nonopt in *shtool*) :;; *) false;; esac
     then
       # Aesthetically quote it.
+<<<<<<< build-aux/ltmain.sh
       func_quote_arg pretty "$nonopt"
       install_prog="$func_quote_arg_result "
+=======
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+>>>>>>> build-aux/ltmain.sh
       arg=$1
       shift
     else
@@ -4321,8 +4766,13 @@ func_mode_install ()
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$arg"
     func_append install_prog "$func_quote_arg_result"
+=======
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
@@ -4379,12 +4829,21 @@ func_mode_install ()
       esac
 
       # Aesthetically quote the argument.
+<<<<<<< build-aux/ltmain.sh
       func_quote_arg pretty "$arg"
       func_append install_prog " $func_quote_arg_result"
       if test -n "$arg2"; then
 	func_quote_arg pretty "$arg2"
       fi
       func_append install_shared_prog " $func_quote_arg_result"
+=======
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
     done
 
     test -z "$install_prog" && \
@@ -4395,8 +4854,13 @@ func_mode_install ()
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
+<<<<<<< build-aux/ltmain.sh
 	func_quote_arg pretty "$install_override_mode"
 	func_append install_shared_prog " -m $func_quote_arg_result"
+=======
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
       fi
     fi
 
@@ -4692,8 +5156,13 @@ func_mode_install ()
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_quiet || {
+<<<<<<< build-aux/ltmain.sh
 	          func_quote_arg expand,pretty "$relink_command"
 		  eval "func_echo $func_quote_arg_result"
+=======
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+>>>>>>> build-aux/ltmain.sh
 	        }
 	        if eval "$relink_command"; then :
 	          else
@@ -5472,8 +5941,12 @@ else
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
     file=\"\$0\""
 
+<<<<<<< build-aux/ltmain.sh
     func_quote_arg pretty "$ECHO"
     qECHO=$func_quote_arg_result
+=======
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+>>>>>>> build-aux/ltmain.sh
     $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -5483,7 +5956,11 @@ func_fallback_echo ()
 \$1
 _LTECHO_EOF'
 }
+<<<<<<< build-aux/ltmain.sh
     ECHO=$qECHO
+=======
+    ECHO=\"$qECHO\"
+>>>>>>> build-aux/ltmain.sh
   fi
 
 # Very basic option parsing. These options are (a) specific to
@@ -6826,9 +7303,15 @@ func_mode_link ()
     while test "$#" -gt 0; do
       arg=$1
       shift
+<<<<<<< build-aux/ltmain.sh
       func_quote_arg pretty,unquoted "$arg"
       qarg=$func_quote_arg_unquoted_result
       func_append libtool_args " $func_quote_arg_result"
+=======
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
@@ -7426,9 +7909,15 @@ func_mode_link ()
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
+<<<<<<< build-aux/ltmain.sh
           func_quote_arg pretty "$flag"
 	  func_append arg " $func_quote_arg_result"
 	  func_append compiler_flags " $func_quote_arg_result"
+=======
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7442,10 +7931,17 @@ func_mode_link ()
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
+<<<<<<< build-aux/ltmain.sh
           func_quote_arg pretty "$flag"
 	  func_append arg " $wl$func_quote_arg_result"
 	  func_append compiler_flags " $wl$func_quote_arg_result"
 	  func_append linker_flags " $func_quote_arg_result"
+=======
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+>>>>>>> build-aux/ltmain.sh
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7469,8 +7965,13 @@ func_mode_link ()
 
       # -msg_* for osf cc
       -msg_*)
+<<<<<<< build-aux/ltmain.sh
 	func_quote_arg pretty "$arg"
 	arg=$func_quote_arg_result
+=======
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -7489,6 +7990,7 @@ func_mode_link ()
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
+<<<<<<< build-aux/ltmain.sh
       # -fsanitize=*         Clang/GCC memory and address sanitizer
       # -fuse-ld=*           Linker select flags for GCC
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
@@ -7497,6 +7999,14 @@ func_mode_link ()
       -specs=*|-fsanitize=*|-fuse-ld=*)
         func_quote_arg pretty "$arg"
 	arg=$func_quote_arg_result
+=======
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
@@ -7517,15 +8027,25 @@ func_mode_link ()
 	  continue
         else
 	  # Otherwise treat like 'Some other compiler flag' below
+<<<<<<< build-aux/ltmain.sh
 	  func_quote_arg pretty "$arg"
 	  arg=$func_quote_arg_result
+=======
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
         fi
 	;;
 
       # Some other compiler flag.
       -* | +*)
+<<<<<<< build-aux/ltmain.sh
         func_quote_arg pretty "$arg"
 	arg=$func_quote_arg_result
+=======
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 	;;
 
       *.$objext)
@@ -7645,8 +8165,13 @@ func_mode_link ()
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
+<<<<<<< build-aux/ltmain.sh
 	func_quote_arg pretty "$arg"
 	arg=$func_quote_arg_result
+=======
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+>>>>>>> build-aux/ltmain.sh
 	;;
       esac # arg
 
@@ -10152,8 +10677,13 @@ EOF
 	    for cmd in $concat_cmds; do
 	      IFS=$save_ifs
 	      $opt_quiet || {
+<<<<<<< build-aux/ltmain.sh
 		  func_quote_arg expand,pretty "$cmd"
 		  eval "func_echo $func_quote_arg_result"
+=======
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+>>>>>>> build-aux/ltmain.sh
 	      }
 	      $opt_dry_run || eval "$cmd" || {
 		lt_exit=$?
@@ -10246,8 +10776,13 @@ EOF
 	  eval cmd=\"$cmd\"
 	  IFS=$save_ifs
 	  $opt_quiet || {
+<<<<<<< build-aux/ltmain.sh
 	    func_quote_arg expand,pretty "$cmd"
 	    eval "func_echo $func_quote_arg_result"
+=======
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+>>>>>>> build-aux/ltmain.sh
 	  }
 	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
@@ -10721,6 +11256,7 @@ EOF
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
+<<<<<<< build-aux/ltmain.sh
 	    func_quote_arg pretty "$var_value"
 	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
 	  fi
@@ -10728,6 +11264,14 @@ EOF
 	func_quote eval cd "`pwd`"
 	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
 	relink_command=$func_quote_arg_unquoted_result
+=======
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+>>>>>>> build-aux/ltmain.sh
       fi
 
       # Only actually do things if not in dry run mode.
@@ -10967,6 +11511,7 @@ EOF
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
+<<<<<<< build-aux/ltmain.sh
 	  func_quote_arg pretty,unquoted "$var_value"
 	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
 	fi
@@ -10976,6 +11521,15 @@ EOF
       relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       func_quote_arg pretty,unquoted "$relink_command"
       relink_command=$func_quote_arg_unquoted_result
+=======
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+>>>>>>> build-aux/ltmain.sh
       if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
diff --git a/configure b/configure
index a0d6128..87e8811 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
+<<<<<<< configure
 # Generated by GNU Autoconf 2.69 for libseccomp 2.4.1.
+=======
+# Generated by GNU Autoconf 2.69 for libseccomp 2.4.2.
+>>>>>>> configure
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +591,13 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libseccomp'
 PACKAGE_TARNAME='libseccomp'
+<<<<<<< configure
 PACKAGE_VERSION='2.4.1'
 PACKAGE_STRING='libseccomp 2.4.1'
+=======
+PACKAGE_VERSION='2.4.2'
+PACKAGE_STRING='libseccomp 2.4.2'
+>>>>>>> configure
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1347,7 +1356,11 @@ 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
 \`configure' configures libseccomp 2.4.1 to adapt to many kinds of systems.
+=======
+\`configure' configures libseccomp 2.4.2 to adapt to many kinds of systems.
+>>>>>>> configure
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1417,7 +1430,11 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
+<<<<<<< configure
      short | recursive ) echo "Configuration of libseccomp 2.4.1:";;
+=======
+     short | recursive ) echo "Configuration of libseccomp 2.4.2:";;
+>>>>>>> configure
    esac
   cat <<\_ACEOF
 
@@ -1531,7 +1548,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+<<<<<<< configure
 libseccomp configure 2.4.1
+=======
+libseccomp configure 2.4.2
+>>>>>>> configure
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1809,7 +1830,11 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
+<<<<<<< configure
 It was created by libseccomp $as_me 2.4.1, which was
+=======
+It was created by libseccomp $as_me 2.4.2, which was
+>>>>>>> configure
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2679,7 +2704,11 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libseccomp'
+<<<<<<< configure
  VERSION='2.4.1'
+=======
+ VERSION='2.4.2'
+>>>>>>> configure
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4079,8 +4108,13 @@ esac
 
 
 
+<<<<<<< configure
 macro_version='2.4.6.42-b88ce'
 macro_revision='2.4.6.42'
+=======
+macro_version='2.4.6'
+macro_revision='2.4.6'
+>>>>>>> configure
 
 
 
@@ -5742,12 +5776,17 @@ esac
 fi
 
 : ${AR=ar}
+<<<<<<< configure
+=======
+: ${AR_FLAGS=cru}
+>>>>>>> configure
 
 
 
 
 
 
+<<<<<<< configure
 # Use ARFLAGS variable as AR's operation code to sync the variable naming with
 # Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
 # higher priority because thats what people were doing historically (setting
@@ -5765,6 +5804,8 @@ lt_ar_flags=$AR_FLAGS
 # Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
 # by AR_FLAGS because that was never working and AR_FLAGS is about to die.
 
+=======
+>>>>>>> configure
 
 
 
@@ -6213,7 +6254,11 @@ for ac_symprfx in "" "_"; do
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
+<<<<<<< configure
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+=======
+    # Also find C++ and __fastcall symbols from MSVC++,
+>>>>>>> configure
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -7482,8 +7527,13 @@ int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+<<<<<<< configure
       echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
       $AR $AR_FLAGS libconftest.a conftest.o 2>&5
+=======
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+>>>>>>> configure
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -8144,8 +8194,13 @@ esac
 ofile=libtool
 can_build_shared=yes
 
+<<<<<<< configure
 # All known linkers require a '.a' archive for static linking (except MSVC and
 # ICC, which need '.lib').
+=======
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+>>>>>>> configure
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9072,15 +9127,25 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
+<<<<<<< configure
     # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++ or Intel C++ Compiler.
+=======
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+>>>>>>> configure
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
+<<<<<<< configure
     # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+=======
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+>>>>>>> configure
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -9244,7 +9309,10 @@ _LT_EOF
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+<<<<<<< configure
       file_list_spec='@'
+=======
+>>>>>>> configure
       ;;
 
     interix[3-9]*)
@@ -9462,7 +9530,11 @@ _LT_EOF
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
+<<<<<<< configure
 	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+=======
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+>>>>>>> configure
 	fi
 	aix_use_runtimelinking=no
 
@@ -9729,12 +9801,21 @@ fi
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
+<<<<<<< configure
       # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
       cl* | icl*)
 	# Native MSVC or ICC
+=======
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+>>>>>>> configure
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -9775,7 +9856,11 @@ fi
           fi'
 	;;
       *)
+<<<<<<< configure
 	# Assume MSVC and ICC wrapper
+=======
+	# Assume MSVC wrapper
+>>>>>>> configure
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -10099,7 +10184,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+<<<<<<< configure
       file_list_spec='@'
+=======
+>>>>>>> configure
       ;;
 
     osf3*)
@@ -10807,8 +10895,13 @@ cygwin* | mingw* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
+<<<<<<< configure
   *,cl* | *,icl*)
     # Native MSVC or ICC
+=======
+  *,cl*)
+    # Native MSVC
+>>>>>>> configure
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -10864,7 +10957,11 @@ cygwin* | mingw* | pw32* | cegcc*)
     ;;
 
   *)
+<<<<<<< configure
     # Assume MSVC and ICC wrapper
+=======
+    # Assume MSVC wrapper
+>>>>>>> configure
     library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -11128,6 +11225,12 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+<<<<<<< configure
+=======
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+>>>>>>> configure
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -11136,7 +11239,11 @@ fi
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+<<<<<<< configure
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+=======
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+>>>>>>> configure
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12043,6 +12150,7 @@ striplib=
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+<<<<<<< configure
 if test -z "$STRIP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12056,10 +12164,23 @@ $as_echo "yes" >&6; }
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
+=======
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+>>>>>>> configure
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+<<<<<<< configure
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
@@ -12078,6 +12199,18 @@ $as_echo "no" >&6; }
       ;;
     esac
   fi
+=======
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+>>>>>>> configure
 fi
 
 
@@ -12301,9 +12434,15 @@ fi
 if test "$enable_python" = yes; then :
 
 	# cython version check
+<<<<<<< configure
 	if test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16; then :
 
 		as_fn_error $? "python bindings require cython 0.16 or higher" "$LINENO" 5
+=======
+	if test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 29; then :
+
+		as_fn_error $? "python bindings require cython 0.29 or higher" "$LINENO" 5
+>>>>>>> configure
 
 fi
 
@@ -13495,7 +13634,11 @@ 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="
+<<<<<<< configure
 This file was extended by libseccomp $as_me 2.4.1, which was
+=======
+This file was extended by libseccomp $as_me 2.4.2, which was
+>>>>>>> configure
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13561,7 +13704,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
+<<<<<<< configure
 libseccomp config.status 2.4.1
+=======
+libseccomp config.status 2.4.2
+>>>>>>> configure
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -13732,7 +13879,10 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+<<<<<<< configure
 lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
+=======
+>>>>>>> configure
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -13861,6 +14011,10 @@ want_nocaseglob \
 DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
+<<<<<<< configure
+=======
+AR_FLAGS \
+>>>>>>> configure
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -14833,11 +14987,16 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 # The archiver.
 AR=$lt_AR
 
+<<<<<<< configure
 # Flags to create an archive (by configure).
 lt_ar_flags=$lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
+=======
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+>>>>>>> configure
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
diff --git a/configure.ac b/configure.ac
index 05d34a5..d4fd1cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,11 @@ dnl #
 dnl ####
 dnl libseccomp defines
 dnl ####
+<<<<<<< configure.ac
 AC_INIT([libseccomp], [2.4.1])
+=======
+AC_INIT([libseccomp], [2.4.2])
+>>>>>>> configure.ac
 
 dnl ####
 dnl autoconf configuration
@@ -109,8 +113,13 @@ AC_ARG_ENABLE([python],
 	[build the python bindings, requires cython])])
 AS_IF([test "$enable_python" = yes], [
 	# cython version check
+<<<<<<< configure.ac
 	AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16], [
 		AC_MSG_ERROR([python bindings require cython 0.16 or higher])
+=======
+	AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 29], [
+		AC_MSG_ERROR([python bindings require cython 0.29 or higher])
+>>>>>>> configure.ac
 	])
 	AM_PATH_PYTHON
 ])
diff --git a/debian/changelog b/debian/changelog
index d6cc9b4..05e3b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+<<<<<<< debian/changelog
+=======
+libseccomp (2.4.2-0ubuntu1) focal; urgency=medium
+
+  * New upstream release 2.4.2 for compatibility with newer kernels and
+    and FTBFS (LP: #1849785).
+    - drop d/p/python_install_dir.patch (now upstream)
+    - d/rules: adapt to python 3.8 lacking the m modifier on includes
+      see https://wiki.debian.org/Python/Python3.8
+    - d/p/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch: fix
+      build time test on arm64
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 11 Nov 2019 11:31:26 +0100
+
+>>>>>>> debian/changelog
 libseccomp (2.4.1-2) unstable; urgency=medium
 
   * Remove build-dependency on valgrind for mipsel and x32 as it's broken
diff --git a/debian/control b/debian/control
index 5515592..2afe09c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,12 @@
 Source: libseccomp
 Section: libs
 Priority: optional
+<<<<<<< debian/control
 Maintainer: Kees Cook <[e-mail]>
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Kees Cook <[e-mail]>
+>>>>>>> debian/control
 Uploaders: Luca Bruno <[e-mail]>, Felix Geyer <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
                linux-libc-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 05d7297..fa08aca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,5 @@
+<<<<<<< debian/patches/series
 python_install_dir.patch
+=======
+tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch b/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
new file mode 100644
index 0000000..82c9360
--- /dev/null
+++ b/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
@@ -0,0 +1,47 @@
+From 35803ceb43c453762a3ab5177c5f8d5dbb813478 Mon Sep 17 00:00:00 2001
+From: Paul Moore <[e-mail]>
+Date: Tue, 5 Nov 2019 15:11:11 -0500
+Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls
+
+We recently changed how libseccomp handles syscall numbers that are
+not defined natively, but we missed test #15.
+
+Signed-off-by: Paul Moore <[e-mail]>
+
+Note: Tagged for v2.5, but needed to build 2.4.2 with newer kernels on arm
+This is part of PR: https://github.com/seccomp/libseccomp/pull/182
+Upstream Bug: https://github.com/seccomp/libseccomp/issues/184
+Origin: upstream, https://github.com/pcmoore/misc-libseccomp/commit/35803ceb43c453762a3ab5177c5f8d5dbb813478
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1849785
+Last-Update: 2019-11-12
+
+---
+ tests/15-basic-resolver.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c
+index 6badef1..0c1eefe 100644
+--- a/tests/15-basic-resolver.c
++++ b/tests/15-basic-resolver.c
+@@ -55,15 +55,15 @@ int main(int argc, char *argv[])
+ 	unsigned int arch;
+ 	char *name = NULL;
+ 
+-	if (seccomp_syscall_resolve_name("open") != __NR_open)
++	if (seccomp_syscall_resolve_name("open") != __SNR_open)
+ 		goto fail;
+-	if (seccomp_syscall_resolve_name("read") != __NR_read)
++	if (seccomp_syscall_resolve_name("read") != __SNR_read)
+ 		goto fail;
+ 	if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR)
+ 		goto fail;
+ 
+ 	rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat");
+-	if (rc != __NR_openat)
++	if (rc != __SNR_openat)
+ 		goto fail;
+ 
+ 	while ((arch = arch_list[iter++]) != -1) {
+-- 
+2.24.0
+
diff --git a/debian/rules b/debian/rules
index ee252c9..da915cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,18 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
+<<<<<<< debian/rules
 	set -e; export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata_m_${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \
 	for pyver in `py3versions -s`; do \
+=======
+	for pyver in `py3versions -s`; do \
+		set -e; \
+		if python -c "pyver='$$pyver'; exit(0 if float(pyver[6:]) >= 3.8 else 1)"; then \
+			export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \
+		else \
+			export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata_m_${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \
+		fi; \
+>>>>>>> debian/rules
 		dh_auto_configure -- --enable-python PYTHON=$$pyver; \
 		dh_auto_install --sourcedirectory=src/python -- PYTHON=$$pyver; \
 	done
diff --git a/include/Makefile.am b/include/Makefile.am
index ba3723f..aecccda 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,4 +16,8 @@
 # along with this library; if not, see <http://www.gnu.org/licenses>.
 #
 
+<<<<<<< include/Makefile.am
 include_HEADERS = seccomp.h
+=======
+include_HEADERS = seccomp.h seccomp-syscalls.h
+>>>>>>> include/Makefile.am
diff --git a/include/Makefile.in b/include/Makefile.in
index b9c38dc..06dffe9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -330,7 +330,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+<<<<<<< include/Makefile.in
 include_HEADERS = seccomp.h
+=======
+include_HEADERS = seccomp.h seccomp-syscalls.h
+>>>>>>> include/Makefile.in
 all: all-am
 
 .SUFFIXES:
diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h
new file mode 100644
index 0000000..6457592
--- /dev/null
+++ b/include/seccomp-syscalls.h
@@ -0,0 +1,2292 @@
+/**
+ * Seccomp Library
+ *
+ * Copyright (c) 2019 Cisco Systems <[e-mail]>
+ * Author: Paul Moore <[e-mail]>
+ */
+
+/*
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of version 2.1 of the GNU Lesser General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#ifndef _SECCOMP_H
+#error "do not include seccomp-syscalls.h directly, use seccomp.h instead"
+#endif
+
+/*
+ * psuedo syscall definitions
+ */
+
+/* socket syscalls */
+
+#define __PNR_socket				-101
+#define __PNR_bind				-102
+#define __PNR_connect				-103
+#define __PNR_listen				-104
+#define __PNR_accept				-105
+#define __PNR_getsockname			-106
+#define __PNR_getpeername			-107
+#define __PNR_socketpair			-108
+#define __PNR_send				-109
+#define __PNR_recv				-110
+#define __PNR_sendto				-111
+#define __PNR_recvfrom				-112
+#define __PNR_shutdown				-113
+#define __PNR_setsockopt			-114
+#define __PNR_getsockopt			-115
+#define __PNR_sendmsg				-116
+#define __PNR_recvmsg				-117
+#define __PNR_accept4				-118
+#define __PNR_recvmmsg				-119
+#define __PNR_sendmmsg				-120
+
+/* ipc syscalls */
+
+#define __PNR_semop				-201
+#define __PNR_semget				-202
+#define __PNR_semctl				-203
+#define __PNR_semtimedop			-204
+#define __PNR_msgsnd				-211
+#define __PNR_msgrcv				-212
+#define __PNR_msgget				-213
+#define __PNR_msgctl				-214
+#define __PNR_shmat				-221
+#define __PNR_shmdt				-222
+#define __PNR_shmget				-223
+#define __PNR_shmctl				-224
+
+/* single syscalls */
+
+#define __PNR_arch_prctl			-10001
+#define __PNR_bdflush				-10002
+#define __PNR_break				-10003
+#define __PNR_chown32				-10004
+#define __PNR_epoll_ctl_old			-10005
+#define __PNR_epoll_wait_old			-10006
+#define __PNR_fadvise64_64			-10007
+#define __PNR_fchown32				-10008
+#define __PNR_fcntl64				-10009
+#define __PNR_fstat64				-10010
+#define __PNR_fstatat64				-10011
+#define __PNR_fstatfs64				-10012
+#define __PNR_ftime				-10013
+#define __PNR_ftruncate64			-10014
+#define __PNR_getegid32				-10015
+#define __PNR_geteuid32				-10016
+#define __PNR_getgid32				-10017
+#define __PNR_getgroups32			-10018
+#define __PNR_getresgid32			-10019
+#define __PNR_getresuid32			-10020
+#define __PNR_getuid32				-10021
+#define __PNR_gtty				-10022
+#define __PNR_idle				-10023
+#define __PNR_ipc				-10024
+#define __PNR_lchown32				-10025
+#define __PNR__llseek				-10026
+#define __PNR_lock				-10027
+#define __PNR_lstat64				-10028
+#define __PNR_mmap2				-10029
+#define __PNR_mpx				-10030
+#define __PNR_newfstatat			-10031
+#define __PNR__newselect			-10032
+#define __PNR_nice				-10033
+#define __PNR_oldfstat				-10034
+#define __PNR_oldlstat				-10035
+#define __PNR_oldolduname			-10036
+#define __PNR_oldstat				-10037
+#define __PNR_olduname				-10038
+#define __PNR_prof				-10039
+#define __PNR_profil				-10040
+#define __PNR_readdir				-10041
+#define __PNR_security				-10042
+#define __PNR_sendfile64			-10043
+#define __PNR_setfsgid32			-10044
+#define __PNR_setfsuid32			-10045
+#define __PNR_setgid32				-10046
+#define __PNR_setgroups32			-10047
+#define __PNR_setregid32			-10048
+#define __PNR_setresgid32			-10049
+#define __PNR_setresuid32			-10050
+#define __PNR_setreuid32			-10051
+#define __PNR_setuid32				-10052
+#define __PNR_sgetmask				-10053
+#define __PNR_sigaction				-10054
+#define __PNR_signal				-10055
+#define __PNR_sigpending			-10056
+#define __PNR_sigprocmask			-10057
+#define __PNR_sigreturn				-10058
+#define __PNR_sigsuspend			-10059
+#define __PNR_socketcall			-10060
+#define __PNR_ssetmask				-10061
+#define __PNR_stat64				-10062
+#define __PNR_statfs64				-10063
+#define __PNR_stime				-10064
+#define __PNR_stty				-10065
+#define __PNR_truncate64			-10066
+#define __PNR_tuxcall				-10067
+#define __PNR_ugetrlimit			-10068
+#define __PNR_ulimit				-10069
+#define __PNR_umount				-10070
+#define __PNR_vm86				-10071
+#define __PNR_vm86old				-10072
+#define __PNR_waitpid				-10073
+#define __PNR_create_module			-10074
+#define __PNR_get_kernel_syms			-10075
+#define __PNR_get_thread_area			-10076
+#define __PNR_nfsservctl			-10077
+#define __PNR_query_module			-10078
+#define __PNR_set_thread_area			-10079
+#define __PNR__sysctl				-10080
+#define __PNR_uselib				-10081
+#define __PNR_vserver				-10082
+#define __PNR_arm_fadvise64_64			-10083
+#define __PNR_arm_sync_file_range		-10084
+#define __PNR_pciconfig_iobase			-10086
+#define __PNR_pciconfig_read			-10087
+#define __PNR_pciconfig_write			-10088
+#define __PNR_sync_file_range2			-10089
+#define __PNR_syscall				-10090
+#define __PNR_afs_syscall			-10091
+#define __PNR_fadvise64				-10092
+#define __PNR_getpmsg				-10093
+#define __PNR_ioperm				-10094
+#define __PNR_iopl				-10095
+#define __PNR_migrate_pages			-10097
+#define __PNR_modify_ldt			-10098
+#define __PNR_putpmsg				-10099
+#define __PNR_sync_file_range			-10100
+#define __PNR_select				-10101
+#define __PNR_vfork				-10102
+#define __PNR_cachectl				-10103
+#define __PNR_cacheflush			-10104
+#define __PNR_sysmips				-10106
+#define __PNR_timerfd				-10107
+#define __PNR_time				-10108
+#define __PNR_getrandom				-10109
+#define __PNR_memfd_create			-10110
+#define __PNR_kexec_file_load			-10111
+#define __PNR_sysfs				-10145
+#define __PNR_oldwait4				-10146
+#define __PNR_access				-10147
+#define __PNR_alarm				-10148
+#define __PNR_chmod				-10149
+#define __PNR_chown				-10150
+#define __PNR_creat				-10151
+#define __PNR_dup2				-10152
+#define __PNR_epoll_create			-10153
+#define __PNR_epoll_wait			-10154
+#define __PNR_eventfd				-10155
+#define __PNR_fork				-10156
+#define __PNR_futimesat				-10157
+#define __PNR_getdents				-10158
+#define __PNR_getpgrp				-10159
+#define __PNR_inotify_init			-10160
+#define __PNR_lchown				-10161
+#define __PNR_link				-10162
+#define __PNR_lstat				-10163
+#define __PNR_mkdir				-10164
+#define __PNR_mknod				-10165
+#define __PNR_open				-10166
+#define __PNR_pause				-10167
+#define __PNR_pipe				-10168
+#define __PNR_poll				-10169
+#define __PNR_readlink				-10170
+#define __PNR_rename				-10171
+#define __PNR_rmdir				-10172
+#define __PNR_signalfd				-10173
+#define __PNR_stat				-10174
+#define __PNR_symlink				-10175
+#define __PNR_unlink				-10176
+#define __PNR_ustat				-10177
+#define __PNR_utime				-10178
+#define __PNR_utimes				-10179
+#define __PNR_getrlimit				-10180
+#define __PNR_mmap				-10181
+#define __PNR_breakpoint			-10182
+#define __PNR_set_tls				-10183
+#define __PNR_usr26				-10184
+#define __PNR_usr32				-10185
+#define __PNR_multiplexer			-10186
+#define __PNR_rtas				-10187
+#define __PNR_spu_create			-10188
+#define __PNR_spu_run				-10189
+#define __PNR_swapcontext			-10190
+#define __PNR_sys_debug_setcontext		-10191
+#define __PNR_switch_endian			-10191
+#define __PNR_get_mempolicy			-10192
+#define __PNR_move_pages			-10193
+#define __PNR_mbind				-10194
+#define __PNR_set_mempolicy			-10195
+#define __PNR_s390_runtime_instr		-10196
+#define __PNR_s390_pci_mmio_read		-10197
+#define __PNR_s390_pci_mmio_write		-10198
+#define __PNR_membarrier			-10199
+#define __PNR_userfaultfd			-10200
+#define __PNR_pkey_mprotect			-10201
+#define __PNR_pkey_alloc			-10202
+#define __PNR_pkey_free				-10203
+#define __PNR_get_tls				-10204
+#define __PNR_s390_guarded_storage		-10205
+#define __PNR_s390_sthyi			-10206
+#define __PNR_subpage_prot			-10207
+#define __PNR_statx				-10208
+#define __PNR_io_pgetevents			-10209
+#define __PNR_rseq				-10210
+#define __PNR_setrlimit				-10211
+#define __PNR_clock_adjtime64			-10212
+#define __PNR_clock_getres_time64		-10213
+#define __PNR_clock_gettime64			-10214
+#define __PNR_clock_nanosleep_time64		-10215
+#define __PNR_clock_settime64			-10216
+#define __PNR_clone3				-10217
+#define __PNR_fsconfig				-10218
+#define __PNR_fsmount				-10219
+#define __PNR_fsopen				-10220
+#define __PNR_fspick				-10221
+#define __PNR_futex_time64			-10222
+#define __PNR_io_pgetevents_time64		-10223
+#define __PNR_move_mount			-10224
+#define __PNR_mq_timedreceive_time64		-10225
+#define __PNR_mq_timedsend_time64		-10226
+#define __PNR_open_tree				-10227
+#define __PNR_pidfd_open			-10228
+#define __PNR_pidfd_send_signal			-10229
+#define __PNR_ppoll_time64			-10230
+#define __PNR_pselect6_time64			-10231
+#define __PNR_recvmmsg_time64			-10232
+#define __PNR_rt_sigtimedwait_time64		-10233
+#define __PNR_sched_rr_get_interval_time64	-10234
+#define __PNR_semtimedop_time64			-10235
+#define __PNR_timer_gettime64			-10236
+#define __PNR_timer_settime64			-10237
+#define __PNR_timerfd_gettime64			-10238
+#define __PNR_timerfd_settime64			-10239
+#define __PNR_utimensat_time64			-10240
+
+/*
+ * libseccomp syscall definitions
+ */
+
+#ifdef __NR__llseek
+#define __SNR__llseek			__NR__llseek
+#else
+#define __SNR__llseek			__PNR__llseek
+#endif
+
+#ifdef __NR__newselect
+#define __SNR__newselect		__NR__newselect
+#else
+#define __SNR__newselect		__PNR__newselect
+#endif
+
+#ifdef __NR__sysctl
+#define __SNR__sysctl			__NR__sysctl
+#else
+#define __SNR__sysctl			__PNR__sysctl
+#endif
+
+#ifdef __NR_accept
+#define __SNR_accept			__NR_accept
+#else
+#define __SNR_accept			__PNR_accept
+#endif
+
+#ifdef __NR_accept4
+#define __SNR_accept4			__NR_accept4
+#else
+#define __SNR_accept4			__PNR_accept4
+#endif
+
+#ifdef __NR_access
+#define __SNR_access			__NR_access
+#else
+#define __SNR_access			__PNR_access
+#endif
+
+#define __SNR_acct			__NR_acct
+
+#define __SNR_add_key			__NR_add_key
+
+#define __SNR_adjtimex			__NR_adjtimex
+
+#ifdef __NR_afs_syscall
+#define __SNR_afs_syscall		__NR_afs_syscall
+#else
+#define __SNR_afs_syscall		__PNR_afs_syscall
+#endif
+
+#ifdef __NR_alarm
+#define __SNR_alarm			__NR_alarm
+#else
+#define __SNR_alarm			__PNR_alarm
+#endif
+
+#ifdef __NR_arm_fadvise64_64
+#define __SNR_arm_fadvise64_64		__NR_arm_fadvise64_64
+#else
+#define __SNR_arm_fadvise64_64		__PNR_arm_fadvise64_64
+#endif
+
+#ifdef __NR_arm_sync_file_range
+#define __SNR_arm_sync_file_range	__NR_arm_sync_file_range
+#else
+#define __SNR_arm_sync_file_range	__PNR_arm_sync_file_range
+#endif
+
+#ifdef __NR_arch_prctl
+#define __SNR_arch_prctl		__NR_arch_prctl
+#else
+#define __SNR_arch_prctl		__PNR_arch_prctl
+#endif
+
+#ifdef __NR_bdflush
+#define __SNR_bdflush			__NR_bdflush
+#else
+#define __SNR_bdflush			__PNR_bdflush
+#endif
+
+#ifdef __NR_bind
+#define __SNR_bind			__NR_bind
+#else
+#define __SNR_bind			__PNR_bind
+#endif
+
+#define __SNR_bpf			__NR_bpf
+
+#ifdef __NR_break
+#define __SNR_break			__NR_break
+#else
+#define __SNR_break			__PNR_break
+#endif
+
+#ifdef __NR_breakpoint
+#ifdef __ARM_NR_breakpoint
+#define __SNR_breakpoint		__ARM_NR_breakpoint
+#else
+#define __SNR_breakpoint		__NR_breakpoint
+#endif
+#else
+#define __SNR_breakpoint		__PNR_breakpoint
+#endif
+
+#define __SNR_brk			__NR_brk
+
+#ifdef __NR_cachectl
+#define __SNR_cachectl			__NR_cachectl
+#else
+#define __SNR_cachectl			__PNR_cachectl
+#endif
+
+#ifdef __NR_cacheflush
+#ifdef __ARM_NR_cacheflush
+#define __SNR_cacheflush		__ARM_NR_cacheflush
+#else
+#define __SNR_cacheflush		__NR_cacheflush
+#endif
+#else
+#define __SNR_cacheflush		__PNR_cacheflush
+#endif
+
+#define __SNR_capget			__NR_capget
+
+#define __SNR_capset			__NR_capset
+
+#define __SNR_chdir			__NR_chdir
+
+#ifdef __NR_chmod
+#define __SNR_chmod			__NR_chmod
+#else
+#define __SNR_chmod			__PNR_chmod
+#endif
+
+#ifdef __NR_chown
+#define __SNR_chown			__NR_chown
+#else
+#define __SNR_chown			__PNR_chown
+#endif
+
+#ifdef __NR_chown32
+#define __SNR_chown32			__NR_chown32
+#else
+#define __SNR_chown32			__PNR_chown32
+#endif
+
+#define __SNR_chroot			__NR_chroot
+
+#define __SNR_clock_adjtime		__NR_clock_adjtime
+
+#ifdef __NR_clock_adjtime64
+#define __SNR_clock_adjtime64		__NR_clock_adjtime64
+#else
+#define __SNR_clock_adjtime64		__PNR_clock_adjtime64
+#endif
+
+#define __SNR_clock_getres		__NR_clock_getres
+
+#ifdef __NR_clock_getres_time64
+#define __SNR_clock_getres_time64	__NR_clock_getres_time64
+#else
+#define __SNR_clock_getres_time64	__PNR_clock_getres_time64
+#endif
+
+#define __SNR_clock_gettime		__NR_clock_gettime
+
+#ifdef __NR_clock_gettime64
+#define __SNR_clock_gettime64		__NR_clock_gettime64
+#else
+#define __SNR_clock_gettime64		__PNR_clock_gettime64
+#endif
+
+#define __SNR_clock_nanosleep		__NR_clock_nanosleep
+
+#ifdef __NR_clock_nanosleep_time64
+#define __SNR_clock_nanosleep_time64	__NR_clock_nanosleep_time64
+#else
+#define __SNR_clock_nanosleep_time64	__PNR_clock_nanosleep_time64
+#endif
+
+#define __SNR_clock_settime		__NR_clock_settime
+
+#ifdef __NR_clock_settime64
+#define __SNR_clock_settime64		__NR_clock_settime64
+#else
+#define __SNR_clock_settime64		__PNR_clock_settime64
+#endif
+
+#define __SNR_clone			__NR_clone
+
+#ifdef __NR_clone3
+#define __SNR_clone3			__NR_clone3
+#else
+#define __SNR_clone3			__PNR_clone3
+#endif
+
+#define __SNR_close			__NR_close
+
+#ifdef __NR_connect
+#define __SNR_connect			__NR_connect
+#else
+#define __SNR_connect			__PNR_connect
+#endif
+
+#define __SNR_copy_file_range		__NR_copy_file_range
+
+#ifdef __NR_creat
+#define __SNR_creat			__NR_creat
+#else
+#define __SNR_creat			__PNR_creat
+#endif
+
+#ifdef __NR_create_module
+#define __SNR_create_module		__NR_create_module
+#else
+#define __SNR_create_module		__PNR_create_module
+#endif
+
+#define __SNR_delete_module		__NR_delete_module
+
+#ifdef __NR_dup
+#define __SNR_dup			__NR_dup
+#else
+#define __SNR_dup			__PNR_dup
+#endif
+
+#ifdef __NR_dup2
+#define __SNR_dup2			__NR_dup2
+#else
+#define __SNR_dup2			__PNR_dup2
+#endif
+
+#define __SNR_dup3			__NR_dup3
+
+#ifdef __NR_epoll_create
+#define __SNR_epoll_create		__NR_epoll_create
+#else
+#define __SNR_epoll_create		__PNR_epoll_create
+#endif
+
+#define __SNR_epoll_create1		__NR_epoll_create1
+
+#ifdef __NR_epoll_ctl
+#define __SNR_epoll_ctl			__NR_epoll_ctl
+#else
+#define __SNR_epoll_ctl			__PNR_epoll_ctl
+#endif
+
+#ifdef __NR_epoll_ctl_old
+#define __SNR_epoll_ctl_old		__NR_epoll_ctl_old
+#else
+#define __SNR_epoll_ctl_old		__PNR_epoll_ctl_old
+#endif
+
+#define __SNR_epoll_pwait		__NR_epoll_pwait
+
+#ifdef __NR_epoll_wait
+#define __SNR_epoll_wait		__NR_epoll_wait
+#else
+#define __SNR_epoll_wait		__PNR_epoll_wait
+#endif
+
+#ifdef __NR_epoll_wait_old
+#define __SNR_epoll_wait_old		__NR_epoll_wait_old
+#else
+#define __SNR_epoll_wait_old		__PNR_epoll_wait_old
+#endif
+
+#ifdef __NR_eventfd
+#define __SNR_eventfd			__NR_eventfd
+#else
+#define __SNR_eventfd			__PNR_eventfd
+#endif
+
+#define __SNR_eventfd2			__NR_eventfd2
+
+#define __SNR_execve			__NR_execve
+
+#define __SNR_execveat			__NR_execveat
+
+#define __SNR_exit			__NR_exit
+
+#define __SNR_exit_group		__NR_exit_group
+
+#define __SNR_faccessat			__NR_faccessat
+
+#ifdef __NR_fadvise64
+#define __SNR_fadvise64			__NR_fadvise64
+#else
+#define __SNR_fadvise64			__PNR_fadvise64
+#endif
+
+#ifdef __NR_fadvise64_64
+#define __SNR_fadvise64_64		__NR_fadvise64_64
+#else
+#define __SNR_fadvise64_64		__PNR_fadvise64_64
+#endif
+
+#define __SNR_fallocate			__NR_fallocate
+
+#define __SNR_fanotify_init		__NR_fanotify_init
+
+#define __SNR_fanotify_mark		__NR_fanotify_mark
+
+#define __SNR_fchdir			__NR_fchdir
+
+#define __SNR_fchmod			__NR_fchmod
+
+#define __SNR_fchmodat			__NR_fchmodat
+
+#ifdef __NR_fchown
+#define __SNR_fchown			__NR_fchown
+#else
+#define __SNR_fchown			__PNR_fchown
+#endif
+
+#ifdef __NR_fchown32
+#define __SNR_fchown32			__NR_fchown32
+#else
+#define __SNR_fchown32			__PNR_fchown32
+#endif
+
+#define __SNR_fchownat			__NR_fchownat
+
+#ifdef __NR_fcntl
+#define __SNR_fcntl			__NR_fcntl
+#else
+#define __SNR_fcntl			__PNR_fcntl
+#endif
+
+#ifdef __NR_fcntl64
+#define __SNR_fcntl64			__NR_fcntl64
+#else
+#define __SNR_fcntl64			__PNR_fcntl64
+#endif
+
+#define __SNR_fdatasync			__NR_fdatasync
+
+#define __SNR_fgetxattr			__NR_fgetxattr
+
+#define __SNR_finit_module		__NR_finit_module
+
+#define __SNR_flistxattr		__NR_flistxattr
+
+#define __SNR_flock			__NR_flock
+
+#ifdef __NR_fork
+#define __SNR_fork			__NR_fork
+#else
+#define __SNR_fork			__PNR_fork
+#endif
+
+#define __SNR_fremovexattr		__NR_fremovexattr
+
+#ifdef __NR_fsconfig
+#define __SNR_fsconfig			__NR_fsconfig
+#else
+#define __SNR_fsconfig			__PNR_fsconfig
+#endif
+
+#define __SNR_fsetxattr			__NR_fsetxattr
+
+#ifdef __NR_fsmount
+#define __SNR_fsmount			__NR_fsmount
+#else
+#define __SNR_fsmount			__PNR_fsmount
+#endif
+
+#ifdef __NR_fsopen
+#define __SNR_fsopen			__NR_fsopen
+#else
+#define __SNR_fsopen			__PNR_fsopen
+#endif
+
+#ifdef __NR_fspick
+#define __SNR_fspick			__NR_fspick
+#else
+#define __SNR_fspick			__PNR_fspick
+#endif
+
+#ifdef __NR_fstat
+#define __SNR_fstat			__NR_fstat
+#else
+#define __SNR_fstat			__PNR_fstat
+#endif
+
+#ifdef __NR_fstat64
+#define __SNR_fstat64			__NR_fstat64
+#else
+#define __SNR_fstat64			__PNR_fstat64
+#endif
+
+#ifdef __NR_fstatat64
+#define __SNR_fstatat64			__NR_fstatat64
+#else
+#define __SNR_fstatat64			__PNR_fstatat64
+#endif
+
+#ifdef __NR_fstatfs
+#define __SNR_fstatfs			__NR_fstatfs
+#else
+#define __SNR_fstatfs			__PNR_fstatfs
+#endif
+
+#ifdef __NR_fstatfs64
+#define __SNR_fstatfs64			__NR_fstatfs64
+#else
+#define __SNR_fstatfs64			__PNR_fstatfs64
+#endif
+
+#define __SNR_fsync			__NR_fsync
+
+#ifdef __NR_ftime
+#define __SNR_ftime			__NR_ftime
+#else
+#define __SNR_ftime			__PNR_ftime
+#endif
+
+#ifdef __NR_ftruncate
+#define __SNR_ftruncate			__NR_ftruncate
+#else
+#define __SNR_ftruncate			__PNR_ftruncate
+#endif
+
+#ifdef __NR_ftruncate64
+#define __SNR_ftruncate64		__NR_ftruncate64
+#else
+#define __SNR_ftruncate64		__PNR_ftruncate64
+#endif
+
+#define __SNR_futex			__NR_futex
+
+#ifdef __NR_futex_time64
+#define __SNR_futex_time64		__NR_futex_time64
+#else
+#define __SNR_futex_time64		__PNR_futex_time64
+#endif
+
+#ifdef __NR_futimesat
+#define __SNR_futimesat			__NR_futimesat
+#else
+#define __SNR_futimesat			__PNR_futimesat
+#endif
+
+#ifdef __NR_get_kernel_syms
+#define __SNR_get_kernel_syms		__NR_get_kernel_syms
+#else
+#define __SNR_get_kernel_syms		__PNR_get_kernel_syms
+#endif
+
+#ifdef __NR_get_mempolicy
+#define __SNR_get_mempolicy		__NR_get_mempolicy
+#else
+#define __SNR_get_mempolicy		__PNR_get_mempolicy
+#endif
+
+#define __SNR_get_robust_list		__NR_get_robust_list
+
+#ifdef __NR_get_thread_area
+#define __SNR_get_thread_area		__NR_get_thread_area
+#else
+#define __SNR_get_thread_area		__PNR_get_thread_area
+#endif
+
+#ifdef __NR_get_tls
+#ifdef __ARM_NR_get_tls
+#define __SNR_get_tls			__ARM_NR_get_tls
+#else
+#define __SNR_get_tls			__NR_get_tls
+#endif
+#else
+#define __SNR_get_tls			__PNR_get_tls
+#endif
+
+#define __SNR_getcpu			__NR_getcpu
+
+#define __SNR_getcwd			__NR_getcwd
+
+#ifdef __NR_getdents
+#define __SNR_getdents			__NR_getdents
+#else
+#define __SNR_getdents			__PNR_getdents
+#endif
+
+#define __SNR_getdents64		__NR_getdents64
+
+#ifdef __NR_getegid
+#define __SNR_getegid			__NR_getegid
+#else
+#define __SNR_getegid			__PNR_getegid
+#endif
+
+#ifdef __NR_getegid32
+#define __SNR_getegid32			__NR_getegid32
+#else
+#define __SNR_getegid32			__PNR_getegid32
+#endif
+
+#ifdef __NR_geteuid
+#define __SNR_geteuid			__NR_geteuid
+#else
+#define __SNR_geteuid			__PNR_geteuid
+#endif
+
+#ifdef __NR_geteuid32
+#define __SNR_geteuid32			__NR_geteuid32
+#else
+#define __SNR_geteuid32			__PNR_geteuid32
+#endif
+
+#ifdef __NR_getgid
+#define __SNR_getgid			__NR_getgid
+#else
+#define __SNR_getgid			__PNR_getgid
+#endif
+
+#ifdef __NR_getgid32
+#define __SNR_getgid32			__NR_getgid32
+#else
+#define __SNR_getgid32			__PNR_getgid32
+#endif
+
+#ifdef __NR_getgroups
+#define __SNR_getgroups			__NR_getgroups
+#else
+#define __SNR_getgroups			__PNR_getgroups
+#endif
+
+#ifdef __NR_getgroups32
+#define __SNR_getgroups32		__NR_getgroups32
+#else
+#define __SNR_getgroups32		__PNR_getgroups32
+#endif
+
+#define __SNR_getitimer			__NR_getitimer
+
+#ifdef __NR_getpeername
+#define __SNR_getpeername		__NR_getpeername
+#else
+#define __SNR_getpeername		__PNR_getpeername
+#endif
+
+#define __SNR_getpgid			__NR_getpgid
+
+#ifdef __NR_getpgrp
+#define __SNR_getpgrp			__NR_getpgrp
+#else
+#define __SNR_getpgrp			__PNR_getpgrp
+#endif
+
+#define __SNR_getpid			__NR_getpid
+
+#ifdef __NR_getpmsg
+#define __SNR_getpmsg			__NR_getpmsg
+#else
+#define __SNR_getpmsg			__PNR_getpmsg
+#endif
+
+#define __SNR_getppid			__NR_getppid
+
+#define __SNR_getpriority		__NR_getpriority
+
+#ifdef __NR_getrandom
+#define __SNR_getrandom			__NR_getrandom
+#else
+#define __SNR_getrandom			__PNR_getrandom
+#endif
+
+#ifdef __NR_getresgid
+#define __SNR_getresgid			__NR_getresgid
+#else
+#define __SNR_getresgid			__PNR_getresgid
+#endif
+
+#ifdef __NR_getresgid32
+#define __SNR_getresgid32		__NR_getresgid32
+#else
+#define __SNR_getresgid32		__PNR_getresgid32
+#endif
+
+#ifdef __NR_getresuid
+#define __SNR_getresuid			__NR_getresuid
+#else
+#define __SNR_getresuid			__PNR_getresuid
+#endif
+
+#ifdef __NR_getresuid32
+#define __SNR_getresuid32		__NR_getresuid32
+#else
+#define __SNR_getresuid32		__PNR_getresuid32
+#endif
+
+#ifdef __NR_getrlimit
+#define __SNR_getrlimit			__NR_getrlimit
+#else
+#define __SNR_getrlimit			__PNR_getrlimit
+#endif
+
+#define __SNR_getrusage			__NR_getrusage
+
+#define __SNR_getsid			__NR_getsid
+
+#ifdef __NR_getsockname
+#define __SNR_getsockname		__NR_getsockname
+#else
+#define __SNR_getsockname		__PNR_getsockname
+#endif
+
+#ifdef __NR_getsockopt
+#define __SNR_getsockopt		__NR_getsockopt
+#else
+#define __SNR_getsockopt		__PNR_getsockopt
+#endif
+
+#define __SNR_gettid			__NR_gettid
+
+#define __SNR_gettimeofday		__NR_gettimeofday
+
+#ifdef __NR_getuid
+#define __SNR_getuid			__NR_getuid
+#else
+#define __SNR_getuid			__PNR_getuid
+#endif
+
+#ifdef __NR_getuid32
+#define __SNR_getuid32			__NR_getuid32
+#else
+#define __SNR_getuid32			__PNR_getuid32
+#endif