X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-ppc.c;h=567e3c6aea01770f1a60ef18fab1799422564d5e;hb=1cfc59d51f4eb450dbc8acf4ec0e1c636662030b;hp=560622b15c7757b67d6f8a5995a05a8f7106cc4b;hpb=23e1d84c9a1315d25ad966475de74d49cffc725d;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 560622b15c..567e3c6aea 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1137,7 +1137,11 @@ ppc_target_format ()
 #elif TE_POWERMAC
   return "xcoff-powermac";
 #else
-  return ppc_xcoff64 ? "aixcoff64-rs6000" : "aixcoff-rs6000";
+#  ifdef TE_AIX5
+    return (ppc_xcoff64 ? "aix5coff64-rs6000" : "aixcoff-rs6000");
+#  else
+    return (ppc_xcoff64 ? "aixcoff64-rs6000" : "aixcoff-rs6000");
+#  endif
 #endif
 #endif
 #ifdef OBJ_ELF
@@ -1374,7 +1378,7 @@ ppc_elf_suffix (str_p, exp_p)
     MAP ("plt@h",	(int) BFD_RELOC_HI16_PLTOFF),
     MAP ("plt@ha",	(int) BFD_RELOC_HI16_S_PLTOFF),
     MAP ("sdarel",	(int) BFD_RELOC_GPREL16),
-    MAP ("sectoff",	(int) BFD_RELOC_32_BASEREL),
+    MAP ("sectoff",	(int) BFD_RELOC_16_BASEREL),
     MAP ("sectoff@l",	(int) BFD_RELOC_LO16_BASEREL),
     MAP ("sectoff@h",	(int) BFD_RELOC_HI16_BASEREL),
     MAP ("sectoff@ha",	(int) BFD_RELOC_HI16_S_BASEREL),
@@ -1683,7 +1687,7 @@ ppc_elf_validate_fix (fixp, seg)
 	  && fixp->fx_r_type != BFD_RELOC_HI16_GOTOFF
 	  && fixp->fx_r_type != BFD_RELOC_LO16_GOTOFF
 	  && fixp->fx_r_type != BFD_RELOC_HI16_S_GOTOFF
-	  && fixp->fx_r_type != BFD_RELOC_32_BASEREL
+	  && fixp->fx_r_type != BFD_RELOC_16_BASEREL
 	  && fixp->fx_r_type != BFD_RELOC_LO16_BASEREL
 	  && fixp->fx_r_type != BFD_RELOC_HI16_BASEREL
 	  && fixp->fx_r_type != BFD_RELOC_HI16_S_BASEREL
@@ -2236,7 +2240,7 @@ md_assemble (str)
 		case BFD_RELOC_LO16_PLTOFF:
 		  reloc = BFD_RELOC_PPC64_PLT16_LO_DS;
 		  break;
-		case BFD_RELOC_32_BASEREL:
+		case BFD_RELOC_16_BASEREL:
 		  reloc = BFD_RELOC_PPC64_SECTOFF_DS;
 		  break;
 		case BFD_RELOC_LO16_BASEREL:
@@ -5280,7 +5284,6 @@ md_apply_fix3 (fixP, valP, seg)
 
 	case BFD_RELOC_RVA:
 	case BFD_RELOC_32_PCREL:
-	case BFD_RELOC_32_BASEREL:
 	case BFD_RELOC_PPC_EMB_NADDR32:
 	  md_number_to_chars (fixP->fx_frag->fr_literal + fixP->fx_where,
 			      value, 4);
@@ -5305,6 +5308,7 @@ md_apply_fix3 (fixP, valP, seg)
 	case BFD_RELOC_LO16_GOTOFF:
 	case BFD_RELOC_HI16_GOTOFF:
 	case BFD_RELOC_HI16_S_GOTOFF:
+	case BFD_RELOC_16_BASEREL:
 	case BFD_RELOC_LO16_BASEREL:
 	case BFD_RELOC_HI16_BASEREL:
 	case BFD_RELOC_HI16_S_BASEREL: