[PATCH] Work around for current Cygwin-32 Build problems

[PATCH] Work around for current Cygwin-32 Build problems

[Bernd Edlinger]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

Hi,

due to a defect in the currently available binutils-2.24 and earlier, it is not possible
to boot-strap GCC 4.9.0 and trunk with certain widely used configurations for Cygwin-32 environment.
See PR 60830 for details.

Boot-Strapped on x86-64-cygwin and i686-pc-cygwin with binutils-2.24.

OK for trunk and 4.9 branch?


Thanks
Bernd.
 		 	   		  

[-- Attachment #2: changelog-pr60830.txt --]
[-- Type: text/plain, Size: 314 bytes --]

2014-04-30  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	Work around for current cygwin32 build problems (Bug gas/16858).
	* config/i386/cygming-crtbegin.c (__register_frame_info,
	__deregister_frame_info, _Jv_RegisterClasses): Compile weak default
	functions only for 64-bit systems, when absolutely necessary.


[-- Attachment #3: patch-pr60830.diff --]
[-- Type: application/octet-stream, Size: 900 bytes --]

--- libgcc/config/i386/cygming-crtbegin.c	2014-01-02 23:25:22.000000000 +0100
+++ libgcc/config/i386/cygming-crtbegin.c	2014-04-30 13:26:03.512695300 +0200
@@ -54,6 +54,7 @@
 				   TARGET_ATTRIBUTE_WEAK;
 extern void *__deregister_frame_info (__attribute__((unused)) const void *)
 				      TARGET_ATTRIBUTE_WEAK;
+#ifdef __x86_64__
 TARGET_ATTRIBUTE_WEAK void
 __register_frame_info (__attribute__((unused)) const void *p,
 		       __attribute__((unused)) struct object *o)
@@ -65,16 +66,19 @@
 {
   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)

Re: [PATCH] Work around for current Cygwin-32 Build problems

[Kai Tietz]

2014-04-30 14:01 GMT+02:00 Bernd Edlinger <bernd.edlinger@hotmail.de>:
> Hi,
>
> due to a defect in the currently available binutils-2.24 and earlier, it is not possible
> to boot-strap GCC 4.9.0 and trunk with certain widely used configurations for Cygwin-32 environment.
> See PR 60830 for details.
>
> Boot-Strapped on x86-64-cygwin and i686-pc-cygwin with binutils-2.24.
>
> OK for trunk and 4.9 branch?
>
>
> Thanks
> Bernd.
>

Yes,  please apply.

THanks,
Kai

Re: [PATCH] Work around for current Cygwin-32 Build problems

[Rainer Orth]

Bernd Edlinger <bernd.edlinger@hotmail.de> writes:

> 2014-04-30  Bernd Edlinger  <bernd.edlinger@hotmail.de>
>
> 	Work around for current cygwin32 build problems (Bug gas/16858).
> 	* config/i386/cygming-crtbegin.c (__register_frame_info,
> 	__deregister_frame_info, _Jv_RegisterClasses): Compile weak default
> 	functions only for 64-bit systems, when absolutely necessary.

The reference and rationale for the change should go into
cygmin-crtbegin.c, not the ChangeLog.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

RE: [PATCH] Work around for current Cygwin-32 Build problems

[Bernd Edlinger]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Hi Rainer,



On Wed, 30 Apr 2014 14:10:48, Rainer Orth wrote:
>
> Bernd Edlinger <bernd.edlinger@hotmail.de> writes:
>
>> 2014-04-30 Bernd Edlinger <bernd.edlinger@hotmail.de>
>>
>> Work around for current cygwin32 build problems (Bug gas/16858).
>> * config/i386/cygming-crtbegin.c (__register_frame_info,
>> __deregister_frame_info, _Jv_RegisterClasses): Compile weak default
>> functions only for 64-bit systems, when absolutely necessary.
>
> The reference and rationale for the change should go into
> cygmin-crtbegin.c, not the ChangeLog.
>

Yes, that's better of course. Thanks.
I am going to apply the patch with the updated comment in the evening.

Regards
Bernd.


 		 	   		  

[-- Attachment #2: changelog-pr60830.txt --]
[-- Type: text/plain, Size: 271 bytes --]

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.

RE: [PATCH] Work around for current Cygwin-32 Build problems

[Bernd Edlinger]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

Opps...

this time with the attachment.

>
> Hi Rainer,
>
>
>
> On Wed, 30 Apr 2014 14:10:48, Rainer Orth wrote:
>>
>> Bernd Edlinger <bernd.edlinger@hotmail.de> writes:
>>
>>> 2014-04-30 Bernd Edlinger <bernd.edlinger@hotmail.de>
>>>
>>> Work around for current cygwin32 build problems (Bug gas/16858).
>>> * config/i386/cygming-crtbegin.c (__register_frame_info,
>>> __deregister_frame_info, _Jv_RegisterClasses): Compile weak default
>>> functions only for 64-bit systems, when absolutely necessary.
>>
>> The reference and rationale for the change should go into
>> cygmin-crtbegin.c, not the ChangeLog.
>>
>
> Yes, that's better of course. Thanks.
> I am going to apply the patch with the updated comment in the evening.
>
> Regards
> Bernd.
>
>
>
 		 	   		  

[-- Attachment #2: patch-pr60830.diff --]
[-- Type: application/octet-stream, Size: 1067 bytes --]

--- libgcc/config/i386/cygming-crtbegin.c	2014-01-02 23:25:22.000000000 +0100
+++ libgcc/config/i386/cygming-crtbegin.c	2014-04-30 14:52:32.205027179 +0200
@@ -54,6 +54,11 @@
 				   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 @@
 {
   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)

[-- Attachment #3: changelog-pr60830.txt --]
[-- Type: text/plain, Size: 271 bytes --]

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.