[68879] trunk/dports/lang/gcc46

ryandesign at macports.org ryandesign at macports.org
Wed Jun 16 14:50:42 PDT 2010


Revision: 68879
          http://trac.macports.org/changeset/68879
Author:   ryandesign at macports.org
Date:     2010-06-16 14:50:40 -0700 (Wed, 16 Jun 2010)
Log Message:
-----------
gcc46: update to 4.6-20100612 (thus causing a rebuild following the mpfr update; see #25258) which includes a version of the patch we previously had in tls_configure_fix.diff, and introduces a new bug which is patched using another upstream fix in patch-160729.diff. Also renamed aotcompile.py and classfile.py as was already done in gcc44 and gcc45; see #16410.

Modified Paths:
--------------
    trunk/dports/lang/gcc46/Portfile

Added Paths:
-----------
    trunk/dports/lang/gcc46/files/patch-160729.diff

Removed Paths:
-------------
    trunk/dports/lang/gcc46/files/tls_configure_fix.diff

Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile	2010-06-16 21:43:46 UTC (rev 68878)
+++ trunk/dports/lang/gcc46/Portfile	2010-06-16 21:50:40 UTC (rev 68879)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			gcc46
-version			4.6-20100605
+version			4.6-20100612
 platforms		darwin
 categories		lang
 maintainers		mww
@@ -33,25 +33,25 @@
 extract.only		${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
 
 checksums           gcc-core-${version}.tar.bz2 \
-                    md5     d7d0f9c790971cdc0adb0ba49ecedaf6 \
-                    sha1    0fe47cc0bc568d46421bee44f3a0df3b2e245cc1 \
-                    rmd160  b142243ec63556c5070ffb0f7da60e8d35a22038 \
+                    md5     3f666a86055db21afb6c7795716cd2aa \
+                    sha1    0aa824acf6fd105c6002bc19477664eec134e7e1 \
+                    rmd160  134ef49f47c06b0f56fc79a86b71a4ce38ef12ef \
                     gcc-fortran-${version}.tar.bz2 \
-                    md5     7ec02efa15cbefc8d68ef2a261c9e7fc \
-                    sha1    7d178372332e991432a93d82513da2bab9ea53c4 \
-                    rmd160  0492921259b940d4a39a010e3f7c893df35c5ddd \
+                    md5     89f58cfaf6c6986c274a2f08aa1fbb86 \
+                    sha1    fffc489ca1db449bcdad36bf9b4a79652044d5e0 \
+                    rmd160  0eece241bc6dca75a3edcdf73e2c8753239501c2 \
                     gcc-g++-${version}.tar.bz2 \
-                    md5     e92e0bcbc915b3ca1a7c7b6e3d82ed07 \
-                    sha1    9bd89fe21472c71ca7a7955cabf8813872b5663f \
-                    rmd160  fe2c6eff683507be825ae45198ff1d84e21839ad \
+                    md5     4b2957634967f1d452b52c39d2b32cf7 \
+                    sha1    6a959b1701d5f0a71ef334b940ff900e2355fa97 \
+                    rmd160  fbfe2bb919d234324243ffe606c798aef9fe332b \
                     gcc-java-${version}.tar.bz2 \
-                    md5     b48455d9eab4b2fb8c6696e571d3ecc3 \
-                    sha1    d0715e9b78418945ff0ba3a4a1da8116d2d8fd13 \
-                    rmd160  61c23146727213fd05a647463e0ec1c8e8e73452 \
+                    md5     fdd1c0118cfb7221c626a686cf50bf39 \
+                    sha1    d08eaff598de4e5a44a8775585d9580347aab247 \
+                    rmd160  2ada408b7722cb3505d4e26f98ba6b7907d198d6 \
                     gcc-objc-${version}.tar.bz2 \
-                    md5     a1102de51a7fd9c98f4c6aa797dfa883 \
-                    sha1    6dd1bc286a535936c84a0e1532b2034881d09ae1 \
-                    rmd160  d58496f1bcd1fbf34cb753ceb9a24f5fdf75cd2b \
+                    md5     6d029df100d44318d0a47e074a810010 \
+                    sha1    43404e2cf526f39e5afc954f8d61dc47d0c16468 \
+                    rmd160  c7b1b2ad8c44e583347bebd7a4e0d7c1ea87afc5 \
                     ${ecj} \
                     md5     d7cd6a27c8801e66cbaa964a039ecfdb \
                     sha1    58c1d79c64c8cd718550f32a932ccfde8d1e6449 \
@@ -64,7 +64,8 @@
 
 depends_lib		port:gmp port:mpfr port:libiconv port:libmpc
 
-patchfiles		tls_configure_fix.diff
+patchfiles		patch-160729.diff
+patch.pre_args	-p1
 patch.dir		${workpath}/gcc-${version}
 
 set major		4.6
@@ -149,6 +150,12 @@
 	description "Enables Java/gcj; this language will be enabled in the final version - this variant is completely untested!" {
 	configure.args-delete --enable-languages=c,c++,objc,obj-c++
 	configure.args-append --enable-languages=c,c++,objc,obj-c++,java
+	post-destroot {
+		file rename ${destroot}${prefix}/share/python/aotcompile.py \
+			${destroot}${prefix}/share/python/aotcompile-46.py
+		file rename ${destroot}${prefix}/share/python/classfile.py \
+			${destroot}${prefix}/share/python/classfile-46.py
+	}
 }
 
 livecheck.type	regex

Added: trunk/dports/lang/gcc46/files/patch-160729.diff
===================================================================
--- trunk/dports/lang/gcc46/files/patch-160729.diff	                        (rev 0)
+++ trunk/dports/lang/gcc46/files/patch-160729.diff	2010-06-16 21:50:40 UTC (rev 68879)
@@ -0,0 +1,68 @@
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44509
+--- trunk/gcc/c-config-lang.in	2010/06/14 12:23:26	160728
++++ trunk/gcc/c-config-lang.in	2010/06/14 12:30:29	160729
+@@ -22,4 +22,4 @@
+ # files used by C that have garbage collection GTY macros in them
+ # which therefore need to be scanned by gengtype.c.
+ 
+-gtfiles="\$(srcdir)/c-lang.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-parser.c \$(srcdir)/c-lang.h"
++gtfiles="\$(srcdir)/c-lang.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-parser.c \$(srcdir)/c-lang.h"
+--- trunk/gcc/c-family/c-cppbuiltin.c	2010/06/14 12:23:26	160728
++++ trunk/gcc/c-family/c-cppbuiltin.c	2010/06/14 12:30:29	160729
+@@ -951,15 +951,16 @@
+    array and function allows it to be done lazily when __DBL_MAX__
+    etc. is first used.  */
+ 
+-static struct
++struct GTY(()) lazy_hex_fp_value_struct
+ {
+   const char *hex_str;
+   cpp_macro *macro;
+   enum machine_mode mode;
+   int digits;
+   const char *fp_suffix;
+-} lazy_hex_fp_values[12];
+-static int lazy_hex_fp_value_count;
++};
++static GTY(()) struct lazy_hex_fp_value_struct lazy_hex_fp_values[12];
++static GTY(()) int lazy_hex_fp_value_count;
+ 
+ static bool
+ lazy_hex_fp_value (cpp_reader *pfile ATTRIBUTE_UNUSED,
+@@ -987,7 +988,7 @@
+   gcc_assert (idx < node->value.macro->count);
+   node->value.macro->exp.tokens[idx].val.str.len = strlen (buf1);
+   node->value.macro->exp.tokens[idx].val.str.text
+-    = (const unsigned char *) xstrdup (buf1);
++    = (const unsigned char *) ggc_strdup (buf1);
+   return true;
+ }
+ 
+@@ -1014,7 +1015,8 @@
+       sprintf (buf1, "%s=%s", macro, buf2);
+       cpp_define (parse_in, buf1);
+       node = C_CPP_HASHNODE (get_identifier (macro));
+-      lazy_hex_fp_values[lazy_hex_fp_value_count].hex_str = xstrdup (hex_str);
++      lazy_hex_fp_values[lazy_hex_fp_value_count].hex_str
++	= ggc_strdup (hex_str);
+       lazy_hex_fp_values[lazy_hex_fp_value_count].mode = TYPE_MODE (type);
+       lazy_hex_fp_values[lazy_hex_fp_value_count].digits = digits;
+       lazy_hex_fp_values[lazy_hex_fp_value_count].fp_suffix = fp_suffix;
+@@ -1173,3 +1175,5 @@
+       cpp_define (parse_in, buf);
+     }
+ }
++
++#include "gt-c-family-c-cppbuiltin.h"
+--- /dev/null	2010-06-16 00:11:54.000000000 -0500
++++ trunk/gcc/testsuite/gcc.dg/pr44509.c	2010-06-16 00:36:18.000000000 -0500
+@@ -0,0 +1,9 @@
++/* PR bootstrap/44509 */
++/* { dg-do compile } */
++/* { dg-options "--param ggc-min-expand=0 --param ggc-min-heapsize=0" } */
++
++double
++foo (void)
++{
++  return __DBL_MAX__ - __FLT_MAX__;
++}

