binutils/

	* dlltool.c (INIT_SEC_DATA): Move.
	(secdata <DLLTOOL_PPC>): Use here too.
binutils/testsuite/
	* binutils-all/copy-3.d: Exclude all cygwin and mingw targets,
	and rs6000.
gas/
	* config/tc-ppc.c (ppc_znop): Remove unused vars.
ld/
	* configure.tgt (powerpcle-pe,winnt,cygwin): Add deffilep.o
	and pe-dll.o.

8 files changed, 35 insertions, 21 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b6500328d..8286e5a06 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-29  Alan Modra  <amodra@gmail.com>
+
+	* dlltool.c (INIT_SEC_DATA): Move.
+	(secdata <DLLTOOL_PPC>): Use here too.
+
 2012-10-26  Nick Clifton  <nickc@redhat.com>
 
 	* po/hr.po: New Croation translation.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 8d458d764..0da0011e1 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -2278,6 +2278,9 @@ typedef struct
   unsigned char *data;
 } sinfo;
 
+#define INIT_SEC_DATA(id, name, flags, align) \
+        { id, name, flags, align, NULL, NULL, NULL, 0, NULL }
+
 #ifndef DLLTOOL_PPC
 
 #define TEXT 0
@@ -2295,8 +2298,6 @@ typedef struct
 #define DATA_SEC_FLAGS   (SEC_ALLOC | SEC_LOAD | SEC_DATA)
 #define BSS_SEC_FLAGS     SEC_ALLOC
 
-#define INIT_SEC_DATA(id, name, flags, align) \
-        { id, name, flags, align, NULL, NULL, NULL, 0, NULL }
 static sinfo secdata[NSECS] =
 {
   INIT_SEC_DATA (TEXT,   ".text",    TEXT_SEC_FLAGS,   2),
@@ -2326,15 +2327,15 @@ static sinfo secdata[NSECS] =
 
 static sinfo secdata[NSECS] =
 {
-  { TEXT,   ".text",    SEC_CODE | SEC_HAS_CONTENTS, 3},
-  { PDATA,  ".pdata",   SEC_HAS_CONTENTS,            2},
-  { RDATA,  ".reldata", SEC_HAS_CONTENTS,            2},
-  { IDATA5, ".idata$5", SEC_HAS_CONTENTS,            2},
-  { IDATA4, ".idata$4", SEC_HAS_CONTENTS,            2},
-  { IDATA6, ".idata$6", SEC_HAS_CONTENTS,            1},
-  { IDATA7, ".idata$7", SEC_HAS_CONTENTS,            2},
-  { DATA,   ".data",    SEC_DATA,                    2},
-  { BSS,    ".bss",     0,                           2}
+  INIT_SEC_DATA (TEXT,   ".text",    SEC_CODE | SEC_HAS_CONTENTS, 3),
+  INIT_SEC_DATA (PDATA,  ".pdata",   SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (RDATA,  ".reldata", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS,            1),
+  INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS,            2),
+  INIT_SEC_DATA (DATA,   ".data",    SEC_DATA,                    2),
+  INIT_SEC_DATA (BSS,    ".bss",     0,                           2)
 };
 
 #endif
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 6745baa97..229b2844b 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-29  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/copy-3.d: Exclude all cygwin and mingw targets,
+	and rs6000.
+
 2012-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* binutils-all/ar.exp (bfdtest1): Remove findfile.
diff --git a/binutils/testsuite/binutils-all/copy-3.d b/binutils/testsuite/binutils-all/copy-3.d
index 551517cea..655986af5 100644
--- a/binutils/testsuite/binutils-all/copy-3.d
+++ b/binutils/testsuite/binutils-all/copy-3.d
@@ -3,7 +3,7 @@
 #objcopy: --set-section-flags .text=alloc,data
 #name: copy with setting section flags 3
 #source: bintest.s
-#not-target: *-*-*aout *-*-*pe *-*-*coff hppa*-*-hpux* i*86-*-cygwin* i*86-*-mingw32* m68k-*-netbsd m68k-*-openbsd* ns32k-*-netbsd x86_64-*-mingw*
+#not-target: *-*-*aout *-*-*pe *-*-*coff hppa*-*-hpux* *-*-cygwin* *-*-mingw* m68k-*-netbsd m68k-*-openbsd* ns32k-*-netbsd rs6000-*-*
 # The .text # section in PE/COFF has a fixed set of flags and these
 # cannot be changed.  We skip it for them.
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7b85c7cf5..deefdd662 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-29  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-ppc.c (ppc_znop): Remove unused vars.
+
 2012-10-26  Alan Modra  <amodra@gmail.com>
 
 	PR target/14758
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 62c4791b2..0f8da736d 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -4887,8 +4887,6 @@ ppc_set_current_section (segT new)
 static void
 ppc_previous (int ignore ATTRIBUTE_UNUSED)
 {
-  symbolS *tmp;
-
   if (ppc_previous_section == NULL)
     {
       as_warn (_("no previous section to return to, ignored."));
@@ -5060,15 +5058,11 @@ ppc_znop (int ignore ATTRIBUTE_UNUSED)
 {
   unsigned long insn;
   const struct powerpc_opcode *opcode;
-  expressionS ex;
   char *f;
   symbolS *sym;
   char *symbol_name;
   char c;
   char *name;
-  unsigned int exp;
-  flagword flags;
-  asection *sec;
 
   /* Strip out the symbol name.  */
   symbol_name = input_line_pointer;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4c37e0130..95e4e5835 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-29  Alan Modra  <amodra@gmail.com>
+
+	* configure.tgt (powerpcle-pe,winnt,cygwin): Add deffilep.o
+	and pe-dll.o.
+
 2012-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld.h (command_line): Remove
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 8d4c3490d..0e62b52ab 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -559,9 +559,9 @@ powerpcle-*-nto*)       targ_emul=elf32lppcnto ;;
 powerpc-*-rtems*)	targ_emul=elf32ppc ;;
 powerpc-*-macos*)	targ_emul=ppcmacos ;;
 powerpc-*-netware*)	targ_emul=ppcnw ;;
-powerpcle-*-pe)         targ_emul=ppcpe ;;
-powerpcle-*-winnt*)     targ_emul=ppcpe ;;
-powerpcle-*-cygwin*)    targ_emul=ppcpe ;;
+powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*)
+			targ_emul=ppcpe
+			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 powerpc-*-aix[5-9]*)	targ_emul=aix5ppc ;;
 powerpc-*-aix*)		targ_emul=aixppc ;;
 powerpc-*-beos*)	targ_emul=aixppc ;;