diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6458ccfba45126082602a53ecf66859d98cc82bd..e0d9563d4947e8837615d70bf5de6cf79967cd04 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+2009-06-18 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ Merge cegcc and mingw32ce target name changes from CeGCC project.
+
+ 2007-12-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * config.bfd: Add arm*-*-cegcc* target.
+
+ 2007-12-17 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * config.bfd: Add arm-*-mingw32ce* target.
+
2009-06-17 H.J. Lu <hongjiu.lu@intel.com>
* elf-bfd.h (_bfd_elf_allocate_ifunc_dyn_relocs): New.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 0d042d78db6eb7de0be029f47fe051e9731c5f9a..990e1b708a14dce97388cdc8d52fc0bd87796117 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -243,7 +243,7 @@ case "${targ}" in
targ_underscore=no
targ_cflags=-DARM_COFF_BUGFIX
;;
- arm-wince-pe | arm-*-wince | arm-*-mingw32ce*)
+ arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
targ_defvec=arm_wince_pe_little_vec
targ_selvecs="arm_wince_pe_little_vec arm_wince_pe_big_vec arm_wince_pei_little_vec arm_wince_pei_big_vec"
targ_underscore=no
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e008e955ef71987da256215e299924f2e175ffe8..f7974f706efeed4421b18ddc7b098210b642f4fd 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-18 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ Merge cegcc and mingw32ce target name changes from CeGCC project.
+
+ 2007-12-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * configure.in: Add arm*-*-cegcc* and arm*-*-mingw32ce* targets.
+ * configure: Regenerate.
+
2009-06-15 Nick Clifton <nickc@redhat.com>
PR 10263
diff --git a/binutils/configure b/binutils/configure
index 09ca5996cd13b9845f807535499b3fff44ece1fa..5911d59d1608239210d82ee3a1816246ff7dc9a3 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -16133,7 +16133,7 @@ do
BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
;;
- arm-wince-pe* | arm-*-wince)
+ arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
if test -z "$DLLTOOL_DEFAULT"; then
DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
diff --git a/binutils/configure.in b/binutils/configure.in
index 6f9b3d022ffaea9a6af54ce77927b707fa16cb2b..9938030b98a2872e2ec24f921eee01582859b343 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -287,7 +287,7 @@ changequote([,])dnl
BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
;;
- arm-wince-pe* | arm-*-wince)
+ arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
if test -z "$DLLTOOL_DEFAULT"; then
DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
diff --git a/gas/ChangeLog b/gas/ChangeLog
index ed478c63d69bc978348f45acb248ef16261a0f1c..94d8ce3fa6d3fa509095bdc31823a81c4d9501eb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2009-06-18 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ Merge cegcc and mingw32ce target name changes from CeGCC project.
+
+ 2007-12-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * configure.tgt: Add arm*-*-cegcc* target.
+
+ 2007-12-17 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * configure.tgt: Add arm-*-mingw32ce* target.
+
2009-06-16 Maciej W. Rozycki <macro@linux-mips.org>
* config/tc-vax.c (md_estimate_size_before_relax): Accept
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 9d722ed378f55c5904dfa5391c8439cff708897d..1991072f048b5fbf55300fd66cd6ef5639cef0a9 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -121,7 +121,8 @@ case ${generic_target} in
arm-*-*n*bsd*) fmt=aout em=nbsd ;;
arm-*-nto*) fmt=elf ;;
arm-epoc-pe | thumb-epoc-pe) fmt=coff em=epoc-pe ;;
- arm-wince-pe | arm-*-wince) fmt=coff em=wince-pe ;;
+ arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
+ fmt=coff em=wince-pe ;;
arm-*-pe | thumb-*-pe) fmt=coff em=pe ;;
arm-*-riscix*) fmt=aout em=riscix ;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a6f3e50f642dcc932b422e3a596e05310c37a102..b267a8520379dbda94a383944bc0023afc4f8b7b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,20 @@
+2009-06-18 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ Merge cegcc and mingw32ce target name changes from CeGCC project.
+
+ 2008-09-24 Pedro Alves <pedroalves@users.sourceforge.net>
+
+ * configure.tgt (arm*-*-cegcc*): Set LIB_PATH to
+ ${tooldir}/lib/w32api.
+
+ 2007-12-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * configure.tgt: Add arm*-*-cegcc* target.
+
+ 2007-12-17 Pedro Alves <pedro_alves@portugalmail.pt>
+
+ * configure.tgt: Add arm-*-mingw32ce* target.
+
2009-06-10 Philip Blundell <philb@gnu.org>
* emultempl/armelf.em (gld${EMULATION_NAME}_finish): Avoid crash
diff --git a/ld/configure.tgt b/ld/configure.tgt
index ebe3f236ff65556da71427b51c324f420599eaab..107126279073c54f272edac2037919415ab82eb9 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -44,7 +44,10 @@ alpha*-*-openbsd*) targ_emul=elf64alpha
arc-*-elf*) targ_emul=arcelf
;;
arm-epoc-pe) targ_emul=arm_epoc_pe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
-arm-wince-pe | arm-*-wince) targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+arm*-*-cegcc*) targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o"
+ LIB_PATH='${tooldir}/lib/w32api' ;;
+arm-wince-pe | arm-*-wince | arm*-*-mingw32ce*)
+ targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
arm-*-pe) targ_emul=armpe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;;
arm-*-aout | armel-*-aout) targ_emul=armaoutl ;;
armeb-*-aout) targ_emul=armaoutb ;;