From 4aeae20f19ca95e398d43355b1fea865baf9b379 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Fri, 16 Dec 2011 13:39:02 +0000 Subject: [PATCH] 2011-12-16 Shinichiro Hamaji * mach-o-i386.c (TARGET_PRIORITY): Define as 0 (top priority) * mach-o-target.c (TARGET_NAME): Use TARGET_PRIORITY * mach-o-x86-64.c (TARGET_PRIORITY): Define as 0 (top priority) * mach-o.c (bfd_mach_o_header_p): Remove special handling for mach-o-i386. (TARGET_PRIORITY) Set 1 for mach-o-be and mach-o-le, and set 0 for mach-o-fat. --- bfd/ChangeLog | 10 ++++++++++ bfd/mach-o-i386.c | 1 + bfd/mach-o-target.c | 2 +- bfd/mach-o-x86-64.c | 1 + bfd/mach-o.c | 17 ++++++----------- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2cc2bc716..f017209e8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2011-12-16 Shinichiro Hamaji + + * mach-o-i386.c (TARGET_PRIORITY): Define as 0 (top priority) + * mach-o-target.c (TARGET_NAME): Use TARGET_PRIORITY + * mach-o-x86-64.c (TARGET_PRIORITY): Define as 0 (top priority) + * mach-o.c (bfd_mach_o_header_p): Remove special handling for + mach-o-i386. + (TARGET_PRIORITY) Set 1 for mach-o-be and mach-o-le, and set 0 for + mach-o-fat. + 2011-12-15 Kevin Buettner * elf32-am33lin.c (elf32_am33lin_grok_prstatus): Add case diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c index c5e38843d..3dadcb827 100644 --- a/bfd/mach-o-i386.c +++ b/bfd/mach-o-i386.c @@ -347,4 +347,5 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] = #define TARGET_ARCHITECTURE bfd_arch_i386 #define TARGET_BIG_ENDIAN 0 #define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 0 #include "mach-o-target.c" diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c index c91584c70..4aeb920d2 100644 --- a/bfd/mach-o-target.c +++ b/bfd/mach-o-target.c @@ -118,7 +118,7 @@ const bfd_target TARGET_NAME = '_', /* symbol_leading_char. */ ' ', /* ar_pad_char. */ 16, /* ar_max_namelen. */ - 0, /* match priority. */ + TARGET_PRIORITY, /* match priority. */ #if TARGET_BIG_ENDIAN bfd_getb64, bfd_getb_signed_64, bfd_putb64, diff --git a/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c index 1bc3bf8cd..c86efb71a 100644 --- a/bfd/mach-o-x86-64.c +++ b/bfd/mach-o-x86-64.c @@ -294,4 +294,5 @@ bfd_mach_o_x86_64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, #define TARGET_ARCHITECTURE bfd_arch_i386 #define TARGET_BIG_ENDIAN 0 #define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 0 #include "mach-o-target.c" diff --git a/bfd/mach-o.c b/bfd/mach-o.c index 325cf6132..dca86013d 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -3261,17 +3261,6 @@ bfd_mach_o_header_p (bfd *abfd, if (header.cputype != cputype) goto wrong; } - else - { - switch (header.cputype) - { - case BFD_MACH_O_CPU_TYPE_I386: - /* Handled by mach-o-i386 */ - goto wrong; - default: - break; - } - } if (filetype) { if (header.filetype != filetype) @@ -3802,6 +3791,7 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd) #define TARGET_ARCHITECTURE bfd_arch_unknown #define TARGET_BIG_ENDIAN 1 #define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 1 #include "mach-o-target.c" #undef TARGET_NAME @@ -3809,12 +3799,14 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd) #undef TARGET_ARCHITECTURE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY #define TARGET_NAME mach_o_le_vec #define TARGET_STRING "mach-o-le" #define TARGET_ARCHITECTURE bfd_arch_unknown #define TARGET_BIG_ENDIAN 0 #define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 1 #include "mach-o-target.c" @@ -3823,6 +3815,7 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd) #undef TARGET_ARCHITECTURE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY /* Not yet handled: creating an archive. */ #define bfd_mach_o_mkarchive _bfd_noarchive_mkarchive @@ -3844,6 +3837,7 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd) #define TARGET_ARCHITECTURE bfd_arch_unknown #define TARGET_BIG_ENDIAN 1 #define TARGET_ARCHIVE 1 +#define TARGET_PRIORITY 0 #include "mach-o-target.c" @@ -3852,3 +3846,4 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd) #undef TARGET_ARCHITECTURE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY -- 2.11.4.GIT