From 4f16de34c2f531495992afc6ecaab46391b59ff8 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Tue, 24 Feb 2015 18:19:50 +0800 Subject: Fix build 1. revert https://android-review.googlesource.com/#/c/38591. 2. add a few constants from ToT 3. fix a typo about pthread_mutexattr_settype Change-Id: I55a829e7907658f920aedbf1100c6d9b1a93052b --- binutils-2.24/gold/gold-threads.cc | 2 +- binutils-2.25/bfd/elf32-arm.c | 6 ++++++ binutils-2.25/elfcpp/arm.h | 21 ++++++++++++++++++++- binutils-2.25/elfcpp/dwarf.h | 6 ++++++ binutils-2.25/gold/gold-threads.cc | 2 +- binutils-2.25/include/dwarf2.h | 6 ++++++ 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/binutils-2.24/gold/gold-threads.cc b/binutils-2.24/gold/gold-threads.cc index 2cb293e3..7f203a74 100644 --- a/binutils-2.24/gold/gold-threads.cc +++ b/binutils-2.24/gold/gold-threads.cc @@ -102,7 +102,7 @@ Lock_impl_threads::Lock_impl_threads() if (err != 0) gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err)); #ifdef PTHREAD_MUTEX_ADAPTIVE_NP - err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); + err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); if (err != 0) gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err)); #endif diff --git a/binutils-2.25/bfd/elf32-arm.c b/binutils-2.25/bfd/elf32-arm.c index 51745d26..c507e4fe 100644 --- a/binutils-2.25/bfd/elf32-arm.c +++ b/binutils-2.25/bfd/elf32-arm.c @@ -16214,6 +16214,11 @@ elf32_arm_get_synthetic_symtab (bfd *abfd, #define elf_backend_obj_attrs_order elf32_arm_obj_attrs_order #define elf_backend_obj_attrs_handle_unknown elf32_arm_obj_attrs_handle_unknown +#if 0 +/* Disable the following fix ported from https://android-review.googlesource.com/#/c/38591/1/binutils-2.21/bfd/elf32-arm.c + becaus elf32_arm_plt_entry isn't defined when FOUR_WORD_PLT isn't defined where elf32_arm_plt_entry_short + and elf32_arm_plt_entry_long are defined instead. + */ #undef elf_backend_plt_sym_val #define elf_backend_plt_sym_val elf32_arm_plt_sym_val @@ -16228,6 +16233,7 @@ elf32_arm_plt_sym_val (bfd_vma i, const asection *plt, ARRAY_SIZE(elf32_arm_plt0_entry) + ARRAY_SIZE(elf32_arm_plt_entry) * i); } +#endif #include "elf32-target.h" diff --git a/binutils-2.25/elfcpp/arm.h b/binutils-2.25/elfcpp/arm.h index 8c6b6bfd..b3336769 100644 --- a/binutils-2.25/elfcpp/arm.h +++ b/binutils-2.25/elfcpp/arm.h @@ -196,7 +196,8 @@ enum R_ARM_THM_TLS_DESCSEQ32 = 130,// Static Thumb32 // 131 - 139 Unallocated // 140 - 159 Dynamic Reserved for future allocation - // 160 - 255 Unallocated + R_ARM_IRELATIVE = 160, // Dynamic + // 161 - 255 Unallocated }; // e_flags values used for ARM. We only support flags defined in AAELF. @@ -340,6 +341,24 @@ enum AEABI_enum_forced_wide = 3 }; +// Values for Tag_ABI_FP_number_model. +enum +{ + AEABI_FP_number_model_none = 0, + AEABI_FP_number_model_ieee754_number = 1, + AEABI_FP_number_model_rtabi = 2, + AEABI_FP_number_model_ieee754_all = 3 +}; + +// Values for Tag_ABI_VFP_args. +enum +{ + AEABI_VFP_args_base = 0, + AEABI_VFP_args_vfp = 1, + AEABI_VFP_args_toolchain = 2, + AEABI_VFP_args_compatible = 3 +}; + // For Exception Index Table. (Exception handling ABI for the ARM // architectue, Section 5) enum diff --git a/binutils-2.25/elfcpp/dwarf.h b/binutils-2.25/elfcpp/dwarf.h index f7f30273..331ec40e 100644 --- a/binutils-2.25/elfcpp/dwarf.h +++ b/binutils-2.25/elfcpp/dwarf.h @@ -205,6 +205,12 @@ enum DW_LANG DW_LANG_Python = 0x0014, // DWARF 5. DW_LANG_Go = 0x0016, + DW_LANG_C_plus_plus_11 = 0x001a, + DW_LANG_C11 = 0x001d, + DW_LANG_C_plus_plus_14 = 0x0021, + DW_LANG_Fortran03 = 0x0022, + DW_LANG_Fortran08 = 0x0023, + DW_LANG_lo_user = 0x8000, // Implementation-defined range start. DW_LANG_hi_user = 0xffff, // Implementation-defined range start. // MIPS. diff --git a/binutils-2.25/gold/gold-threads.cc b/binutils-2.25/gold/gold-threads.cc index b06a908e..ff5a8acc 100644 --- a/binutils-2.25/gold/gold-threads.cc +++ b/binutils-2.25/gold/gold-threads.cc @@ -102,7 +102,7 @@ Lock_impl_threads::Lock_impl_threads() if (err != 0) gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err)); #ifdef PTHREAD_MUTEX_ADAPTIVE_NP - err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); + err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); if (err != 0) gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err)); #endif diff --git a/binutils-2.25/include/dwarf2.h b/binutils-2.25/include/dwarf2.h index 120e2c16..e05955ca 100644 --- a/binutils-2.25/include/dwarf2.h +++ b/binutils-2.25/include/dwarf2.h @@ -309,6 +309,12 @@ enum dwarf_source_language /* DWARF 5. */ DW_LANG_Go = 0x0016, + DW_LANG_C_plus_plus_11 = 0x001a, /* dwarf5.20141029.pdf DRAFT */ + DW_LANG_C11 = 0x001d, + DW_LANG_C_plus_plus_14 = 0x0021, + DW_LANG_Fortran03 = 0x0022, + DW_LANG_Fortran08 = 0x0023, + DW_LANG_lo_user = 0x8000, /* Implementation-defined range start. */ DW_LANG_hi_user = 0xffff, /* Implementation-defined range start. */ -- cgit v1.2.3