Re: Problem building powerpc-ibm-aix5.2.0 toolchain

[Alan Modra <amodra at gmail dot com>]

On Wed, May 16, 2012 at 05:33:32PM +0100, Nick Clifton wrote:
>   I can no longer build a powerpc-ibm-aix5.2.0 toolchain.  The problem
>   is:
> 
>      opcodes/ppc-dis.c:203: error: undefined reference to 'is_ppc_vle'

My fault.  I told James to put is_ppc_vle in elf32-ppc.c in an attempt
to keep the section flag usage private to elf32-ppc.c.  Looks like it
needs to escape or we go quite silly and make an elf backend function
just for powerpc.  Fixed like this.

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.

Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.311
diff -u -p -r1.311 elf32-ppc.c
--- bfd/elf32-ppc.c	14 May 2012 19:45:17 -0000	1.311
+++ bfd/elf32-ppc.c	17 May 2012 01:58:49 -0000
@@ -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
Index: bfd/elf32-ppc.h
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.h,v
retrieving revision 1.13
diff -u -p -r1.13 elf32-ppc.h
--- bfd/elf32-ppc.h	14 May 2012 19:45:18 -0000	1.13
+++ bfd/elf32-ppc.h	17 May 2012 01:58:49 -0000
@@ -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);
Index: opcodes/ppc-dis.c
===================================================================
RCS file: /cvs/src/src/opcodes/ppc-dis.c,v
retrieving revision 1.55
diff -u -p -r1.55 ppc-dis.c
--- opcodes/ppc-dis.c	14 May 2012 19:45:30 -0000	1.55
+++ opcodes/ppc-dis.c	17 May 2012 01:59:26 -0000
@@ -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"
 

-- 
Alan Modra
Australia Development Lab, IBM