Switch to elfutils 0.153.

Change-Id: I2452503997af46a55bc898ef0cfda4b658da9130

6 files changed, 625 insertions, 0 deletions

diff --git a/0.153/Android.mk b/0.153/Android.mk
new file mode 100755
index 00000000..260fae21
--- /dev/null
+++ b/0.153/Android.mk
@@ -0,0 +1,15 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include $(call all-subdir-makefiles)
diff --git a/0.153/libdw/Android.mk b/0.153/libdw/Android.mk
new file mode 100755
index 00000000..d1969313
--- /dev/null
+++ b/0.153/libdw/Android.mk
@@ -0,0 +1,185 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+supported_platforms := linux-x86
+cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+
+ifdef cur_platform
+
+#
+# host libdw
+#
+
+include $(CLEAR_VARS)
+
+LIBDW_SRC_FILES := \
+        cfi.c \
+        cie.c \
+        dwarf_abbrevhaschildren.c \
+        dwarf_abbrev_hash.c \
+        dwarf_addrdie.c \
+        dwarf_arrayorder.c \
+        dwarf_attr.c \
+        dwarf_attr_integrate.c \
+        dwarf_begin.c \
+        dwarf_begin_elf.c \
+        dwarf_bitoffset.c \
+        dwarf_bitsize.c \
+        dwarf_bytesize.c \
+        dwarf_cfi_addrframe.c \
+        dwarf_child.c \
+        dwarf_cuoffset.c \
+        dwarf_decl_column.c \
+        dwarf_decl_file.c \
+        dwarf_decl_line.c \
+        dwarf_diecu.c \
+        dwarf_diename.c \
+        dwarf_dieoffset.c \
+        dwarf_end.c \
+        dwarf_entry_breakpoints.c \
+        dwarf_entrypc.c \
+        dwarf_error.c \
+        dwarf_filesrc.c \
+        dwarf_formaddr.c \
+        dwarf_formblock.c \
+        dwarf_formflag.c \
+        dwarf_formref.c \
+        dwarf_formref_die.c \
+        dwarf_formsdata.c \
+        dwarf_formstring.c \
+        dwarf_formudata.c \
+        dwarf_frame_cfa.c \
+        dwarf_func_inline.c \
+        dwarf_getabbrevattr.c \
+        dwarf_getabbrev.c \
+        dwarf_getabbrevcode.c \
+        dwarf_getabbrevtag.c \
+        dwarf_getarange_addr.c \
+        dwarf_getarangeinfo.c \
+        dwarf_getaranges.c \
+        dwarf_getattrcnt.c \
+        dwarf_getattrs.c \
+        dwarf_getcfi.c \
+        dwarf_getelf.c \
+        dwarf_getfuncs.c \
+        dwarf_getlocation.c \
+        dwarf_getmacros.c \
+        dwarf_getpubnames.c \
+        dwarf_getscopes.c \
+        dwarf_getscopes_die.c \
+        dwarf_getscopevar.c \
+        dwarf_getsrc_die.c \
+        dwarf_getsrcdirs.c \
+        dwarf_getsrc_file.c \
+        dwarf_getsrcfiles.c \
+        dwarf_getsrclines.c \
+        dwarf_getstring.c \
+        dwarf_hasattr.c \
+        dwarf_hasattr_integrate.c \
+        dwarf_haschildren.c \
+        dwarf_hasform.c \
+        dwarf_haspc.c \
+        dwarf_highpc.c \
+        dwarf_lineaddr.c \
+        dwarf_linebeginstatement.c \
+        dwarf_lineblock.c \
+        dwarf_linecol.c \
+        dwarf_lineendsequence.c \
+        dwarf_lineepiloguebegin.c \
+        dwarf_lineno.c \
+        dwarf_lineprologueend.c \
+        dwarf_linesrc.c \
+        dwarf_lowpc.c \
+        dwarf_macro_opcode.c \
+        dwarf_macro_param1.c \
+        dwarf_macro_param2.c \
+        dwarf_next_cfi.c \
+        dwarf_nextcu.c \
+        dwarf_offabbrev.c \
+        dwarf_offdie.c \
+        dwarf_onearange.c \
+        dwarf_onesrcline.c \
+        dwarf_ranges.c \
+        dwarf_siblingof.c \
+        dwarf_sig8_hash.c \
+        dwarf_srclang.c \
+        dwarf_tag.c \
+        dwarf_whatattr.c \
+        dwarf_whatform.c \
+        fde.c \
+        frame-cache.c \
+        libdw_alloc.c \
+        libdw_findcu.c \
+        libdw_form.c \
+        libdw_visit_scopes.c \
+        memory-access.c
+
+LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libdw \
+	$(LOCAL_PATH)/../libelf
+
+ifeq ($(HOST_OS),darwin)
+	LOCAL_CFLAGS += -fnested-functions
+endif
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE -DIS_LIBDW
+
+# to fix machine-dependent issues
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+LOCAL_MODULE:= libdw
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+#
+# target libdw
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libdw \
+	$(LOCAL_PATH)/../libelf
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
+
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -DIS_LIBDW -Werror
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+LOCAL_MODULE_TAGS := eng
+
+LOCAL_MODULE:= libdw
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif #cur_platform
diff --git a/0.153/libdwfl/Android.mk b/0.153/libdwfl/Android.mk
new file mode 100755
index 00000000..7b5ba160
--- /dev/null
+++ b/0.153/libdwfl/Android.mk
@@ -0,0 +1,112 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+supported_platforms := linux-x86
+cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+
+ifdef cur_platform
+
+#
+# host libdwfl
+#
+
+include $(CLEAR_VARS)
+
+LIBDWFL_SRC_FILES := \
+	dwfl_begin.c \
+	dwfl_build_id_find_elf.c \
+	dwfl_build_id_find_debuginfo.c \
+	dwfl_end.c \
+	dwfl_error.c \
+	dwfl_module.c \
+	dwfl_module_addrdie.c \
+	dwfl_module_addrsym.c \
+	dwfl_module_build_id.c \
+	dwfl_module_getdwarf.c \
+	dwfl_module_getsym.c \
+	dwfl_report_elf.c \
+	find-debuginfo.c \
+	image-header.c \
+	libdwfl_crc32.c \
+	libdwfl_crc32_file.c \
+	offline.c \
+	open.c \
+	relocate.c
+
+LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES) \
+	dwfl_addrdwarf.c \
+	dwfl_addrmodule.c \
+	dwfl_module_report_build_id.c \
+	linux-kernel-modules.c \
+	segment.c
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libdwfl \
+	$(LOCAL_PATH)/../libebl \
+	$(LOCAL_PATH)/../libdw \
+	$(LOCAL_PATH)/../libelf
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+ifeq ($(HOST_OS),darwin)
+	LOCAL_CFLAGS += -fnested-functions
+endif
+
+# to fix machine-dependent issues
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+
+LOCAL_MODULE:= libdwfl
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+#
+# target libdwfl
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libdwfl \
+	$(LOCAL_PATH)/../libebl \
+	$(LOCAL_PATH)/../libdw \
+	$(LOCAL_PATH)/../libelf
+
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
+
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+LOCAL_MODULE:= libdwfl
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif #cur_platform
diff --git a/0.153/libdwfl/linux-kernel-modules.c b/0.153/libdwfl/linux-kernel-modules.c
index ae74a497..e2392722 100644
--- a/0.153/libdwfl/linux-kernel-modules.c
+++ b/0.153/libdwfl/linux-kernel-modules.c
@@ -50,6 +50,9 @@
 /* We include this before config.h because it can't handle _FILE_OFFSET_BITS.
    Everything we need here is fine if its declarations just come first.  */
 
