* config/tc-ppc.c (md_pseudo_table): Warning fix.

	(ppc_cpu): Make it unsigned long to agree with struct powerpc_opcode
	flags.
	(ppc_size): Delete.
	(ppc_xcoff64): Rename to ppc_obj64.
	(md_parse_option <m>): Encode old ppc_size value in ppc_cpu.
	(ppc_set_cpu): Set PPC_OPCODE_32 too.
	(ppc_arch): Use ppc_obj64 instead of ppc_size to select bfd_mach_ppc64
	or bfd_mach_ppc.
	(ppc_target_format): Use ppc_obj64 to select format.
	(md_begin): Adjust for PPC_OPCODE_32/64 in ppc_cpu.
	(ppc_insert_operand): Use ppc_obj64 instead of ppc_size.
	(ppc_elf_suffix): Likewise.  Don't depend on BFD_DEFAULT_TARGET_SIZE.
	(tc_frob_symbol): Likewise.
	(md_assemble): Use ppc_obj64 instead of ppc_size.  Don't depend on
	BFD_DEFAULT_TARGET_SIZE.
	(ppc_tc): Likewise.
	(ppc_is_toc_sym): Likewise.
	(md_apply_fix3): Likewise.
	* config/tc-ppc.h (TC_FORCE_RELOCATION): Don't depend on
	BFD_DEFAULT_TARGET_SIZE.
	(ELF_TC_SPECIAL_SECTIONS): Likewise.
	(tc_frob_symbol): Likewise.

1 files changed, 11 insertions, 18 deletions

diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h
index da68020d35..f05f8e7a08 100644
--- a/gas/config/tc-ppc.h
+++ b/gas/config/tc-ppc.h
@@ -219,8 +219,7 @@ do {								\
  || (FIXP)->fx_r_type == BFD_RELOC_PPC_B16_BRNTAKEN			\
  || (FIXP)->fx_r_type == BFD_RELOC_PPC_BA16_BRTAKEN			\
  || (FIXP)->fx_r_type == BFD_RELOC_PPC_BA16_BRNTAKEN			\
- || (BFD_DEFAULT_TARGET_SIZE == 64					\
-     && (FIXP)->fx_r_type == BFD_RELOC_PPC64_TOC)			\
+ || (FIXP)->fx_r_type == BFD_RELOC_PPC64_TOC				\
  || (FIXP)->fx_r_type == BFD_RELOC_VTABLE_INHERIT			\
  || (FIXP)->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
 
@@ -240,24 +239,20 @@ extern int ppc_section_flags PARAMS ((int, int, int));
 #define md_elf_section_word(STR, LEN)		ppc_section_word (STR, LEN)
 #define md_elf_section_flags(FLAGS, ATTR, TYPE)	ppc_section_flags (FLAGS, ATTR, TYPE)
 
-#if BFD_DEFAULT_TARGET_SIZE == 64
-/* Extra sections for 64-bit ELF PPC.  */
-#define ELF_TC_SPECIAL_SECTIONS \
-  { ".toc",		SHT_PROGBITS,	SHF_ALLOC + SHF_WRITE}, \
-  { ".tocbss",		SHT_NOBITS,	SHF_ALLOC + SHF_WRITE},
-#else
 /* Add extra PPC sections -- Note, for now, make .sbss2 and .PPC.EMB.sbss0 a
    normal section, and not a bss section so that the linker doesn't crater
    when trying to make more than 2 sections.  */
 #define ELF_TC_SPECIAL_SECTIONS \
-  { ".tags",		SHT_ORDERED,	SHF_ALLOC }, \
-  { ".sdata",		SHT_PROGBITS,	SHF_ALLOC + SHF_WRITE }, \
-  { ".sbss",		SHT_NOBITS,	SHF_ALLOC + SHF_WRITE }, \
-  { ".sdata2",		SHT_PROGBITS,	SHF_ALLOC }, \
-  { ".sbss2",		SHT_PROGBITS,	SHF_ALLOC }, \
-  { ".PPC.EMB.sdata0",	SHT_PROGBITS,	SHF_ALLOC }, \
-  { ".PPC.EMB.sbss0",	SHT_PROGBITS,	SHF_ALLOC },
-#endif
+  { ".tags",		SHT_ORDERED,	SHF_ALLOC },			\
+  { ".sdata",		SHT_PROGBITS,	SHF_ALLOC + SHF_WRITE },	\
+  { ".sbss",		SHT_NOBITS,	SHF_ALLOC + SHF_WRITE },	\
+  { ".sdata2",		SHT_PROGBITS,	SHF_ALLOC },			\
+  { ".sbss2",		SHT_PROGBITS,	SHF_ALLOC },			\
+  { ".PPC.EMB.sdata0",	SHT_PROGBITS,	SHF_ALLOC },			\
+  { ".PPC.EMB.sbss0",	SHT_PROGBITS,	SHF_ALLOC },			\
+  /* Extra sections for 64-bit ELF PPC.  */				\
+  { ".toc",		SHT_PROGBITS,	SHF_ALLOC + SHF_WRITE},		\
+  { ".tocbss",		SHT_NOBITS,	SHF_ALLOC + SHF_WRITE},
 
 #define tc_comment_chars ppc_comment_chars
 extern const char *ppc_comment_chars;
@@ -276,11 +271,9 @@ extern int ppc_fix_adjustable PARAMS ((struct fix *));
        && S_IS_DEFINED ((FIX)->fx_addsy) \
        && ! S_IS_COMMON ((FIX)->fx_addsy)))
 
-#if BFD_DEFAULT_TARGET_SIZE == 64
 /* Finish up the symbol.  */
 #define tc_frob_symbol(sym, punt) punt = ppc_elf_frob_symbol (sym)
 extern int ppc_elf_frob_symbol PARAMS ((symbolS *));
-#endif
 
 #define DWARF2_LINE_MIN_INSN_LENGTH 4
 #endif /* OBJ_ELF */