discussed with phil, do not split kernel patches between kernel-headers and kernel, can make issues

35 files changed, 9 insertions, 20241 deletions

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 36f562dc9..16f126da2 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -7,7 +7,15 @@ include $(TOPDIR)/mk/linux.mk
 include ${TOPDIR}/mk/kernel-vars.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
-$(WRKBUILD)/.headers:
+$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
+	$(TRACE) kernel-patch
+	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
+		../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
+	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \
+		../$(ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
+	touch $@
+
+$(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
 	${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check
 	${KERNEL_MAKE_ENV} $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \
 		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
diff --git a/toolchain/kernel-headers/patches/3.10.30/headers_install.patch b/toolchain/kernel-headers/patches/3.10.30/headers_install.patch
deleted file mode 100644
index d4c1a6925..000000000
--- a/toolchain/kernel-headers/patches/3.10.30/headers_install.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur linux-3.10.30.orig/scripts/headers_install.sh linux-3.10.30/scripts/headers_install.sh
---- linux-3.10.30.orig/scripts/headers_install.sh	2014-02-13 22:48:15.000000000 +0100
-+++ linux-3.10.30/scripts/headers_install.sh	2014-05-16 14:24:37.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- if [ $# -lt 1 ]
- then
--	echo "Usage: headers_install.sh OUTDIR [FILES...]
-+	echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
- 	echo
- 	echo "Prepares kernel header files for use by user space, by removing"
- 	echo "all compiler.h definitions and #includes, removing any"
-@@ -10,6 +10,7 @@
- 	echo "asm/inline/volatile keywords."
- 	echo
- 	echo "OUTDIR: directory to write each userspace header FILE to."
-+	echo "SRCDIR: source directory where files are picked."
- 	echo "FILES:  list of header files to operate on."
- 
- 	exit 1
-@@ -19,6 +20,8 @@
- 
- OUTDIR="$1"
- shift
-+SRCDIR="$1"
-+shift
- 
- # Iterate through files listed on command line
- 
-@@ -34,7 +37,7 @@
- 		-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
- 		-e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
- 		-e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
--		"$i" > "$OUTDIR/$FILE.sed" || exit 1
-+		"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
- 	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
- 		> "$OUTDIR/$FILE"
- 	[ $? -gt 1 ] && exit 1
-diff -Nur linux-3.10.30.orig/scripts/Makefile.headersinst linux-3.10.30/scripts/Makefile.headersinst
---- linux-3.10.30.orig/scripts/Makefile.headersinst	2014-02-13 22:48:15.000000000 +0100
-+++ linux-3.10.30/scripts/Makefile.headersinst	2014-05-16 14:23:34.000000000 +0200
-@@ -47,18 +47,24 @@
- all-files     := $(header-y) $(genhdr-y) $(wrapper-files)
- output-files  := $(addprefix $(installdir)/, $(all-files))
- 
--input-files   := $(foreach hdr, $(header-y), \
-+input-files1  := $(foreach hdr, $(header-y), \
- 		   $(if $(wildcard $(srcdir)/$(hdr)), \
--			$(wildcard $(srcdir)/$(hdr)), \
-+			$(wildcard $(srcdir)/$(hdr))) \
-+		   )
-+input-files1-name := $(notdir $(input-files1))
-+input-files2  := $(foreach hdr, $(header-y), \
-+		   $(if  $(wildcard $(srcdir)/$(hdr)),, \
- 			$(if $(wildcard $(oldsrcdir)/$(hdr)), \
- 				$(wildcard $(oldsrcdir)/$(hdr)), \
- 				$(error Missing UAPI file $(srcdir)/$(hdr))) \
--		   )) \
--		 $(foreach hdr, $(genhdr-y), \
-+		   ))
-+input-files2-name := $(notdir $(input-files2))
-+input-files3  := $(foreach hdr, $(genhdr-y), \
- 		   $(if	$(wildcard $(gendir)/$(hdr)), \
- 			$(wildcard $(gendir)/$(hdr)), \
- 			$(error Missing generated UAPI file $(gendir)/$(hdr)) \
- 		   ))
-+input-files3-name := $(notdir $(input-files3))
- 
- # Work out what needs to be removed
- oldheaders    := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
-@@ -72,7 +78,9 @@
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
-                             file$(if $(word 2, $(all-files)),s))
-       cmd_install = \
--        $(CONFIG_SHELL) $< $(installdir) $(input-files); \
-+        $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
-+        $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
-+        $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
-         for F in $(wrapper-files); do                                   \
-                 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
-         done;                                                           \
-@@ -98,7 +106,7 @@
- 	@:
- 
- targets += $(install-file)
--$(install-file): scripts/headers_install.sh $(input-files) FORCE
-+$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
- 	$(if $(unwanted),$(call cmd,remove),)
- 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- 	$(call if_changed,install)
diff --git a/toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch b/toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch
deleted file mode 100644
index d4e815cd2..000000000
--- a/toolchain/kernel-headers/patches/3.10.30/mkpiggy.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur linux-3.4.4.orig/arch/x86/boot/compressed/mkpiggy.c linux-3.4.4/arch/x86/boot/compressed/mkpiggy.c
---- linux-3.4.4.orig/arch/x86/boot/compressed/mkpiggy.c	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/arch/x86/boot/compressed/mkpiggy.c	2012-07-03 09:48:02.000000000 +0200
-@@ -29,7 +29,14 @@
- #include <stdio.h>
- #include <string.h>
- #include <inttypes.h>
--#include <tools/le_byteshift.h>
-+
-+static uint32_t getle32(const void *p)
-+{
-+	const uint8_t *cp = p;
-+
-+	return (uint32_t)cp[0] + ((uint32_t)cp[1] << 8) +
-+		((uint32_t)cp[2] << 16) + ((uint32_t)cp[3] << 24);
-+}
- 
- int main(int argc, char *argv[])
- {
-@@ -62,7 +69,7 @@
- 	}
- 
- 	ilen = ftell(f);
--	olen = get_unaligned_le32(&olen);
-+	olen = getle32(&olen);
- 	fclose(f);
- 
- 	/*
diff --git a/toolchain/kernel-headers/patches/3.10.30/relocs.patch b/toolchain/kernel-headers/patches/3.10.30/relocs.patch
deleted file mode 100644
index 649b9e73e..000000000
--- a/toolchain/kernel-headers/patches/3.10.30/relocs.patch
+++ /dev/null
@@ -1,2693 +0,0 @@
-diff -Nur linux-3.11.5.orig/arch/x86/tools/relocs.h linux-3.11.5/arch/x86/tools/relocs.h
---- linux-3.11.5.orig/arch/x86/tools/relocs.h	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/x86/tools/relocs.h	2013-10-20 17:41:16.000000000 +0200
-@@ -9,10 +9,14 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
-+#ifdef __linux__
- #include <elf.h>
- #include <byteswap.h>
- #define USE_BSD
- #include <endian.h>
-+#else
-+#include "elf.h"
-+#endif
- #include <regex.h>
- #include <tools/le_byteshift.h>
- 
-diff -Nur linux-3.11.5.orig/tools/include/elf.h linux-3.11.5/tools/include/elf.h
---- linux-3.11.5.orig/tools/include/elf.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.11.5/tools/include/elf.h	2013-10-20 17:42:10.000000000 +0200
-@@ -0,0 +1,2671 @@
-+#ifndef _ELF_H
-+#define _ELF_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <stdint.h>
-+
-+typedef uint16_t Elf32_Half;
-+typedef uint16_t Elf64_Half;
-+
-+typedef uint32_t Elf32_Word;
-+typedef	int32_t  Elf32_Sword;
-+typedef uint32_t Elf64_Word;
-+typedef	int32_t  Elf64_Sword;
-+
-+typedef uint64_t Elf32_Xword;
-+typedef	int64_t  Elf32_Sxword;
-+typedef uint64_t Elf64_Xword;
-+typedef	int64_t  Elf64_Sxword;
-+
-+typedef uint32_t Elf32_Addr;
-+typedef uint64_t Elf64_Addr;
-+
-+typedef uint32_t Elf32_Off;
-+typedef uint64_t Elf64_Off;
-+
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+
-+typedef Elf32_Half Elf32_Versym;
-+typedef Elf64_Half Elf64_Versym;
-+
-+#define EI_NIDENT (16)
-+
-+typedef struct {
-+  unsigned char	e_ident[EI_NIDENT];
-+  Elf32_Half	e_type;
-+  Elf32_Half	e_machine;
-+  Elf32_Word	e_version;
-+  Elf32_Addr	e_entry;
-+  Elf32_Off	e_phoff;
-+  Elf32_Off	e_shoff;
-+  Elf32_Word	e_flags;
-+  Elf32_Half	e_ehsize;
-+  Elf32_Half	e_phentsize;
-+  Elf32_Half	e_phnum;
-+  Elf32_Half	e_shentsize;
-+  Elf32_Half	e_shnum;
-+  Elf32_Half	e_shstrndx;
-+} Elf32_Ehdr;
-+
-+typedef struct {
-+  unsigned char	e_ident[EI_NIDENT];
-+  Elf64_Half	e_type;
-+  Elf64_Half	e_machine;
-+  Elf64_Word	e_version;
-+  Elf64_Addr	e_entry;
-+  Elf64_Off	e_phoff;
-+  Elf64_Off	e_shoff;
-+  Elf64_Word	e_flags;
-+  Elf64_Half	e_ehsize;
-+  Elf64_Half	e_phentsize;
-+  Elf64_Half	e_phnum;
-+  Elf64_Half	e_shentsize;
-+  Elf64_Half	e_shnum;
-+  Elf64_Half	e_shstrndx;
-+} Elf64_Ehdr;
-+
-+#define EI_MAG0		0
-+#define ELFMAG0		0x7f
-+
-+#define EI_MAG1		1
-+#define ELFMAG1		'E'
-+
-+#define EI_MAG2		2
-+#define ELFMAG2		'L'
-+
-+#define EI_MAG3		3
-+#define ELFMAG3		'F'
-+
-+
-+#define	ELFMAG		"\177ELF"
-+#define	SELFMAG		4
-+
-+#define EI_CLASS	4
-+#define ELFCLASSNONE	0
-+#define ELFCLASS32	1
-+#define ELFCLASS64	2
-+#define ELFCLASSNUM	3
-+
-+#define EI_DATA		5
-+#define ELFDATANONE	0
-+#define ELFDATA2LSB	1
-+#define ELFDATA2MSB	2
-+#define ELFDATANUM	3
-+
-+#define EI_VERSION	6
-+
-+
-+#define EI_OSABI	7
-+#define ELFOSABI_NONE		0
-+#define ELFOSABI_SYSV		0
-+#define ELFOSABI_HPUX		1
-+#define ELFOSABI_NETBSD		2
-+#define ELFOSABI_LINUX		3
-+#define ELFOSABI_GNU		3
-+#define ELFOSABI_SOLARIS	6
-+#define ELFOSABI_AIX		7
-+#define ELFOSABI_IRIX		8
-+#define ELFOSABI_FREEBSD	9
-+#define ELFOSABI_TRU64		10
-+#define ELFOSABI_MODESTO	11
-+#define ELFOSABI_OPENBSD	12
-+#define ELFOSABI_ARM		97
-+#define ELFOSABI_STANDALONE	255
-+
-+#define EI_ABIVERSION	8
-+
-+#define EI_PAD		9
-+
-+
-+
-+#define ET_NONE		0
-+#define ET_REL		1
-+#define ET_EXEC		2
-+#define ET_DYN		3
-+#define ET_CORE		4
-+#define	ET_NUM		5
-+#define ET_LOOS		0xfe00
-+#define ET_HIOS		0xfeff
-+#define ET_LOPROC	0xff00
-+#define ET_HIPROC	0xffff
-+
-+
-+
-+#define EM_NONE		 0
-+#define EM_M32		 1
-+#define EM_SPARC	 2
-+#define EM_386		 3
-+#define EM_68K		 4
-+#define EM_88K		 5
-+#define EM_860		 7
-+#define EM_MIPS		 8
-+#define EM_S370		 9
-+#define EM_MIPS_RS3_LE	10
-+
-+#define EM_PARISC	15
-+#define EM_VPP500	17
-+#define EM_SPARC32PLUS	18
-+#define EM_960		19
-+#define EM_PPC		20
-+#define EM_PPC64	21
-+#define EM_S390		22
-+
-+#define EM_V800		36
-+#define EM_FR20		37
-+#define EM_RH32		38
-+#define EM_RCE		39
-+#define EM_ARM		40
-+#define EM_FAKE_ALPHA	41
-+#define EM_SH		42
-+#define EM_SPARCV9	43
-+#define EM_TRICORE	44
-+#define EM_ARC		45
-+#define EM_H8_300	46
-+#define EM_H8_300H	47
-+#define EM_H8S		48
-+#define EM_H8_500	49
-+#define EM_IA_64	50
-+#define EM_MIPS_X	51
-+#define EM_COLDFIRE	52
-+#define EM_68HC12	53
-+#define EM_MMA		54
-+#define EM_PCP		55
-+#define EM_NCPU		56
-+#define EM_NDR1		57
-+#define EM_STARCORE	58
-+#define EM_ME16		59
-+#define EM_ST100	60
-+#define EM_TINYJ	61
-+#define EM_X86_64	62
-+#define EM_PDSP		63
-+
-+#define EM_FX66		66
-+#define EM_ST9PLUS	67
-+#define EM_ST7		68
-+#define EM_68HC16	69
-+#define EM_68HC11	70
-+#define EM_68HC08	71
-+#define EM_68HC05	72
-+#define EM_SVX		73
-+#define EM_ST19		74
-+#define EM_VAX		75
-+#define EM_CRIS		76
-+#define EM_JAVELIN	77
-+#define EM_FIREPATH	78
-+#define EM_ZSP		79
-+#define EM_MMIX		80
-+#define EM_HUANY	81
-+#define EM_PRISM	82
-+#define EM_AVR		83
-+#define EM_FR30		84
-+#define EM_D10V		85
-+#define EM_D30V		86
-+#define EM_V850		87
-+#define EM_M32R		88
-+#define EM_MN10300	89
-+#define EM_MN10200	90
-+#define EM_PJ		91
-+#define EM_OPENRISC	92
-+#define EM_ARC_A5	93
-+#define EM_XTENSA	94
-+#define EM_AARCH64	183
-+#define EM_TILEPRO	188
-+#define EM_MICROBLAZE	189
-+#define EM_TILEGX	191
-+#define EM_NUM		192
-+#define EM_ALPHA	0x9026
-+
-+#define EV_NONE		0
-+#define EV_CURRENT	1
-+#define EV_NUM		2
-+
-+typedef struct {
-+  Elf32_Word	sh_name;
-+  Elf32_Word	sh_type;
-+  Elf32_Word	sh_flags;
-+  Elf32_Addr	sh_addr;
-+  Elf32_Off	sh_offset;
-+  Elf32_Word	sh_size;
-+  Elf32_Word	sh_link;
-+  Elf32_Word	sh_info;
-+  Elf32_Word	sh_addralign;
-+  Elf32_Word	sh_entsize;
-+} Elf32_Shdr;
-+
-+typedef struct {
-+  Elf64_Word	sh_name;
-+  Elf64_Word	sh_type;
-+  Elf64_Xword	sh_flags;
-+  Elf64_Addr	sh_addr;
-+  Elf64_Off	sh_offset;
-+  Elf64_Xword	sh_size;
-+  Elf64_Word	sh_link;
-+  Elf64_Word	sh_info;
-+  Elf64_Xword	sh_addralign;
-+  Elf64_Xword	sh_entsize;
-+} Elf64_Shdr;
-+
-+
-+
-+#define SHN_UNDEF	0
-+#define SHN_LORESERVE	0xff00
-+#define SHN_LOPROC	0xff00
-+#define SHN_BEFORE	0xff00
-+
-+#define SHN_AFTER	0xff01
-+
-+#define SHN_HIPROC	0xff1f
-+#define SHN_LOOS	0xff20
-+#define SHN_HIOS	0xff3f
-+#define SHN_ABS		0xfff1
-+#define SHN_COMMON	0xfff2
-+#define SHN_XINDEX	0xffff
-+#define SHN_HIRESERVE	0xffff
-+
-+
-+
-+#define SHT_NULL	  0
-+#define SHT_PROGBITS	  1
-+#define SHT_SYMTAB	  2
-+#define SHT_STRTAB	  3
-+#define SHT_RELA	  4
-+#define SHT_HASH	  5
-+#define SHT_DYNAMIC	  6
-+#define SHT_NOTE	  7
-+#define SHT_NOBITS	  8
-+#define SHT_REL		  9
-+#define SHT_SHLIB	  10
-+#define SHT_DYNSYM	  11
-+#define SHT_INIT_ARRAY	  14
-+#define SHT_FINI_ARRAY	  15
-+#define SHT_PREINIT_ARRAY 16
-+#define SHT_GROUP	  17
-+#define SHT_SYMTAB_SHNDX  18
-+#define	SHT_NUM		  19
-+#define SHT_LOOS	  0x60000000
-+#define SHT_GNU_ATTRIBUTES 0x6ffffff5
-+#define SHT_GNU_HASH	  0x6ffffff6
-+#define SHT_GNU_LIBLIST	  0x6ffffff7
-+#define SHT_CHECKSUM	  0x6ffffff8
-+#define SHT_LOSUNW	  0x6ffffffa
-+#define SHT_SUNW_move	  0x6ffffffa
-+#define SHT_SUNW_COMDAT   0x6ffffffb
-+#define SHT_SUNW_syminfo  0x6ffffffc
-+#define SHT_GNU_verdef	  0x6ffffffd
-+#define SHT_GNU_verneed	  0x6ffffffe
-+#define SHT_GNU_versym	  0x6fffffff
-+#define SHT_HISUNW	  0x6fffffff
-+#define SHT_HIOS	  0x6fffffff
-+#define SHT_LOPROC	  0x70000000
-+#define SHT_HIPROC	  0x7fffffff
-+#define SHT_LOUSER	  0x80000000
-+#define SHT_HIUSER	  0x8fffffff
-+
-+#define SHF_WRITE	     (1 << 0)
-+#define SHF_ALLOC	     (1 << 1)
-+#define SHF_EXECINSTR	     (1 << 2)
-+#define SHF_MERGE	     (1 << 4)
-+#define SHF_STRINGS	     (1 << 5)
-+#define SHF_INFO_LINK	     (1 << 6)
-+#define SHF_LINK_ORDER	     (1 << 7)
-+#define SHF_OS_NONCONFORMING (1 << 8)
-+
-+#define SHF_GROUP	     (1 << 9)
-+#define SHF_TLS		     (1 << 10)
-+#define SHF_MASKOS	     0x0ff00000
-+#define SHF_MASKPROC	     0xf0000000
-+#define SHF_ORDERED	     (1 << 30)
-+#define SHF_EXCLUDE	     (1 << 31)
-+
-+#define GRP_COMDAT	0x1
-+
-+typedef struct {
-+  Elf32_Word	st_name;
-+  Elf32_Addr	st_value;
-+  Elf32_Word	st_size;
-+  unsigned char	st_info;
-+  unsigned char	st_other;
-+  Elf32_Section	st_shndx;
-+} Elf32_Sym;
-+
-+typedef struct {
-+  Elf64_Word	st_name;
-+  unsigned char	st_info;
-+  unsigned char st_other;
-+  Elf64_Section	st_shndx;
-+  Elf64_Addr	st_value;
-+  Elf64_Xword	st_size;
-+} Elf64_Sym;
-+
-+typedef struct {
-+  Elf32_Half si_boundto;
-+  Elf32_Half si_flags;
-+} Elf32_Syminfo;
-+
-+typedef struct {
-+  Elf64_Half si_boundto;
-+  Elf64_Half si_flags;
-+} Elf64_Syminfo;
-+
-+#define SYMINFO_BT_SELF		0xffff
-+#define SYMINFO_BT_PARENT	0xfffe
-+#define SYMINFO_BT_LOWRESERVE	0xff00
-+
-+#define SYMINFO_FLG_DIRECT	0x0001
-+#define SYMINFO_FLG_PASSTHRU	0x0002
-+#define SYMINFO_FLG_COPY	0x0004
-+#define SYMINFO_FLG_LAZYLOAD	0x0008
-+
-+#define SYMINFO_NONE		0
-+#define SYMINFO_CURRENT		1
-+#define SYMINFO_NUM		2
-+
-+#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
-+#define ELF32_ST_TYPE(val)		((val) & 0xf)
-+#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-+
-+#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
-+#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
-+#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
-+
-+#define STB_LOCAL	0
-+#define STB_GLOBAL	1
-+#define STB_WEAK	2
-+#define	STB_NUM		3
-+#define STB_LOOS	10
-+#define STB_GNU_UNIQUE	10
-+#define STB_HIOS	12
-+#define STB_LOPROC	13
-+#define STB_HIPROC	15
-+
-+#define STT_NOTYPE	0
-+#define STT_OBJECT	1
-+#define STT_FUNC	2
-+#define STT_SECTION	3
-+#define STT_FILE	4
-+#define STT_COMMON	5
-+#define STT_TLS		6
-+#define	STT_NUM		7
-+#define STT_LOOS	10
-+#define STT_GNU_IFUNC	10
-+#define STT_HIOS	12
-+#define STT_LOPROC	13
-+#define STT_HIPROC	15
-+
-+#define STN_UNDEF	0
-+
-+#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
-+#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
-+
-+#define STV_DEFAULT	0
-+#define STV_INTERNAL	1
-+#define STV_HIDDEN	2
-+#define STV_PROTECTED	3
-+
-+
-+
-+
-+typedef struct
-+{
-+  Elf32_Addr	r_offset;
-+  Elf32_Word	r_info;
-+} Elf32_Rel;
-+
-+typedef struct {
-+  Elf64_Addr	r_offset;
-+  Elf64_Xword	r_info;
-+} Elf64_Rel;
-+
-+
-+
-+typedef struct {
-+  Elf32_Addr	r_offset;
-+  Elf32_Word	r_info;
-+  Elf32_Sword	r_addend;
-+} Elf32_Rela;
-+
-+typedef struct {
-+  Elf64_Addr	r_offset;
-+  Elf64_Xword	r_info;
-+  Elf64_Sxword	r_addend;
-+} Elf64_Rela;
-+
-+
-+
-+#define ELF32_R_SYM(val)		((val) >> 8)
-+#define ELF32_R_TYPE(val)		((val) & 0xff)
-+#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
-+
-+#define ELF64_R_SYM(i)			((i) >> 32)
-+#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-+#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
-+
-+
-+
-+typedef struct {
-+  Elf32_Word	p_type;
-+  Elf32_Off	p_offset;
-+  Elf32_Addr	p_vaddr;
-+  Elf32_Addr	p_paddr;
-+  Elf32_Word	p_filesz;
-+  Elf32_Word	p_memsz;
-+  Elf32_Word	p_flags;
-+  Elf32_Word	p_align;
-+} Elf32_Phdr;
-+
-+typedef struct {
-+  Elf64_Word	p_type;
-+  Elf64_Word	p_flags;
-+  Elf64_Off	p_offset;
-+  Elf64_Addr	p_vaddr;
-+  Elf64_Addr	p_paddr;
-+  Elf64_Xword	p_filesz;
-+  Elf64_Xword	p_memsz;
-+  Elf64_Xword	p_align;
-+} Elf64_Phdr;
-+
-+
-+
-+#define	PT_NULL		0
-+#define PT_LOAD		1
-+#define PT_DYNAMIC	2
-+#define PT_INTERP	3
-+#define PT_NOTE		4
-+#define PT_SHLIB	5
-+#define PT_PHDR		6
-+#define PT_TLS		7
-+#define	PT_NUM		8
-+#define PT_LOOS		0x60000000
-+#define PT_GNU_EH_FRAME	0x6474e550
-+#define PT_GNU_STACK	0x6474e551
-+#define PT_GNU_RELRO	0x6474e552
-+#define PT_LOSUNW	0x6ffffffa
-+#define PT_SUNWBSS	0x6ffffffa
-+#define PT_SUNWSTACK	0x6ffffffb
-+#define PT_HISUNW	0x6fffffff
-+#define PT_HIOS		0x6fffffff
-+#define PT_LOPROC	0x70000000
-+#define PT_HIPROC	0x7fffffff
-+
-+
-+#define PN_XNUM 0xffff
-+
-+
-+#define PF_X		(1 << 0)
-+#define PF_W		(1 << 1)
-+#define PF_R		(1 << 2)
-+#define PF_MASKOS	0x0ff00000
-+#define PF_MASKPROC	0xf0000000
-+
-+
-+
-+#define NT_PRSTATUS	1
-+#define NT_FPREGSET	2
-+#define NT_PRPSINFO	3
-+#define NT_PRXREG	4
-+#define NT_TASKSTRUCT	4
-+#define NT_PLATFORM	5
-+#define NT_AUXV		6
-+#define NT_GWINDOWS	7
-+#define NT_ASRS		8
-+#define NT_PSTATUS	10
-+#define NT_PSINFO	13
-+#define NT_PRCRED	14
-+#define NT_UTSNAME	15
-+#define NT_LWPSTATUS	16
-+#define NT_LWPSINFO	17
-+#define NT_PRFPXREG	20
-+#define NT_SIGINFO	0x53494749
-+#define NT_FILE		0x46494c45
-+#define NT_PRXFPREG	0x46e62b7f
-+#define NT_PPC_VMX	0x100
-+#define NT_PPC_SPE	0x101
-+#define NT_PPC_VSX	0x102
-+#define NT_386_TLS	0x200
-+#define NT_386_IOPERM	0x201
-+#define NT_X86_XSTATE	0x202
-+#define NT_S390_HIGH_GPRS	0x300
-+#define NT_S390_TIMER	0x301
-+#define NT_S390_TODCMP	0x302
-+#define NT_S390_TODPREG	0x303
-+#define NT_S390_CTRS	0x304
-+#define NT_S390_PREFIX	0x305
-+#define NT_S390_LAST_BREAK	0x306
-+#define NT_S390_SYSTEM_CALL	0x307
-+#define NT_S390_TDB	0x308
-+#define NT_ARM_VFP	0x400
-+#define NT_ARM_TLS	0x401
-+#define NT_ARM_HW_BREAK	0x402
-+#define NT_ARM_HW_WATCH	0x403
-+#define NT_METAG_CBUF	0x500
-+#define NT_METAG_RPIPE	0x501
-+#define NT_METAG_TLS	0x502
-+#define NT_VERSION	1
-+
-+
-+
-+
-+typedef struct {
-+  Elf32_Sword d_tag;
-+  union {
-+      Elf32_Word d_val;
-+      Elf32_Addr d_ptr;
-+  } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct {
-+  Elf64_Sxword d_tag;
-+  union {
-+      Elf64_Xword d_val;
-+      Elf64_Addr d_ptr;
-+  } d_un;
-+} Elf64_Dyn;
-+
-+
-+
-+#define DT_NULL		0
-+#define DT_NEEDED	1
-+#define DT_PLTRELSZ	2
-+#define DT_PLTGOT	3
-+#define DT_HASH		4
-+#define DT_STRTAB	5
-+#define DT_SYMTAB	6
-+#define DT_RELA		7
-+#define DT_RELASZ	8
-+#define DT_RELAENT	9
-+#define DT_STRSZ	10
-+#define DT_SYMENT	11
-+#define DT_INIT		12
-+#define DT_FINI		13
-+#define DT_SONAME	14
-+#define DT_RPATH	15
-+#define DT_SYMBOLIC	16
-+#define DT_REL		17
-+#define DT_RELSZ	18
-+#define DT_RELENT	19
-+#define DT_PLTREL	20
-+#define DT_DEBUG	21
-+#define DT_TEXTREL	22
-+#define DT_JMPREL	23
-+#define	DT_BIND_NOW	24
-+#define	DT_INIT_ARRAY	25
-+#define	DT_FINI_ARRAY	26
-+#define	DT_INIT_ARRAYSZ	27
-+#define	DT_FINI_ARRAYSZ	28
-+#define DT_RUNPATH	29
-+#define DT_FLAGS	30
-+#define DT_ENCODING	32
-+#define DT_PREINIT_ARRAY 32
-+#define DT_PREINIT_ARRAYSZ 33
-+#define	DT_NUM		34
-+#define DT_LOOS		0x6000000d
-+#define DT_HIOS		0x6ffff000
-+#define DT_LOPROC	0x70000000
-+#define DT_HIPROC	0x7fffffff
-+#define	DT_PROCNUM	DT_MIPS_NUM
-+
-+#define DT_VALRNGLO	0x6ffffd00
-+#define DT_GNU_PRELINKED 0x6ffffdf5
-+#define DT_GNU_CONFLICTSZ 0x6ffffdf6
-+#define DT_GNU_LIBLISTSZ 0x6ffffdf7
-+#define DT_CHECKSUM	0x6ffffdf8
-+#define DT_PLTPADSZ	0x6ffffdf9
-+#define DT_MOVEENT	0x6ffffdfa
-+#define DT_MOVESZ	0x6ffffdfb
-+#define DT_FEATURE_1	0x6ffffdfc
-+#define DT_POSFLAG_1	0x6ffffdfd
-+
-+#define DT_SYMINSZ	0x6ffffdfe
-+#define DT_SYMINENT	0x6ffffdff
-+#define DT_VALRNGHI	0x6ffffdff
-+#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))
-+#define DT_VALNUM 12
-+
-+#define DT_ADDRRNGLO	0x6ffffe00
-+#define DT_GNU_HASH	0x6ffffef5
-+#define DT_TLSDESC_PLT	0x6ffffef6
-+#define DT_TLSDESC_GOT	0x6ffffef7
-+#define DT_GNU_CONFLICT	0x6ffffef8
-+#define DT_GNU_LIBLIST	0x6ffffef9
-+#define DT_CONFIG	0x6ffffefa
-+#define DT_DEPAUDIT	0x6ffffefb
-+#define DT_AUDIT	0x6ffffefc
-+#define	DT_PLTPAD	0x6ffffefd
-+#define	DT_MOVETAB	0x6ffffefe
-+#define DT_SYMINFO	0x6ffffeff
-+#define DT_ADDRRNGHI	0x6ffffeff
-+#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))
-+#define DT_ADDRNUM 11
-+
-+
-+
-+#define DT_VERSYM	0x6ffffff0
-+
-+#define DT_RELACOUNT	0x6ffffff9
-+#define DT_RELCOUNT	0x6ffffffa
-+
-+
-+#define DT_FLAGS_1	0x6ffffffb
-+#define	DT_VERDEF	0x6ffffffc
-+
-+#define	DT_VERDEFNUM	0x6ffffffd
-+#define	DT_VERNEED	0x6ffffffe
-+
-+#define	DT_VERNEEDNUM	0x6fffffff
-+#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))
-+#define DT_VERSIONTAGNUM 16
-+
-+
-+
-+#define DT_AUXILIARY    0x7ffffffd
-+#define DT_FILTER       0x7fffffff
-+#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-+#define DT_EXTRANUM	3
-+
-+
-+#define DF_ORIGIN	0x00000001
-+#define DF_SYMBOLIC	0x00000002
-+#define DF_TEXTREL	0x00000004
-+#define DF_BIND_NOW	0x00000008
-+#define DF_STATIC_TLS	0x00000010
-+
-+
-+
-+#define DF_1_NOW	0x00000001
-+#define DF_1_GLOBAL	0x00000002
-+#define DF_1_GROUP	0x00000004
-+#define DF_1_NODELETE	0x00000008
-+#define DF_1_LOADFLTR	0x00000010
-+#define DF_1_INITFIRST	0x00000020
-+#define DF_1_NOOPEN	0x00000040
-+#define DF_1_ORIGIN	0x00000080
-+#define DF_1_DIRECT	0x00000100