bfd/

	* elf32-ppc.c (has_tls_reloc, has_tls_get_addr_call, has_vle_insns,
	is_ppc_vle): Move to..
	* elf32-ppc.h: ..here, making is_ppc_vle a macro.
opcodes/
	* ppc_dis.c: Don't include elf/ppc.h.

5 files changed, 31 insertions, 23 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57db38c..62f5c1e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-17  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (has_tls_reloc, has_tls_get_addr_call, has_vle_insns,
+	is_ppc_vle): Move to..
+	* elf32-ppc.h: ..here, making is_ppc_vle a macro.
+
 2012-05-16  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* bfd-in.h (bfd_get_section_name, bfd_get_section_vma,
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index c0b0c14..0835a91 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -2094,26 +2094,6 @@ struct ppc_elf_obj_tdata
   (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
    && elf_object_id (bfd) == PPC32_ELF_DATA)
 
-/* Rename some of the generic section flags to better document how they
-   are used for ppc32.  */
-
-/* Nonzero if this section has TLS related relocations.  */
-#define has_tls_reloc sec_flg0
-
-/* Nonzero if this section has a call to __tls_get_addr.  */
-#define has_tls_get_addr_call sec_flg1
-
-/* Nonzero if this secs_tls_get_addr_calltion has the VLE bit set.  */
-#define has_vle_insns sec_flg2
-
-bfd_boolean
-is_ppc_vle (asection *sec)
-{
-  return (sec->owner != NULL
-	  && is_ppc_elf (sec->owner)
-	  && sec->has_vle_insns);
-}
-
 /* Override the generic function because we store some extras.  */
 
 static bfd_boolean
diff --git a/bfd/elf32-ppc.h b/bfd/elf32-ppc.h
index 502014d..9d1016c 100644
--- a/bfd/elf32-ppc.h
+++ b/bfd/elf32-ppc.h
@@ -1,5 +1,5 @@
 /* PowerPC-specific support for 64-bit ELF.
-   Copyright 2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright 2003, 2005, 2007, 2009, 2012 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -26,7 +26,26 @@ enum ppc_elf_plt_type
   PLT_VXWORKS
 };
 
-bfd_boolean is_ppc_vle (asection *);
+/* Rename some of the generic section flags to better document how they
+   are used for ppc32.  These macros should be private to elf32-ppc.c,
+   but opcodes/ppc-dis.c needs is_ppc_vle.  The flags are only valid
+   for ppc32 elf objects.  */
+
+/* Nonzero if this section has TLS related relocations.  */
+#define has_tls_reloc sec_flg0
+
+/* Nonzero if this section has a call to __tls_get_addr.  */
+#define has_tls_get_addr_call sec_flg1
+
+/* Nonzero if this section has the VLE bit set.  */
+#define has_vle_insns sec_flg2
+
+#define is_ppc_vle(SEC) \
+  ((SEC)->owner != NULL						\
+   && bfd_get_flavour ((SEC)->owner) == bfd_target_elf_flavour	\
+   && elf_object_id ((SEC)->owner) == PPC32_ELF_DATA		\
+   && (SEC)->has_vle_insns)
+
 int ppc_elf_select_plt_layout (bfd *, struct bfd_link_info *,
 			       enum ppc_elf_plt_type, int);
 asection *ppc_elf_tls_setup (bfd *, struct bfd_link_info *, int);
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6ea67fe..aecf15a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-17  Alan Modra  <amodra@gmail.com>
+
+	* ppc_dis.c: Don't include elf/ppc.h.
+
 2012-05-16  Meador Inge  <meadori@codesourcery.com>
 
 	* arm-dis.c (arm_opcodes): Don't disassemble STMFD/LDMIA sp!, {reg}
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 331a3a1..4792059 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -25,7 +25,6 @@
 #include "dis-asm.h"
 #include "elf-bfd.h"
 #include "elf32-ppc.h"
-#include "elf/ppc.h"
 #include "opintl.h"
 #include "opcode/ppc.h"