From 3644457f9cfe21c2901f8ba5cf1c74f2b69eb959 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Nov 2011 13:30:46 +0100 Subject: fix compile --- package/collectd/Makefile | 12 ++--- package/collectd/patches/patch-configure | 56 ---------------------- package/collectd/patches/patch-ltmain_sh | 11 ----- package/collectd/patches/patch-src_Makefile_in | 13 +++++ .../patch-src_libcollectdclient_Makefile_in | 12 ----- 5 files changed, 19 insertions(+), 85 deletions(-) delete mode 100644 package/collectd/patches/patch-configure delete mode 100644 package/collectd/patches/patch-ltmain_sh create mode 100644 package/collectd/patches/patch-src_Makefile_in delete mode 100644 package/collectd/patches/patch-src_libcollectdclient_Makefile_in diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 33b5b4519..942e88942 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 4.10.0 +PKG_VERSION:= 5.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436 +PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c PKG_DESCR:= System statistics collection daemon PKG_SECTION:= misc PKG_DEPENDS:= libpthread @@ -101,14 +101,14 @@ CONFIGURE_ARGS+= --disable-apache \ --with-nan-emulation TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -XAKE_FLAGS+= LIBS='-lm' +XAKE_FLAGS+= LIBS='-lm -lltdl' post-install: ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \ - ${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/ + ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc + ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin ${CP} ${WRKINST}/usr/lib/collectd/*.so \ - ${IDIR_COLLECTD}/usr/lib/collectd/ + ${IDIR_COLLECTD}/usr/lib/collectd ${INSTALL_DATA} ./files/collectd.conf \ ${IDIR_COLLECTD}/etc diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure deleted file mode 100644 index 24d0c04b5..000000000 --- a/package/collectd/patches/patch-configure +++ /dev/null @@ -1,56 +0,0 @@ ---- collectd-4.10.0.orig/configure 2010-05-01 11:16:01.000000000 +0200 -+++ collectd-4.10.0/configure 2010-06-14 15:51:32.263465769 +0200 -@@ -16636,53 +16636,6 @@ $as_echo "#define HAVE_GEN_GETMNTENT 1" - - fi - --# Check for htonll --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if have htonll defined" >&5 --$as_echo_n "checking if have htonll defined... " >&6; } -- -- have_htonll="no" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --#include --#include --#if HAVE_INTTYPES_H --# include --#endif -- --int --main () --{ -- -- return htonll(0); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- have_htonll="yes" -- --$as_echo "#define HAVE_HTONLL 1" >>confdefs.h -- -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_htonll" >&5 --$as_echo "$have_htonll" >&6; } - - # Check for structures - ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_ibytes" "ac_cv_member_struct_if_data_ifi_ibytes" " diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh deleted file mode 100644 index d53645853..000000000 --- a/package/collectd/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- collectd-4.10.0.orig/ltmain.sh 2010-05-01 11:15:57.000000000 +0200 -+++ collectd-4.10.0/ltmain.sh 2011-01-14 20:29:06.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in new file mode 100644 index 000000000..d1580516a --- /dev/null +++ b/package/collectd/patches/patch-src_Makefile_in @@ -0,0 +1,13 @@ +--- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200 ++++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200 +@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) + # too. -octo + @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) + @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la +-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la ++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la ++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la + @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig + @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket + @BUILD_AIX_TRUE@am__append_19 = -lm diff --git a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in deleted file mode 100644 index a51a010ea..000000000 --- a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- collectd-4.10.0.orig/src/libcollectdclient/Makefile.in 2010-05-01 11:16:00.000000000 +0200 -+++ collectd-4.10.0/src/libcollectdclient/Makefile.in 2010-06-14 15:49:28.563473998 +0200 -@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign no-dependencies --@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror -+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall - pkginclude_HEADERS = client.h lcc_features.h - lib_LTLIBRARIES = libcollectdclient.la - nodist_pkgconfig_DATA = libcollectdclient.pc -- cgit v1.2.3 From a1ed67f04bb4b61af7383f2301b7dab6cb92e1b8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Nov 2011 13:31:35 +0100 Subject: FreeBSD fixes --- mk/build.mk | 2 +- package/drbd/patches/patch-Makefile_in | 10 ++++++---- package/drbd/patches/patch-drbd_Makefile | 12 ++++++++++-- package/ffmpeg/Makefile | 1 + package/forked-daapd/Makefile | 2 ++ package/libXt/Makefile | 1 + package/libXt/patches/patch-util_Makefile_in | 4 ++-- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index 886ecaf09..5b32abe6c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -271,7 +271,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU +export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU SHELL endif all: menuconfig diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in index 71ece3f6f..ad87d221d 100644 --- a/package/drbd/patches/patch-Makefile_in +++ b/package/drbd/patches/patch-Makefile_in @@ -1,9 +1,11 @@ --- drbd-8.3.10.orig/Makefile.in 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/Makefile.in 2011-05-23 17:11:50.000000000 +0200 -@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build - # and not in e.g. dash. I'm too lazy to fix it to be compatible. - SHELL=/bin/bash ++++ drbd-8.3.10/Makefile.in 2011-10-23 10:20:12.000000000 +0200 +@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +-SHELL=/bin/bash +- -SUBDIRS = user scripts documentation drbd +SUBDIRS = user scripts drbd diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile index dffd1e258..62f61cab4 100644 --- a/package/drbd/patches/patch-drbd_Makefile +++ b/package/drbd/patches/patch-drbd_Makefile @@ -1,6 +1,14 @@ --- drbd-8.3.10.orig/drbd/Makefile 2011-01-26 14:57:59.000000000 +0100 -+++ drbd-8.3.10/drbd/Makefile 2011-05-23 17:11:50.000000000 +0200 -@@ -133,7 +133,7 @@ else ++++ drbd-8.3.10/drbd/Makefile 2011-10-23 10:22:50.000000000 +0200 +@@ -65,7 +65,6 @@ else + + # for some reason some of the commands below only work correctly in bash, + # and not in e.g. dash. I'm too lazy to fix it to be compatible. +- SHELL=/bin/bash + + DRBDSRC := $(shell pwd) + +@@ -133,7 +132,7 @@ else grep return $@ ; \ fi ; \ echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index aabe94394..0bf164017 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -112,6 +112,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --host-cc=$(CC_FOR_BUILD) \ --disable-doc \ --disable-debug \ + --disable-yasm \ --disable-optimizations \ --disable-stripping \ --enable-shared \ diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index 824d05636..49583bb11 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -18,6 +18,8 @@ PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/ PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER PKG_ARCH_DEPENDS:= !ppc +# gperf problem +PKG_HOST_DEPENDS:= !freebsd include $(TOPDIR)/mk/package.mk diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 87e593339..84d467951 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV})) +CFLAGS_FOR_BUILD+= -I/usr/local/include TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in index 8b2d3079c..856fa8e79 100644 --- a/package/libXt/patches/patch-util_Makefile_in +++ b/package/libXt/patches/patch-util_Makefile_in @@ -1,5 +1,5 @@ --- libXt-1.0.9.orig/util/Makefile.in 2010-10-28 21:04:12.000000000 +0200 -+++ libXt-1.0.9/util/Makefile.in 2011-01-24 17:53:22.000000000 +0100 ++++ libXt-1.0.9/util/Makefile.in 2011-11-05 16:05:13.000000000 +0100 @@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CHANGELOG_CMD = @CHANGELOG_CMD@ @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) -makestrs_CFLAGS = $(XT_CFLAGS) -+makestrs_CFLAGS = ++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD) makestrs_SOURCES = makestrs.c # Man page -- cgit v1.2.3 From 23bc64ab05f3f152903c127d0bd24de681dc2044 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Nov 2011 13:32:18 +0100 Subject: disable some stuff for bulk builds --- Config.in | 8 ++++---- jtools/ant/Makefile | 2 +- jtools/files.needed | 1 - jtools/gcj/Makefile | 4 +++- jtools/jamvm/Makefile | 7 +------ jtools/jikes/Makefile | 2 +- jtools/openjdk/Makefile | 4 +++- mk/build.mk | 3 +++ mk/kernel-ver.mk | 12 ++++++------ package/orbit2/Makefile | 2 +- scripts/scan-pkgs.sh | 11 +++++++++++ 11 files changed, 34 insertions(+), 22 deletions(-) diff --git a/Config.in b/Config.in index 9fb096866..1e3911bc2 100644 --- a/Config.in +++ b/Config.in @@ -76,12 +76,12 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_2_6_39 - prompt "2.6.39" +config ADK_KERNEL_VERSION_2_6_39_4 + prompt "2.6.39.4" boolean -config ADK_KERNEL_VERSION_3_0_4 - prompt "3.0.4" +config ADK_KERNEL_VERSION_3_0_8 + prompt "3.0.8" boolean endchoice diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 537668a21..06a7f750c 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ant PKG_VERSION:= 1.8.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_MD5SUM:= 0d9e108afcd15b820150b8085c96d2b1 PKG_SITES:= http://www.apache.org/dist/ant/source/ DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 diff --git a/jtools/files.needed b/jtools/files.needed index 055a359fc..c6a1de4ba 100644 --- a/jtools/files.needed +++ b/jtools/files.needed @@ -9,4 +9,3 @@ XTest.h;libXtst freetype.h;freetype asoundlib.h;libasound ffi.h;libffi -Xproto.h;libXp diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index 45302e723..429574c7c 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -13,7 +13,7 @@ DISTFILES:= gcc-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} include ../rules.mk -GCJ_ENV+= JAR=no +GCJ_ENV+= "JAR=no LDFLAGS=-liconv" install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj @@ -29,6 +29,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --with-mpc=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ --with-gmp=$(STAGING_HOST_DIR) \ + --disable-nls \ + --without-libiconv-prefix \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index a85b2d6c8..1775ff5aa 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -6,14 +6,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 PKG_RELEASE:= 2 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} -ifeq (Darwin,${OStype}) -CC_FOR_BUILD:=${CC_FOR_BUILD} -m32 -CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32 -endif - include ../rules.mk install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile index c26a0f45b..1d619c8eb 100644 --- a/jtools/jikes/Makefile +++ b/jtools/jikes/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jikes PKG_VERSION:= 1.22 PKG_RELEASE:= 1 -PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 +PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index 12426a8d2..600db055b 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -59,7 +59,9 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz mkdir -p ${WRKBUILD}/drops cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch touch $@ $(WRKDIST)/.configured: ${WRKDIST}/.extract diff --git a/mk/build.mk b/mk/build.mk index 886ecaf09..b7d4d08d5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,6 +18,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_USE_CCACHE=n \ ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ + ADK_PACKAGE_PACEMAKER_MGMTD=n \ + ADK_PACKAGE_OPENJDK=n \ + ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 6a6202fbc..5b6a3d06f 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,10 +1,10 @@ -ifeq ($(ADK_KERNEL_VERSION_2_6_39),y) -KERNEL_VERSION:= 2.6.39 +ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y) +KERNEL_VERSION:= 2.6.39.4 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 1aab7a741abe08d42e8eccf20de61e05 +KERNEL_MD5SUM:= a17c748c2070168f1e784e9605ca043d endif -ifeq ($(ADK_KERNEL_VERSION_3_0_4),y) -KERNEL_VERSION:= 3.0.4 +ifeq ($(ADK_KERNEL_VERSION_3_0_8),y) +KERNEL_VERSION:= 3.0.8 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= dff86c657cabe813bda84c72bfb93ae8 +KERNEL_MD5SUM:= eac4d398a0ecd98214487cd47a228998 endif diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index c30fa35ed..a7a682b89 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -26,7 +26,7 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP $(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV})) CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags) -CFLAGS_FOR_BUILD+= -I/usr/local/include +CFLAGS_FOR_BUILD+= -I/usr/local/include -I/usr/include LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs) LDFLAGS_FOR_BUILD+= -lgmodule-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 67703df58..2eeed09dd 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -149,6 +149,10 @@ if [[ -n $ADK_PACKAGE_GLIB ]]; then NEED_GETTEXT="$NEED_GETTEXT glib" fi +if [[ -n $ADK_PACKAGE_CONSOLEKIT ]]; then + NEED_DBUSGLIB="$NEED_DBUSGLIB consolekit" +fi + if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" fi @@ -393,6 +397,13 @@ if [[ -n $NEED_XSLTPROC ]]; then fi fi +if [[ -n $NEED_DBUSGLIB ]]; then + if ! which dbus-binding-tool >/dev/null 2>&1; then + echo >&2 You need dbus-binding-tool to build $NEED_DBUSGLIB + out=1 + fi +fi + if [[ -n $NEED_PYTHON ]]; then if ! which python >/dev/null 2>&1; then if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then -- cgit v1.2.3 From 2098d39c909e82422592ca8f9d971f3305fceae8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 10 Nov 2011 14:16:12 +0100 Subject: update to latest upstream, fixes cross-compile problem --- package/samba/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba/Makefile b/package/samba/Makefile index b3658cdbc..91813ac29 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.6.0 +PKG_VERSION:= 3.6.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= e297e0ea7923c7de8d7c1d8fd0ec0a05 +PKG_MD5SUM:= 5291717be0734e07dc07b6110e162e87 PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext -- cgit v1.2.3 From da5c3b1c8535d8f8455b5283ddaf5c38b45d477e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 10 Nov 2011 19:02:53 +0100 Subject: update to latest stable kernels --- target/linux/patches/2.6.39.4/arm-statcmd.patch | 12 + .../linux/patches/2.6.39.4/bsd-compatibility.patch | 2512 + target/linux/patches/2.6.39.4/cris-etrax.patch | 12 + .../linux/patches/2.6.39.4/cris-thread-macro.patch | 12 + target/linux/patches/2.6.39.4/cris.patch | 5739 ++ target/linux/patches/2.6.39.4/defaults.patch | 26 + target/linux/patches/2.6.39.4/fon2100.patch | 6279 ++ target/linux/patches/2.6.39.4/gemalto.patch | 11 + target/linux/patches/2.6.39.4/mips-malta.patch | 135 + target/linux/patches/2.6.39.4/mmc-host.patch | 36 + target/linux/patches/2.6.39.4/non-static.patch | 33 + target/linux/patches/2.6.39.4/ocf-20100325.patch | 90176 +++++++++++++++++ target/linux/patches/2.6.39.4/rb4xx.patch | 25253 +++++ target/linux/patches/2.6.39.4/sparc-include.patch | 11 + target/linux/patches/2.6.39.4/startup.patch | 20 + .../linux/patches/2.6.39.4/usb-defaults-off.patch | 32 + target/linux/patches/2.6.39.4/uuid.patch | 255 + .../patches/2.6.39.4/vga-cons-default-off.patch | 12 + target/linux/patches/2.6.39.4/wlan-cf.patch | 11 + target/linux/patches/2.6.39.4/x86-build.patch | 11 + target/linux/patches/2.6.39.4/zlib-inflate.patch | 12 + target/linux/patches/3.0.8/bsd-compatibility.patch | 2512 + target/linux/patches/3.0.8/cris-etrax.patch | 12 + target/linux/patches/3.0.8/defaults.patch | 22 + target/linux/patches/3.0.8/fon2100.patch | 6279 ++ target/linux/patches/3.0.8/gemalto.patch | 11 + target/linux/patches/3.0.8/mips-malta.patch | 135 + target/linux/patches/3.0.8/mmc-host.patch | 36 + target/linux/patches/3.0.8/non-static.patch | 33 + target/linux/patches/3.0.8/ocf-20110720.patch | 99170 +++++++++++++++++++ target/linux/patches/3.0.8/sparc-include.patch | 11 + target/linux/patches/3.0.8/startup.patch | 20 + target/linux/patches/3.0.8/usb-defaults-off.patch | 32 + target/linux/patches/3.0.8/uuid.patch | 255 + .../linux/patches/3.0.8/vga-cons-default-off.patch | 12 + target/linux/patches/3.0.8/wlan-cf.patch | 11 + target/linux/patches/3.0.8/x86-build.patch | 11 + target/linux/patches/3.0.8/zlib-inflate.patch | 12 + .../kernel-headers/patches/2.6.39.4/aufs2.patch | 240 + .../patches/2.6.39.4/cleankernel.patch | 11 + .../patches/2.6.39.4/etrax-header.patch | 75 + .../patches/2.6.39.4/linux-gcc-check.patch | 18 + .../patches/2.6.39.4/microperl.patch | 24 + toolchain/kernel-headers/patches/3.0.8/aufs2.patch | 240 + .../kernel-headers/patches/3.0.8/cleankernel.patch | 11 + .../patches/3.0.8/etrax-header.patch | 75 + .../patches/3.0.8/linux-gcc-check.patch | 18 + .../kernel-headers/patches/3.0.8/microperl.patch | 24 + 48 files changed, 239910 insertions(+) create mode 100644 target/linux/patches/2.6.39.4/arm-statcmd.patch create mode 100644 target/linux/patches/2.6.39.4/bsd-compatibility.patch create mode 100644 target/linux/patches/2.6.39.4/cris-etrax.patch create mode 100644 target/linux/patches/2.6.39.4/cris-thread-macro.patch create mode 100644 target/linux/patches/2.6.39.4/cris.patch create mode 100644 target/linux/patches/2.6.39.4/defaults.patch create mode 100644 target/linux/patches/2.6.39.4/fon2100.patch create mode 100644 target/linux/patches/2.6.39.4/gemalto.patch create mode 100644 target/linux/patches/2.6.39.4/mips-malta.patch create mode 100644 target/linux/patches/2.6.39.4/mmc-host.patch create mode 100644 target/linux/patches/2.6.39.4/non-static.patch create mode 100644 target/linux/patches/2.6.39.4/ocf-20100325.patch create mode 100644 target/linux/patches/2.6.39.4/rb4xx.patch create mode 100644 target/linux/patches/2.6.39.4/sparc-include.patch create mode 100644 target/linux/patches/2.6.39.4/startup.patch create mode 100644 target/linux/patches/2.6.39.4/usb-defaults-off.patch create mode 100644 target/linux/patches/2.6.39.4/uuid.patch create mode 100644 target/linux/patches/2.6.39.4/vga-cons-default-off.patch create mode 100644 target/linux/patches/2.6.39.4/wlan-cf.patch create mode 100644 target/linux/patches/2.6.39.4/x86-build.patch create mode 100644 target/linux/patches/2.6.39.4/zlib-inflate.patch create mode 100644 target/linux/patches/3.0.8/bsd-compatibility.patch create mode 100644 target/linux/patches/3.0.8/cris-etrax.patch create mode 100644 target/linux/patches/3.0.8/defaults.patch create mode 100644 target/linux/patches/3.0.8/fon2100.patch create mode 100644 target/linux/patches/3.0.8/gemalto.patch create mode 100644 target/linux/patches/3.0.8/mips-malta.patch create mode 100644 target/linux/patches/3.0.8/mmc-host.patch create mode 100644 target/linux/patches/3.0.8/non-static.patch create mode 100644 target/linux/patches/3.0.8/ocf-20110720.patch create mode 100644 target/linux/patches/3.0.8/sparc-include.patch create mode 100644 target/linux/patches/3.0.8/startup.patch create mode 100644 target/linux/patches/3.0.8/usb-defaults-off.patch create mode 100644 target/linux/patches/3.0.8/uuid.patch create mode 100644 target/linux/patches/3.0.8/vga-cons-default-off.patch create mode 100644 target/linux/patches/3.0.8/wlan-cf.patch create mode 100644 target/linux/patches/3.0.8/x86-build.patch create mode 100644 target/linux/patches/3.0.8/zlib-inflate.patch create mode 100644 toolchain/kernel-headers/patches/2.6.39.4/aufs2.patch create mode 100644 toolchain/kernel-headers/patches/2.6.39.4/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/2.6.39.4/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/2.6.39.4/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/2.6.39.4/microperl.patch create mode 100644 toolchain/kernel-headers/patches/3.0.8/aufs2.patch create mode 100644 toolchain/kernel-headers/patches/3.0.8/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/3.0.8/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/3.0.8/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/3.0.8/microperl.patch diff --git a/target/linux/patches/2.6.39.4/arm-statcmd.patch b/target/linux/patches/2.6.39.4/arm-statcmd.patch new file mode 100644 index 000000000..3aed60cbc --- /dev/null +++ b/target/linux/patches/2.6.39.4/arm-statcmd.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.39-rc6.orig/arch/arm/boot/compressed/Makefile linux-2.6.39-rc6/arch/arm/boot/compressed/Makefile +--- linux-2.6.39-rc6.orig/arch/arm/boot/compressed/Makefile 2011-05-04 04:59:13.000000000 +0200 ++++ linux-2.6.39-rc6/arch/arm/boot/compressed/Makefile 2011-05-10 10:35:34.000000000 +0200 +@@ -99,7 +99,7 @@ + asflags-y := -Wa,-march=all + + # Provide size of uncompressed kernel to the decompressor via a linker symbol. +-LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image) ++LDFLAGS_vmlinux = --defsym _image_size=$(shell if stat -qs .>/dev/null 2>&1;then statcmd='stat -f %z';else statcmd='stat -c %s';fi; $$statcmd "%s" $(obj)/../Image) + # Supply ZRELADDR to the decompressor via a linker symbol. + ifneq ($(CONFIG_AUTO_ZRELADDR),y) + LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR) diff --git a/target/linux/patches/2.6.39.4/bsd-compatibility.patch b/target/linux/patches/2.6.39.4/bsd-compatibility.patch new file mode 100644 index 000000000..9e91a62de --- /dev/null +++ b/target/linux/patches/2.6.39.4/bsd-compatibility.patch @@ -0,0 +1,2512 @@ +diff -Nur linux-2.6.36.orig/scripts/Makefile.lib linux-2.6.36/scripts/Makefile.lib +--- linux-2.6.36.orig/scripts/Makefile.lib 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/Makefile.lib 2010-11-28 18:34:22.000000000 +0100 +@@ -216,7 +216,12 @@ + size_append = printf $(shell \ + dec_size=0; \ + for F in $1; do \ +- fsize=$$(stat -c "%s" $$F); \ ++ if stat -qs .>/dev/null 2>&1; then \ ++ statcmd='stat -f %z'; \ ++ else \ ++ statcmd='stat -c %s'; \ ++ fi; \ ++ fsize=$$($$statcmd $$F); \ + dec_size=$$(expr $$dec_size + $$fsize); \ + done; \ + printf "%08x\n" $$dec_size | \ +diff -Nur linux-2.6.36.orig/scripts/mod/mk_elfconfig.c linux-2.6.36/scripts/mod/mk_elfconfig.c +--- linux-2.6.36.orig/scripts/mod/mk_elfconfig.c 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/mod/mk_elfconfig.c 2010-11-28 18:33:24.000000000 +0100 +@@ -1,7 +1,18 @@ + #include + #include + #include +-#include ++ ++#define EI_NIDENT (16) ++#define ELFMAG "\177ELF" ++ ++#define SELFMAG 4 ++#define EI_CLASS 4 ++#define ELFCLASS32 1 /* 32-bit objects */ ++#define ELFCLASS64 2 /* 64-bit objects */ ++ ++#define EI_DATA 5 /* Data encoding byte index */ ++#define ELFDATA2LSB 1 /* 2's complement, little endian */ ++#define ELFDATA2MSB 2 /* 2's complement, big endian */ + + int + main(int argc, char **argv) +diff -Nur linux-2.6.36.orig/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h +--- linux-2.6.36.orig/scripts/mod/modpost.h 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/scripts/mod/modpost.h 2010-11-28 18:33:24.000000000 +0100 +@@ -7,7 +7,2453 @@ + #include + #include + #include +-#include ++ ++ ++/* This file defines standard ELF types, structures, and macros. ++ Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C 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 the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _ELF_H ++#define _ELF_H 1 ++ ++__BEGIN_DECLS ++ ++/* Standard ELF types. */ ++ ++#include ++ ++/* Type for a 16-bit quantity. */ ++typedef uint16_t Elf32_Half; ++typedef uint16_t Elf64_Half; ++ ++/* Types for signed and unsigned 32-bit quantities. */ ++typedef uint32_t Elf32_Word; ++typedef int32_t Elf32_Sword; ++typedef uint32_t Elf64_Word; ++typedef int32_t Elf64_Sword; ++ ++/* Types for signed and unsigned 64-bit quantities. */ ++typedef uint64_t Elf32_Xword; ++typedef int64_t Elf32_Sxword; ++typedef uint64_t Elf64_Xword; ++typedef int64_t Elf64_Sxword; ++ ++/* Type of addresses. */ ++typedef uint32_t Elf32_Addr; ++typedef uint64_t Elf64_Addr; ++ ++/* Type of file offsets. */ ++typedef uint32_t Elf32_Off; ++typedef uint64_t Elf64_Off; ++ ++/* Type for section indices, which are 16-bit quantities. */ ++typedef uint16_t Elf32_Section; ++typedef uint16_t Elf64_Section; ++ ++/* Type for version symbol information. */ ++typedef Elf32_Half Elf32_Versym; ++typedef Elf64_Half Elf64_Versym; ++ ++ ++/* The ELF file header. This appears at the start of every ELF file. */ ++ ++#define EI_NIDENT (16) ++ ++typedef struct ++{ ++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ ++ Elf32_Half e_type; /* Object file type */ ++ Elf32_Half e_machine; /* Architecture */ ++ Elf32_Word e_version; /* Object file version */ ++ Elf32_Addr e_entry; /* Entry point virtual address */ ++ Elf32_Off e_phoff; /* Program header table file offset */ ++ Elf32_Off e_shoff; /* Section header table file offset */ ++ Elf32_Word e_flags; /* Processor-specific flags */ ++ Elf32_Half e_ehsize; /* ELF header size in bytes */ ++ Elf32_Half e_phentsize; /* Program header table entry size */ ++ Elf32_Half e_phnum; /* Program header table entry count */ ++ Elf32_Half e_shentsize; /* Section header table entry size */ ++ Elf32_Half e_shnum; /* Section header table entry count */ ++ Elf32_Half e_shstrndx; /* Section header string table index */ ++} Elf32_Ehdr; ++ ++typedef struct ++{ ++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ ++ Elf64_Half e_type; /* Object file type */ ++ Elf64_Half e_machine; /* Architecture */ ++ Elf64_Word e_version; /* Object file version */ ++ Elf64_Addr e_entry; /* Entry point virtual address */ ++ Elf64_Off e_phoff; /* Program header table file offset */ ++ Elf64_Off e_shoff; /* Section header table file offset */ ++ Elf64_Word e_flags; /* Processor-specific flags */ ++ Elf64_Half e_ehsize; /* ELF header size in bytes */ ++ Elf64_Half e_phentsize; /* Program header table entry size */ ++ Elf64_Half e_phnum; /* Program header table entry count */ ++ Elf64_Half e_shentsize; /* Section header table entry size */ ++ Elf64_Half e_shnum; /* Section header table entry count */ ++ Elf64_Half e_shstrndx; /* Section header string table index */ ++} Elf64_Ehdr; ++ ++/* Fields in the e_ident array. The EI_* macros are indices into the ++ array. The macros under each EI_* macro are the values the byte ++ may have. */ ++ ++#define EI_MAG0 0 /* File identification byte 0 index */ ++#define ELFMAG0 0x7f /* Magic number byte 0 */ ++ ++#define EI_MAG1 1 /* File identification byte 1 index */ ++#define ELFMAG1 'E' /* Magic number byte 1 */ ++ ++#define EI_MAG2 2 /* File identification byte 2 index */ ++#define ELFMAG2 'L' /* Magic number byte 2 */ ++ ++#define EI_MAG3 3 /* File identification byte 3 index */ ++#define ELFMAG3 'F' /* Magic number byte 3 */ ++ ++/* Conglomeration of the identification bytes, for easy testing as a word. */ ++#define ELFMAG "\177ELF" ++#define SELFMAG 4 ++ ++#define EI_CLASS 4 /* File class byte index */ ++#define ELFCLASSNONE 0 /* Invalid class */ ++#define ELFCLASS32 1 /* 32-bit objects */ ++#define ELFCLASS64 2 /* 64-bit objects */ ++#define ELFCLASSNUM 3 ++ ++#define EI_DATA 5 /* Data encoding byte index */ ++#define ELFDATANONE 0 /* Invalid data encoding */ ++#define ELFDATA2LSB 1 /* 2's complement, little endian */ ++#define ELFDATA2MSB 2 /* 2's complement, big endian */ ++#define ELFDATANUM 3 ++ ++#define EI_VERSION 6 /* File version byte index */ ++ /* Value must be EV_CURRENT */ ++ ++#define EI_OSABI 7 /* OS ABI identification */ ++#define ELFOSABI_NONE 0 /* UNIX System V ABI */ ++#define ELFOSABI_SYSV 0 /* Alias. */ ++#define ELFOSABI_HPUX 1 /* HP-UX */ ++#define ELFOSABI_NETBSD 2 /* NetBSD. */ ++#define ELFOSABI_LINUX 3 /* Linux. */ ++#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ ++#define ELFOSABI_AIX 7 /* IBM AIX. */ ++#define ELFOSABI_IRIX 8 /* SGI Irix. */ ++#define ELFOSABI_FREEBSD 9 /* FreeBSD. */ ++#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ ++#define ELFOSABI_MODESTO 11 /* Novell Modesto. */ ++#define ELFOSABI_OPENBSD 12 /* OpenBSD. */ ++#define ELFOSABI_ARM 97 /* ARM */ ++#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ ++ ++#define EI_ABIVERSION 8 /* ABI version */ ++ ++#define EI_PAD 9 /* Byte index of padding bytes */ ++ ++/* Legal values for e_type (object file type). */ ++ ++#define ET_NONE 0 /* No file type */ ++#define ET_REL 1 /* Relocatable file */ ++#define ET_EXEC 2 /* Executable file */ ++#define ET_DYN 3 /* Shared object file */ ++#define ET_CORE 4 /* Core file */ ++#define ET_NUM 5 /* Number of defined types */ ++#define ET_LOOS 0xfe00 /* OS-specific range start */ ++#define ET_HIOS 0xfeff /* OS-specific range end */ ++#define ET_LOPROC 0xff00 /* Processor-specific range start */ ++#define ET_HIPROC 0xffff /* Processor-specific range end */ ++ ++/* Legal values for e_machine (architecture). */ ++ ++#define EM_NONE 0 /* No machine */ ++#define EM_M32 1 /* AT&T WE 32100 */ ++#define EM_SPARC 2 /* SUN SPARC */ ++#define EM_386 3 /* Intel 80386 */ ++#define EM_68K 4 /* Motorola m68k family */ ++#define EM_88K 5 /* Motorola m88k family */ ++#define EM_860 7 /* Intel 80860 */ ++#define EM_MIPS 8 /* MIPS R3000 big-endian */ ++#define EM_S370 9 /* IBM System/370 */ ++#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ ++ ++#define EM_PARISC 15 /* HPPA */ ++#define EM_VPP500 17 /* Fujitsu VPP500 */ ++#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ ++#define EM_960 19 /* Intel 80960 */ ++#define EM_PPC 20 /* PowerPC */ ++#define EM_PPC64 21 /* PowerPC 64-bit */ ++#define EM_S390 22 /* IBM S390 */ ++ ++#define EM_V800 36 /* NEC V800 series */ ++#define EM_FR20 37 /* Fujitsu FR20 */ ++#define EM_RH32 38 /* TRW RH-32 */ ++#define EM_RCE 39 /* Motorola RCE */ ++#define EM_ARM 40 /* ARM */ ++#define EM_FAKE_ALPHA 41 /* Digital Alpha */ ++#define EM_SH 42 /* Hitachi SH */ ++#define EM_SPARCV9 43 /* SPARC v9 64-bit */ ++#define EM_TRICORE 44 /* Siemens Tricore */ ++#define EM_ARC 45 /* Argonaut RISC Core */ ++#define EM_H8_300 46 /* Hitachi H8/300 */ ++#define EM_H8_300H 47 /* Hitachi H8/300H */ ++#define EM_H8S 48 /* Hitachi H8S */ ++#define EM_H8_500 49 /* Hitachi H8/500 */ ++#define EM_IA_64 50 /* Intel Merced */ ++#define EM_MIPS_X 51 /* Stanford MIPS-X */ ++#define EM_COLDFIRE 52 /* Motorola Coldfire */ ++#define EM_68HC12 53 /* Motorola M68HC12 */ ++#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ ++#define EM_PCP 55 /* Siemens PCP */ ++#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ ++#define EM_NDR1 57 /* Denso NDR1 microprocessor */ ++#define EM_STARCORE 58 /* Motorola Start*Core processor */ ++#define EM_ME16 59 /* Toyota ME16 processor */ ++#define EM_ST100 60 /* STMicroelectronic ST100 processor */ ++#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ ++#define EM_X86_64 62 /* AMD x86-64 architecture */ ++#define EM_PDSP 63 /* Sony DSP Processor */ ++ ++#define EM_FX66 66 /* Siemens FX66 microcontroller */ ++#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ ++#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ ++#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ ++#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ ++#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ ++#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ ++#define EM_SVX 73 /* Silicon Graphics SVx */ ++#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */ ++#define EM_VAX 75 /* Digital VAX */ ++#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ ++#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ ++#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ ++#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ ++#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ ++#define EM_HUANY 81 /* Harvard University machine-independent object files */ ++#define EM_PRISM 82 /* SiTera Prism */ ++#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ ++#define EM_FR30 84 /* Fujitsu FR30 */ ++#define EM_D10V 85 /* Mitsubishi D10V */ ++#define EM_D30V 86 /* Mitsubishi D30V */ ++#define EM_V850 87 /* NEC v850 */ ++#define EM_M32R 88 /* Mitsubishi M32R */ ++#define EM_MN10300 89 /* Matsushita MN10300 */ ++#define EM_MN10200 90 /* Matsushita MN10200 */ ++#define EM_PJ 91 /* picoJava */ ++#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ ++#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ ++#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ ++#define EM_NUM 95 ++ ++/* If it is necessary to assign new unofficial EM_* values, please ++ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the ++ chances of collision with official or non-GNU unofficial values. */ ++ ++#define EM_ALPHA 0x9026 ++ ++/* Legal values for e_version (version). */ ++ ++#define EV_NONE 0 /* Invalid ELF version */ ++#define EV_CURRENT 1 /* Current version */ ++#define EV_NUM 2 ++ ++/* Section header. */ ++ ++typedef struct ++{ ++ Elf32_Word sh_name; /* Section name (string tbl index) */ ++ Elf32_Word sh_type; /* Section type */ ++ Elf32_Word sh_flags; /* Section flags */ ++ Elf32_Addr sh_addr; /* Section virtual addr at execution */ ++ Elf32_Off sh_offset; /* Section file offset */ ++ Elf32_Word sh_size; /* Section size in bytes */ ++ Elf32_Word sh_link; /* Link to another section */ ++ Elf32_Word sh_info; /* Additional section information */ ++ Elf32_Word sh_addralign; /* Section alignment */ ++ Elf32_Word sh_entsize; /* Entry size if section holds table */ ++} Elf32_Shdr; ++ ++typedef struct ++{ ++ Elf64_Word sh_name; /* Section name (string tbl index) */ ++ Elf64_Word sh_type; /* Section type */ ++ Elf64_Xword sh_flags; /* Section flags */ ++ Elf64_Addr sh_addr; /* Section virtual addr at execution */ ++ Elf64_Off sh_offset; /* Section file offset */ ++ Elf64_Xword sh_size; /* Section size in bytes */ ++ Elf64_Word sh_link; /* Link to another section */ ++ Elf64_Word sh_info; /* Additional section information */ ++ Elf64_Xword sh_addralign; /* Section alignment */ ++ Elf64_Xword sh_entsize; /* Entry size if section holds table */ ++} Elf64_Shdr; ++ ++/* Special section indices. */ ++ ++#define SHN_UNDEF 0 /* Undefined section */ ++#define SHN_LORESERVE 0xff00 /* Start of reserved indices */ ++#define SHN_LOPROC 0xff00 /* Start of processor-specific */ ++#define SHN_HIPROC 0xff1f /* End of processor-specific */ ++#define SHN_LOOS 0xff20 /* Start of OS-specific */ ++#define SHN_HIOS 0xff3f /* End of OS-specific */ ++#define SHN_ABS 0xfff1 /* Associated symbol is absolute */ ++#define SHN_COMMON 0xfff2 /* Associated symbol is common */ ++#define SHN_XINDEX 0xffff /* Index is in extra table. */ ++#define SHN_HIRESERVE 0xffff /* End of reserved indices */ ++ ++/* Legal values for sh_type (section type). */ ++ ++#define SHT_NULL 0 /* Section header table entry unused */ ++#define SHT_PROGBITS 1 /* Program data */ ++#define SHT_SYMTAB 2 /* Symbol table */ ++#define SHT_STRTAB 3 /* String table */ ++#define SHT_RELA 4 /* Relocation entries with addends */ ++#define SHT_HASH 5 /* Symbol hash table */ ++#define SHT_DYNAMIC 6 /* Dynamic linking information */ ++#define SHT_NOTE 7 /* Notes */ ++#define SHT_NOBITS 8 /* Program space with no data (bss) */ ++#define SHT_REL 9 /* Relocation entries, no addends */ ++#define SHT_SHLIB 10 /* Reserved */ ++#define SHT_DYNSYM 11 /* Dynamic linker symbol table */ ++#define SHT_INIT_ARRAY 14 /* Array of constructors */ ++#define SHT_FINI_ARRAY 15 /* Array of destructors */ ++#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ ++#define SHT_GROUP 17 /* Section group */ ++#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ ++#define SHT_NUM 19 /* Number of defined types. */ ++#define SHT_LOOS 0x60000000 /* Start OS-specific */ ++#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */ ++#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */ ++#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */ ++#define SHT_SUNW_move 0x6ffffffa ++#define SHT_SUNW_COMDAT 0x6ffffffb ++#define SHT_SUNW_syminfo 0x6ffffffc ++#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */ ++#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */ ++#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */ ++#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */ ++#define SHT_HIOS 0x6fffffff /* End OS-specific type */ ++#define SHT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define SHT_HIPROC 0x7fffffff /* End of processor-specific */ ++#define SHT_LOUSER 0x80000000 /* Start of application-specific */ ++#define SHT_HIUSER 0x8fffffff /* End of application-specific */ ++ ++/* Legal values for sh_flags (section flags). */ ++ ++#define SHF_WRITE (1 << 0) /* Writable */ ++#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */ ++#define SHF_EXECINSTR (1 << 2) /* Executable */ ++#define SHF_MERGE (1 << 4) /* Might be merged */ ++#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */ ++#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */ ++#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */ ++#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling ++ required */ ++#define SHF_GROUP (1 << 9) /* Section is member of a group. */ ++#define SHF_TLS (1 << 10) /* Section hold thread-local data. */ ++#define SHF_MASKOS 0x0ff00000 /* OS-specific. */ ++#define SHF_MASKPROC 0xf0000000 /* Processor-specific */ ++ ++/* Section group handling. */ ++#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */ ++ ++/* Symbol table entry. */ ++ ++typedef struct ++{ ++ Elf32_Word st_name; /* Symbol name (string tbl index) */ ++ Elf32_Addr st_value; /* Symbol value */ ++ Elf32_Word st_size; /* Symbol size */ ++ unsigned char st_info; /* Symbol type and binding */ ++ unsigned char st_other; /* Symbol visibility */ ++ Elf32_Section st_shndx; /* Section index */ ++} Elf32_Sym; ++ ++typedef struct ++{ ++ Elf64_Word st_name; /* Symbol name (string tbl index) */ ++ unsigned char st_info; /* Symbol type and binding */ ++ unsigned char st_other; /* Symbol visibility */ ++ Elf64_Section st_shndx; /* Section index */ ++ Elf64_Addr st_value; /* Symbol value */ ++ Elf64_Xword st_size; /* Symbol size */ ++} Elf64_Sym; ++ ++/* The syminfo section if available contains additional information about ++ every dynamic symbol. */ ++ ++typedef struct ++{ ++ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */ ++ Elf32_Half si_flags; /* Per symbol flags */ ++} Elf32_Syminfo; ++ ++typedef struct ++{ ++ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */ ++ Elf64_Half si_flags; /* Per symbol flags */ ++} Elf64_Syminfo; ++ ++/* Possible values for si_boundto. */ ++#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */ ++#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */ ++#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */ ++ ++/* Possible bitmasks for si_flags. */ ++#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */ ++#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */ ++#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */ ++#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy ++ loaded */ ++/* Syminfo version values. */ ++#define SYMINFO_NONE 0 ++#define SYMINFO_CURRENT 1 ++#define SYMINFO_NUM 2 ++ ++ ++/* How to extract and insert information held in the st_info field. */ ++ ++#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)) ++ ++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field. */ ++#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)) ++ ++/* Legal values for ST_BIND subfield of st_info (symbol binding). */ ++ ++#define STB_LOCAL 0 /* Local symbol */ ++#define STB_GLOBAL 1 /* Global symbol */ ++#define STB_WEAK 2 /* Weak symbol */ ++#define STB_NUM 3 /* Number of defined types. */ ++#define STB_LOOS 10 /* Start of OS-specific */ ++#define STB_HIOS 12 /* End of OS-specific */ ++#define STB_LOPROC 13 /* Start of processor-specific */ ++#define STB_HIPROC 15 /* End of processor-specific */ ++ ++/* Legal values for ST_TYPE subfield of st_info (symbol type). */ ++ ++#define STT_NOTYPE 0 /* Symbol type is unspecified */ ++#define STT_OBJECT 1 /* Symbol is a data object */ ++#define STT_FUNC 2 /* Symbol is a code object */ ++#define STT_SECTION 3 /* Symbol associated with a section */ ++#define STT_FILE 4 /* Symbol's name is file name */ ++#define STT_COMMON 5 /* Symbol is a common data object */ ++#define STT_TLS 6 /* Symbol is thread-local data object*/ ++#define STT_NUM 7 /* Number of defined types. */ ++#define STT_LOOS 10 /* Start of OS-specific */ ++#define STT_HIOS 12 /* End of OS-specific */ ++#define STT_LOPROC 13 /* Start of processor-specific */ ++#define STT_HIPROC 15 /* End of processor-specific */ ++ ++ ++/* Symbol table indices are found in the hash buckets and chain table ++ of a symbol hash table section. This special index value indicates ++ the end of a chain, meaning no further symbols are found in that bucket. */ ++ ++#define STN_UNDEF 0 /* End of a chain. */ ++ ++ ++/* How to extract and insert information held in the st_other field. */ ++ ++#define ELF32_ST_VISIBILITY(o) ((o) & 0x03) ++ ++/* For ELF64 the definitions are the same. */ ++#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o) ++ ++/* Symbol visibility specification encoded in the st_other field. */ ++#define STV_DEFAULT 0 /* Default symbol visibility rules */ ++#define STV_INTERNAL 1 /* Processor specific hidden class */ ++#define STV_HIDDEN 2 /* Sym unavailable in other modules */ ++#define STV_PROTECTED 3 /* Not preemptible, not exported */ ++ ++ ++/* Relocation table entry without addend (in section of type SHT_REL). */ ++ ++typedef struct ++{ ++ Elf32_Addr r_offset; /* Address */ ++ Elf32_Word r_info; /* Relocation type and symbol index */ ++} Elf32_Rel; ++ ++/* I have seen two different definitions of the Elf64_Rel and ++ Elf64_Rela structures, so we'll leave them out until Novell (or ++ whoever) gets their act together. */ ++/* The following, at least, is used on Sparc v9, MIPS, and Alpha. */ ++ ++typedef struct ++{ ++ Elf64_Addr r_offset; /* Address */ ++ Elf64_Xword r_info; /* Relocation type and symbol index */ ++} Elf64_Rel; ++ ++/* Relocation table entry with addend (in section of type SHT_RELA). */ ++ ++typedef struct ++{ ++ Elf32_Addr r_offset; /* Address */ ++ Elf32_Word r_info; /* Relocation type and symbol index */ ++ Elf32_Sword r_addend; /* Addend */ ++} Elf32_Rela; ++ ++typedef struct ++{ ++ Elf64_Addr r_offset; /* Address */ ++ Elf64_Xword r_info; /* Relocation type and symbol index */ ++ Elf64_Sxword r_addend; /* Addend */ ++} Elf64_Rela; ++ ++/* How to extract and insert information held in the r_info field. */ ++ ++#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)) ++ ++/* Program segment header. */ ++ ++typedef struct ++{ ++ Elf32_Word p_type; /* Segment type */ ++ Elf32_Off p_offset; /* Segment file offset */ ++ Elf32_Addr p_vaddr; /* Segment virtual address */ ++ Elf32_Addr p_paddr; /* Segment physical address */ ++ Elf32_Word p_filesz; /* Segment size in file */ ++ Elf32_Word p_memsz; /* Segment size in memory */ ++ Elf32_Word p_flags; /* Segment flags */ ++ Elf32_Word p_align; /* Segment alignment */ ++} Elf32_Phdr; ++ ++typedef struct ++{ ++ Elf64_Word p_type; /* Segment type */ ++ Elf64_Word p_flags; /* Segment flags */ ++ Elf64_Off p_offset; /* Segment file offset */ ++ Elf64_Addr p_vaddr; /* Segment virtual address */ ++ Elf64_Addr p_paddr; /* Segment physical address */ ++ Elf64_Xword p_filesz; /* Segment size in file */ ++ Elf64_Xword p_memsz; /* Segment size in memory */ ++ Elf64_Xword p_align; /* Segment alignment */ ++} Elf64_Phdr; ++ ++/* Legal values for p_type (segment type). */ ++ ++#define PT_NULL 0 /* Program header table entry unused */ ++#define PT_LOAD 1 /* Loadable program segment */ ++#define PT_DYNAMIC 2 /* Dynamic linking information */ ++#define PT_INTERP 3 /* Program interpreter */ ++#define PT_NOTE 4 /* Auxiliary information */ ++#define PT_SHLIB 5 /* Reserved */ ++#define PT_PHDR 6 /* Entry for header table itself */ ++#define PT_TLS 7 /* Thread-local storage segment */ ++#define PT_NUM 8 /* Number of defined types */ ++#define PT_LOOS 0x60000000 /* Start of OS-specific */ ++#define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ ++#define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ ++#define PT_LOSUNW 0x6ffffffa ++#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ ++#define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ ++#define PT_HISUNW 0x6fffffff ++#define PT_HIOS 0x6fffffff /* End of OS-specific */ ++#define PT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define PT_HIPROC 0x7fffffff /* End of processor-specific */ ++ ++/* Legal values for p_flags (segment flags). */ ++ ++#define PF_X (1 << 0) /* Segment is executable */ ++#define PF_W (1 << 1) /* Segment is writable */ ++#define PF_R (1 << 2) /* Segment is readable */ ++#define PF_MASKOS 0x0ff00000 /* OS-specific */ ++#define PF_MASKPROC 0xf0000000 /* Processor-specific */ ++ ++/* Legal values for note segment descriptor types for core files. */ ++ ++#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */ ++#define NT_FPREGSET 2 /* Contains copy of fpregset struct */ ++#define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ ++#define NT_PRXREG 4 /* Contains copy of prxregset struct */ ++#define NT_TASKSTRUCT 4 /* Contains copy of task structure */ ++#define NT_PLATFORM 5 /* String from sysinfo(SI_PLATFORM) */ ++#define NT_AUXV 6 /* Contains copy of auxv array */ ++#define NT_GWINDOWS 7 /* Contains copy of gwindows struct */ ++#define NT_ASRS 8 /* Contains copy of asrset struct */ ++#define NT_PSTATUS 10 /* Contains copy of pstatus struct */ ++#define NT_PSINFO 13 /* Contains copy of psinfo struct */ ++#define NT_PRCRED 14 /* Contains copy of prcred struct */ ++#define NT_UTSNAME 15 /* Contains copy of utsname struct */ ++#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */ ++#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */ ++#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct*/ ++ ++/* Legal values for the note segment descriptor types for object files. */ ++ ++#define NT_VERSION 1 /* Contains a version string. */ ++ ++ ++/* Dynamic section entry. */ ++ ++typedef struct ++{ ++ Elf32_Sword d_tag; /* Dynamic entry type */ ++ union ++ { ++ Elf32_Word d_val; /* Integer value */ ++ Elf32_Addr d_ptr; /* Address value */ ++ } d_un; ++} Elf32_Dyn; ++ ++typedef struct ++{ ++ Elf64_Sxword d_tag; /* Dynamic entry type */ ++ union ++ { ++ Elf64_Xword d_val; /* Integer value */ ++ Elf64_Addr d_ptr; /* Address value */ ++ } d_un; ++} Elf64_Dyn; ++ ++/* Legal values for d_tag (dynamic entry type). */ ++ ++#define DT_NULL 0 /* Marks end of dynamic section */ ++#define DT_NEEDED 1 /* Name of needed library */ ++#define DT_PLTRELSZ 2 /* Size in bytes of PLT relocs */ ++#define DT_PLTGOT 3 /* Processor defined value */ ++#define DT_HASH 4 /* Address of symbol hash table */ ++#define DT_STRTAB 5 /* Address of string table */ ++#define DT_SYMTAB 6 /* Address of symbol table */ ++#define DT_RELA 7 /* Address of Rela relocs */ ++#define DT_RELASZ 8 /* Total size of Rela relocs */ ++#define DT_RELAENT 9 /* Size of one Rela reloc */ ++#define DT_STRSZ 10 /* Size of string table */ ++#define DT_SYMENT 11 /* Size of one symbol table entry */ ++#define DT_INIT 12 /* Address of init function */ ++#define DT_FINI 13 /* Address of termination function */ ++#define DT_SONAME 14 /* Name of shared object */ ++#define DT_RPATH 15 /* Library search path (deprecated) */ ++#define DT_SYMBOLIC 16 /* Start symbol search here */ ++#define DT_REL 17 /* Address of Rel relocs */ ++#define DT_RELSZ 18 /* Total size of Rel relocs */ ++#define DT_RELENT 19 /* Size of one Rel reloc */ ++#define DT_PLTREL 20 /* Type of reloc in PLT */ ++#define DT_DEBUG 21 /* For debugging; unspecified */ ++#define DT_TEXTREL 22 /* Reloc might modify .text */ ++#define DT_JMPREL 23 /* Address of PLT relocs */ ++#define DT_BIND_NOW 24 /* Process relocations of object */ ++#define DT_INIT_ARRAY 25 /* Array with addresses of init fct */ ++#define DT_FINI_ARRAY 26 /* Array with addresses of fini fct */ ++#define DT_INIT_ARRAYSZ 27 /* Size in bytes of DT_INIT_ARRAY */ ++#define DT_FINI_ARRAYSZ 28 /* Size in bytes of DT_FINI_ARRAY */ ++#define DT_RUNPATH 29 /* Library search path */ ++#define DT_FLAGS 30 /* Flags for the object being loaded */ ++#define DT_ENCODING 32 /* Start of encoded range */ ++#define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/ ++#define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */ ++#define DT_NUM 34 /* Number used */ ++#define DT_LOOS 0x6000000d /* Start of OS-specific */ ++#define DT_HIOS 0x6ffff000 /* End of OS-specific */ ++#define DT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define DT_HIPROC 0x7fffffff /* End of processor-specific */ ++#define DT_PROCNUM DT_MIPS_NUM /* Most used by any processor */ ++ ++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the ++ Dyn.d_un.d_val field of the Elf*_Dyn structure. This follows Sun's ++ approach. */ ++#define DT_VALRNGLO 0x6ffffd00 ++#define DT_GNU_PRELINKED 0x6ffffdf5 /* Prelinking timestamp */ ++#define DT_GNU_CONFLICTSZ 0x6ffffdf6 /* Size of conflict section */ ++#define DT_GNU_LIBLISTSZ 0x6ffffdf7 /* Size of library list */ ++#define DT_CHECKSUM 0x6ffffdf8 ++#define DT_PLTPADSZ 0x6ffffdf9 ++#define DT_MOVEENT 0x6ffffdfa ++#define DT_MOVESZ 0x6ffffdfb ++#define DT_FEATURE_1 0x6ffffdfc /* Feature selection (DTF_*). */ ++#define DT_POSFLAG_1 0x6ffffdfd /* Flags for DT_* entries, effecting ++ the following DT_* entry. */ ++#define DT_SYMINSZ 0x6ffffdfe /* Size of syminfo table (in bytes) */ ++#define DT_SYMINENT 0x6ffffdff /* Entry size of syminfo */ ++#define DT_VALRNGHI 0x6ffffdff ++#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag)) /* Reverse order! */ ++#define DT_VALNUM 12 ++ ++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the ++ Dyn.d_un.d_ptr field of the Elf*_Dyn structure. ++ ++ If any adjustment is made to the ELF object after it has been ++ built these entries will need to be adjusted. */ ++#define DT_ADDRRNGLO 0x6ffffe00 ++#define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */ ++#define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */ ++#define DT_CONFIG 0x6ffffefa /* Configuration information. */ ++#define DT_DEPAUDIT 0x6ffffefb /* Dependency auditing. */ ++#define DT_AUDIT 0x6ffffefc /* Object auditing. */ ++#define DT_PLTPAD 0x6ffffefd /* PLT padding. */ ++#define DT_MOVETAB 0x6ffffefe /* Move table. */ ++#define DT_SYMINFO 0x6ffffeff /* Syminfo table. */ ++#define DT_ADDRRNGHI 0x6ffffeff ++#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag)) /* Reverse order! */ ++#define DT_ADDRNUM 10 ++ ++/* The versioning entry types. The next are defined as part of the ++ GNU extension. */ ++#define DT_VERSYM 0x6ffffff0 ++ ++#define DT_RELACOUNT 0x6ffffff9 ++#define DT_RELCOUNT 0x6ffffffa ++ ++/* These were chosen by Sun. */ ++#define DT_FLAGS_1 0x6ffffffb /* State flags, see DF_1_* below. */ ++#define DT_VERDEF 0x6ffffffc /* Address of version definition ++ table */ ++#define DT_VERDEFNUM 0x6ffffffd /* Number of version definitions */ ++#define DT_VERNEED 0x6ffffffe /* Address of table with needed ++ versions */ ++#define DT_VERNEEDNUM 0x6fffffff /* Number of needed versions */ ++#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */ ++#define DT_VERSIONTAGNUM 16 ++ ++/* Sun added these machine-independent extensions in the "processor-specific" ++ range. Be compatible. */ ++#define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */ ++#define DT_FILTER 0x7fffffff /* Shared object to get values from */ ++#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1) ++#define DT_EXTRANUM 3 ++ ++/* Values of `d_un.d_val' in the DT_FLAGS entry. */ ++#define DF_ORIGIN 0x00000001 /* Object may use DF_ORIGIN */ ++#define DF_SYMBOLIC 0x00000002 /* Symbol resolutions starts here */ ++#define DF_TEXTREL 0x00000004 /* Object contains text relocations */ ++#define DF_BIND_NOW 0x00000008 /* No lazy binding for this object */ ++#define DF_STATIC_TLS 0x00000010 /* Module uses the static TLS model */ ++ ++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1 ++ entry in the dynamic section. */ ++#define DF_1_NOW 0x00000001 /* Set RTLD_NOW for this object. */ ++#define DF_1_GLOBAL 0x00000002 /* Set RTLD_GLOBAL for this object. */ ++#define DF_1_GROUP 0x00000004 /* Set RTLD_GROUP for this object. */ ++#define DF_1_NODELETE 0x00000008 /* Set RTLD_NODELETE for this object.*/ ++#define DF_1_LOADFLTR 0x00000010 /* Trigger filtee loading at runtime.*/ ++#define DF_1_INITFIRST 0x00000020 /* Set RTLD_INITFIRST for this object*/ ++#define DF_1_NOOPEN 0x00000040 /* Set RTLD_NOOPEN for this object. */ ++#define DF_1_ORIGIN 0x00000080 /* $ORIGIN must be handled. */ ++#define DF_1_DIRECT 0x00000100 /* Direct binding enabled. */ ++#define DF_1_TRANS 0x00000200 ++#define DF_1_INTERPOSE 0x00000400 /* Object is used to interpose. */ ++#define DF_1_NODEFLIB 0x00000800 /* Ignore default lib search path. */ ++#define DF_1_NODUMP 0x00001000 /* Object can't be dldump'ed. */ ++#define DF_1_CONFALT 0x00002000 /* Configuration alternative created.*/ ++#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */ ++#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */ ++#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */ ++ ++/* Flags for the feature selection in DT_FEATURE_1. */ ++#define DTF_1_PARINIT 0x00000001 ++#define DTF_1_CONFEXP 0x00000002 ++ ++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry. */ ++#define DF_P1_LAZYLOAD 0x00000001 /* Lazyload following object. */ ++#define DF_P1_GROUPPERM 0x00000002 /* Symbols from next object are not ++ generally available. */ ++ ++/* Version definition sections. */ ++ ++typedef struct ++{ ++ Elf32_Half vd_version; /* Version revision */ ++ Elf32_Half vd_flags; /* Version information */ ++ Elf32_Half vd_ndx; /* Version Index */ ++ Elf32_Half vd_cnt; /* Number of associated aux entries */ ++ Elf32_Word vd_hash; /* Version name hash value */ ++ Elf32_Word vd_aux; /* Offset in bytes to verdaux array */ ++ Elf32_Word vd_next; /* Offset in bytes to next verdef ++ entry */ ++} Elf32_Verdef; ++ ++typedef struct ++{ ++ Elf64_Half vd_version; /* Version revision */ ++ Elf64_Half vd_flags; /* Version information */ ++ Elf64_Half vd_ndx; /* Version Index */ ++ Elf64_Half vd_cnt; /* Number of associated aux entries */ ++ Elf64_Word vd_hash; /* Version name hash value */ ++ Elf64_Word vd_aux; /* Offset in bytes to verdaux array */ ++ Elf64_Word vd_next; /* Offset in bytes to next verdef ++ entry */ ++} Elf64_Verdef; ++ ++ ++/* Legal values for vd_version (version revision). */ ++#define VER_DEF_NONE 0 /* No version */ ++#define VER_DEF_CURRENT 1 /* Current version */ ++#define VER_DEF_NUM 2 /* Given version number */ ++ ++/* Legal values for vd_flags (version information flags). */ ++#define VER_FLG_BASE 0x1 /* Version definition of file itself */ ++#define VER_FLG_WEAK 0x2 /* Weak version identifier */ ++ ++/* Versym symbol index values. */ ++#define VER_NDX_LOCAL 0 /* Symbol is local. */ ++#define VER_NDX_GLOBAL 1 /* Symbol is global. */ ++#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */ ++#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */ ++ ++/* Auxialiary version information. */ ++ ++typedef struct ++{ ++ Elf32_Word vda_name; /* Version or dependency names */ ++ Elf32_Word vda_next; /* Offset in bytes to next verdaux ++ entry */ ++} Elf32_Verdaux; ++ ++typedef struct ++{ ++ Elf64_Word vda_name; /* Version or dependency names */ ++ Elf64_Word vda_next; /* Offset in bytes to next verdaux ++ entry */ ++} Elf64_Verdaux; ++ ++ ++/* Version dependency section. */ ++ ++typedef struct ++{ ++ Elf32_Half vn_version; /* Version of structure */ ++ Elf32_Half vn_cnt; /* Number of associated aux entries */ ++ Elf32_Word vn_file; /* Offset of filename for this ++ dependency */ ++ Elf32_Word vn_aux; /* Offset in bytes to vernaux array */ ++ Elf32_Word vn_next; /* Offset in bytes to next verneed ++ entry */ ++} Elf32_Verneed; ++ ++typedef struct ++{ ++ Elf64_Half vn_version; /* Version of structure */ ++ Elf64_Half vn_cnt; /* Number of associated aux entries */ ++ Elf64_Word vn_file; /* Offset of filename for this ++ dependency */ ++ Elf64_Word vn_aux; /* Offset in bytes to vernaux array */ ++ Elf64_Word vn_next; /* Offset in bytes to next verneed ++ entry */ ++} Elf64_Verneed; ++ ++ ++/* Legal values for vn_version (version revision). */ ++#define VER_NEED_NONE 0 /* No version */ ++#define VER_NEED_CURRENT