diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index e2b28ee2c4d..e562c30235d 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-30  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	Work around for current cygwin32 build problems.
+	* config/i386/cygming-crtbegin.c (__register_frame_info,
+	__deregister_frame_info, _Jv_RegisterClasses): Compile weak default
+	functions only for 64-bit systems.
+
 2014-04-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config/i386/crtfastmath.c [!__x86_64__ && __sun__ && __svr4__]
diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c
index eeb51d4c573..195b4637637 100644
--- a/libgcc/config/i386/cygming-crtbegin.c
+++ b/libgcc/config/i386/cygming-crtbegin.c
@@ -54,6 +54,11 @@ extern void __register_frame_info (__attribute__((unused)) const void *,
 				   TARGET_ATTRIBUTE_WEAK;
 extern void *__deregister_frame_info (__attribute__((unused)) const void *)
 				      TARGET_ATTRIBUTE_WEAK;
+
+/* Work around for current cygwin32 build problems (Bug gas/16858).
+   Compile weak default functions only for 64-bit systems,
+   when absolutely necessary.  */
+#ifdef __x86_64__
 TARGET_ATTRIBUTE_WEAK void
 __register_frame_info (__attribute__((unused)) const void *p,
 		       __attribute__((unused)) struct object *o)
@@ -65,16 +70,19 @@ __deregister_frame_info (__attribute__((unused)) const void *p)
 {
   return (void*) 0;
 }
+#endif
 #endif /* DWARF2_UNWIND_INFO */
 
 #if TARGET_USE_JCR_SECTION
 extern void _Jv_RegisterClasses (__attribute__((unused)) const void *)
   TARGET_ATTRIBUTE_WEAK;
 
+#ifdef __x86_64__
 TARGET_ATTRIBUTE_WEAK void
 _Jv_RegisterClasses (__attribute__((unused)) const void *p)
 {
 }
+#endif
 #endif /* TARGET_USE_JCR_SECTION */
 
 #if defined(HAVE_LD_RO_RW_SECTION_MIXING)