Deleted: trunk/dports/lang/gcc46/files/tls_configure_fix.diff
===================================================================
--- trunk/dports/lang/gcc46/files/tls_configure_fix.diff	2010-06-16 21:43:46 UTC (rev 68878)
+++ trunk/dports/lang/gcc46/files/tls_configure_fix.diff	2010-06-16 21:50:40 UTC (rev 68879)
@@ -1,121 +0,0 @@
---- libgomp/configure.orig	2010-06-03 13:05:23.000000000 -0400
-+++ libgomp/configure	2010-06-03 13:41:14.000000000 -0400
-@@ -15379,7 +15379,8 @@
- /* end confdefs.h.  */
- #include <pthread.h>
- 		__thread int a;
--		static int *a_in_other_thread;
-+		int *a_in_other_thread;
-+		int *a_in_main_thread;
- 		static void *
- 		thread_func (void *arg)
- 		{
-@@ -15391,11 +15392,10 @@
- {
- pthread_t thread;
- 		void *thread_retval;
--		int *a_in_main_thread;
-+		a_in_main_thread = &a;
- 		if (pthread_create (&thread, (pthread_attr_t *)0,
- 				    thread_func, (void *)0))
- 		  return 0;
--		a_in_main_thread = &a;
- 		if (pthread_join (thread, &thread_retval))
- 		  return 0;
- 		return (a_in_other_thread == a_in_main_thread);
---- libjava/configure.orig	2010-06-03 13:50:53.000000000 -0400
-+++ libjava/configure	2010-06-03 13:51:44.000000000 -0400
-@@ -24341,7 +24341,8 @@
- /* end confdefs.h.  */
- #include <pthread.h>
- 		__thread int a;
--		static int *a_in_other_thread;
-+		int *a_in_other_thread;
-+		int *a_in_main_thread;
- 		static void *
- 		thread_func (void *arg)
- 		{
-@@ -24353,11 +24354,10 @@
- {
- pthread_t thread;
- 		void *thread_retval;
--		int *a_in_main_thread;
-+		a_in_main_thread = &a;
- 		if (pthread_create (&thread, (pthread_attr_t *)0,
- 				    thread_func, (void *)0))
- 		  return 0;
--		a_in_main_thread = &a;
- 		if (pthread_join (thread, &thread_retval))
- 		  return 0;
- 		return (a_in_other_thread == a_in_main_thread);
---- libstdc++-v3/configure.orig	2010-06-03 13:48:33.000000000 -0400
-+++ libstdc++-v3/configure	2010-06-03 13:55:44.000000000 -0400
-@@ -25572,7 +25572,8 @@
- /* end confdefs.h.  */
- #include <pthread.h>
- 		__thread int a;
--		static int *a_in_other_thread;
-+		int *a_in_other_thread;
-+		int *a_in_main_thread;
- 		static void *
- 		thread_func (void *arg)
- 		{
-@@ -25584,11 +25585,10 @@
- {
- pthread_t thread;
- 		void *thread_retval;
--		int *a_in_main_thread;
-+		a_in_main_thread = &a;
- 		if (pthread_create (&thread, (pthread_attr_t *)0,
- 				    thread_func, (void *)0))
- 		  return 0;
--		a_in_main_thread = &a;
- 		if (pthread_join (thread, &thread_retval))
- 		  return 0;
- 		return (a_in_other_thread == a_in_main_thread);
-@@ -44510,7 +44510,8 @@
- /* end confdefs.h.  */
- #include <pthread.h>
- 		__thread int a;
--		static int *a_in_other_thread;
-+		int *a_in_other_thread;
-+		int *a_in_main_thread;
- 		static void *
- 		thread_func (void *arg)
- 		{
-@@ -44522,11 +44523,10 @@
- {
- pthread_t thread;
- 		void *thread_retval;
--		int *a_in_main_thread;
-+		a_in_main_thread = &a;
- 		if (pthread_create (&thread, (pthread_attr_t *)0,
- 				    thread_func, (void *)0))
- 		  return 0;
--		a_in_main_thread = &a;
- 		if (pthread_join (thread, &thread_retval))
- 		  return 0;
- 		return (a_in_other_thread == a_in_main_thread);
-@@ -50595,7 +50595,8 @@
- /* end confdefs.h.  */
- #include <pthread.h>
- 		__thread int a;
--		static int *a_in_other_thread;
-+		int *a_in_other_thread;
-+		int *a_in_main_thread;
- 		static void *
- 		thread_func (void *arg)
- 		{
-@@ -50607,11 +50608,10 @@
- {
- pthread_t thread;
- 		void *thread_retval;
--		int *a_in_main_thread;
-+		a_in_main_thread = &a;
- 		if (pthread_create (&thread, (pthread_attr_t *)0,
- 				    thread_func, (void *)0))
- 		  return 0;
--		a_in_main_thread = &a;
- 		if (pthread_join (thread, &thread_retval))
- 		  return 0;
- 		return (a_in_other_thread == a_in_main_thread);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100616/efbf9215/attachment.html>


More information about the macports-changes mailing list