+/* TODO ANDROID - defined in AndroidConfig.h. */
+#undef _FILE_OFFSET_BITS
+
 #include <fts.h>
 
 #include <config.h>
diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
new file mode 100755
index 00000000..a602d6d2
--- /dev/null
+++ b/0.153/libebl/Android.mk
@@ -0,0 +1,120 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+supported_platforms := linux-x86
+cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+
+ifdef cur_platform
+
+#
+# host libebl
+#
+#
+include $(CLEAR_VARS)
+
+LIBEBL_SRC_FILES := \
+        eblabicfi.c \
+        eblauxvinfo.c \
+        eblbackendname.c \
+        eblbsspltp.c \
+        eblcheckobjattr.c \
+        ebl_check_special_section.c \
+        ebl_check_special_symbol.c \
+        eblclosebackend.c \
+        eblcopyrelocp.c \
+        eblcorenote.c \
+        eblcorenotetypename.c \
+        ebldebugscnp.c \
+        ebldynamictagcheck.c \
+        ebldynamictagname.c \
+        eblelfclass.c \
+        eblelfdata.c \
+        eblelfmachine.c \
+        eblgotpcreloccheck.c \
+        eblgstrtab.c \
+        eblmachineflagcheck.c \
+        eblmachineflagname.c \
+        eblmachinesectionflagcheck.c \
+        eblnonerelocp.c \
+        eblobjecttypename.c \
+        eblobjnote.c \
+        eblobjnotetypename.c \
+        eblopenbackend.c \
+        eblosabiname.c \
+        eblreginfo.c \
+        eblrelativerelocp.c \
+        eblrelocsimpletype.c \
+        eblreloctypecheck.c \
+        eblreloctypename.c \
+        eblrelocvaliduse.c \
+        eblretval.c \
+        eblsectionname.c \
+        eblsectionstripp.c \
+        eblsectiontypename.c \
+        eblshflagscombine.c \
+        eblstrtab.c \
+        eblsymbolbindingname.c \
+        eblsymboltypename.c \
+        ebl_syscall_abi.c \
+        eblsysvhashentrysize.c
+
+LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libebl \
+	$(LOCAL_PATH)/../libasm \
+	$(LOCAL_PATH)/../libelf \
+	$(LOCAL_PATH)/../libdw
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
+
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+
+LOCAL_MODULE:= libebl
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+#
+# target libebl
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(LIBEBL_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libebl \
+	$(LOCAL_PATH)/../libasm \
+	$(LOCAL_PATH)/../libelf \
+	$(LOCAL_PATH)/../libdw
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
+
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
+
+LOCAL_MODULE:= libebl
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif #cur_platform
diff --git a/0.153/libelf/Android.mk b/0.153/libelf/Android.mk
new file mode 100755
index 00000000..f9fcbccf
--- /dev/null
+++ b/0.153/libelf/Android.mk
@@ -0,0 +1,190 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+supported_platforms := linux-x86
+cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+
+ifdef cur_platform
+
+#
+# host libelf
+#
+
+include $(CLEAR_VARS)
+
+LIBELF_SRC_FILES := \
+	elf32_checksum.c \
+	elf32_fsize.c \
+	elf32_getehdr.c \
+	elf32_getphdr.c \
+	elf32_getshdr.c \
+	elf32_newehdr.c \
+	elf32_newphdr.c \
+	elf32_offscn.c \
+	elf32_updatenull.c \
+	elf32_xlatetof.c \
+	elf32_xlatetom.c \
+	elf64_checksum.c \
+	elf64_fsize.c \
+	elf64_getehdr.c \
+	elf64_getphdr.c \
+	elf64_getshdr.c \
+	elf64_newehdr.c \
+	elf64_newphdr.c \
+	elf64_offscn.c \
+	elf64_updatenull.c \
+	elf64_xlatetof.c \
+	elf64_xlatetom.c \
+	elf_begin.c \
+	elf_clone.c \
+	elf_cntl.c \
+	elf_end.c \
+	elf_error.c \
+	elf_fill.c \
+	elf_flagdata.c \
+	elf_flagehdr.c \
+	elf_flagelf.c \
+	elf_flagphdr.c \
+	elf_flagscn.c \
+	elf_flagshdr.c \
+	elf_getarhdr.c \
+	elf_getaroff.c \
+	elf_getarsym.c \
+	elf_getbase.c \
+	elf_getdata.c \
+	elf_getdata_rawchunk.c \
+	elf_getident.c \
+	elf_getphdrnum.c \
+	elf_getscn.c \
+	elf_getshdrnum.c \
+	elf_getshdrstrndx.c \
+	elf_gnu_hash.c \
+	elf_hash.c \
+	elf_kind.c \
+	elf_memory.c \
+	elf_ndxscn.c \
+	elf_newdata.c \
+	elf_newscn.c \
+	elf_next.c \
+	elf_nextscn.c \
+	elf_rand.c \
+	elf_rawdata.c \
+	elf_rawfile.c \
+	elf_readall.c \
+	elf_scnshndx.c \
+	elf_strptr.c \
+	elf_update.c \
+	elf_version.c \
+	gelf_checksum.c \
+	gelf_fsize.c \
+	gelf_getauxv.c \
+	gelf_getclass.c \
+	gelf_getdyn.c \
+	gelf_getehdr.c \
+	gelf_getlib.c \
+	gelf_getmove.c \
+	gelf_getnote.c \
+	gelf_getphdr.c \
+	gelf_getrela.c \
+	gelf_getrel.c \
+	gelf_getshdr.c \
+	gelf_getsym.c \
+	gelf_getsyminfo.c \
+	gelf_getsymshndx.c \
+	gelf_getverdaux.c \
+	gelf_getverdef.c \
+	gelf_getvernaux.c \
+	gelf_getverneed.c \
+	gelf_getversym.c \
+	gelf_newehdr.c \
+	gelf_newphdr.c \
+	gelf_offscn.c \
+	gelf_update_auxv.c \
+	gelf_update_dyn.c \
+	gelf_update_ehdr.c \
+	gelf_update_lib.c \
+	gelf_update_move.c \
+	gelf_update_phdr.c \
+	gelf_update_rela.c \
+	gelf_update_rel.c \
+	gelf_update_shdr.c \
+	gelf_update_sym.c \
+	gelf_update_syminfo.c \
+	gelf_update_symshndx.c \
+	gelf_update_verdaux.c \
+	gelf_update_verdef.c \
+	gelf_update_vernaux.c \
+	gelf_update_verneed.c \
+	gelf_update_versym.c \
+	gelf_xlate.c \
+	gelf_xlatetof.c \
+	gelf_xlatetom.c \
+	libelf_crc32.c \
+	libelf_next_prime.c \
+	nlist.c
+
+LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libelf
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+ifeq ($(HOST_OS),darwin)
+	LOCAL_CFLAGS += -fnested-functions
+endif
+
+# to fix machine-dependent issues
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+
+LOCAL_MODULE := libelf
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+#
+# target libelf
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../lib \
+	$(LOCAL_PATH)/../libelf
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
+
+# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
+LOCAL_CFLAGS += -Wno-pointer-arith
+
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
+
+LOCAL_MODULE := libelf
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif #cur_platform