[128428] trunk/dports/lang/gcc5
ryandesign at macports.org
ryandesign at macports.org
Thu Nov 20 19:25:34 PST 2014
Revision: 128428
https://trac.macports.org/changeset/128428
Author: ryandesign at macports.org
Date: 2014-11-20 19:25:33 -0800 (Thu, 20 Nov 2014)
Log Message:
-----------
gcc5: update to 5-20141116
Modified Paths:
--------------
trunk/dports/lang/gcc5/Portfile
Added Paths:
-----------
trunk/dports/lang/gcc5/files/macosx-version-min.patch
trunk/dports/lang/gcc5/files/patch-isl-0.13.diff
Removed Paths:
-------------
trunk/dports/lang/gcc5/files/patch-10.10.diff
trunk/dports/lang/gcc5/files/yosemite-libtool.patch
Modified: trunk/dports/lang/gcc5/Portfile
===================================================================
--- trunk/dports/lang/gcc5/Portfile 2014-11-21 02:34:34 UTC (rev 128427)
+++ trunk/dports/lang/gcc5/Portfile 2014-11-21 03:25:33 UTC (rev 128428)
@@ -9,8 +9,7 @@
subport libgcc-devel {}
epoch 1
-version 5-20140824
-revision 1
+version 5-20141116
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -32,20 +31,20 @@
distname gcc-${version}
use_bzip2 yes
-checksums rmd160 afc26c594493bd5cd7fe3518c372021a28b318da \
- sha256 955390588b0f1bff631c9e3d3a33fad5b0d5244afdc3bbc9692d172ec4b9d957
+checksums rmd160 a26484148a1170effb86dcdba98911e175b4959b \
+ sha256 27a810c4dce23567b04333d8a8690263d42fee29bd023918c9ecbba8d5ead082
-depends_lib port:gmp port:mpfr port:libiconv port:libmpc path:lib/pkgconfig/cloog-isl.pc:cloog port:libgcc-devel port:ld64 port:cctools
+depends_lib port:gmp port:mpfr port:libiconv port:libmpc path:lib/pkgconfig/isl.pc:isl port:libgcc-devel port:ld64 port:cctools
depends_run port:gcc_select
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
-patchfiles patch-10.10.diff
+# Handle OS X deployment targets correctly (GCC PR target/63810
+# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
+patchfiles macosx-version-min.patch
-# Don't link with "-flat_namespace -undefined suppress" on Yosemite and
-# later (#45483).
-patchfiles-append yosemite-libtool.patch
+patchfiles-append patch-isl-0.13.diff
set major [lindex [split ${version} .-] 0]
@@ -69,8 +68,7 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
- --with-cloog=${prefix} --enable-cloog-backend=isl \
- --disable-cloog-version-check \
+ --with-isl=${prefix} \
--enable-stage1-checking \
--disable-multilib \
--enable-lto \
Copied: trunk/dports/lang/gcc5/files/macosx-version-min.patch (from rev 128379, trunk/dports/lang/gcc49/files/macosx-version-min.patch)
===================================================================
--- trunk/dports/lang/gcc5/files/macosx-version-min.patch (rev 0)
+++ trunk/dports/lang/gcc5/files/macosx-version-min.patch 2014-11-21 03:25:33 UTC (rev 128428)
@@ -0,0 +1,419 @@
+Index: gcc/config/darwin-c.c
+===================================================================
+--- gcc/config/darwin-c.c.orig
++++ gcc/config/darwin-c.c
+@@ -570,42 +570,180 @@ find_subframework_header (cpp_reader *pf
+ return 0;
+ }
+
+-/* Return the value of darwin_macosx_version_min suitable for the
+- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro, so '10.4.2'
+- becomes 1040 and '10.10.0' becomes 101000. The lowest digit is
+- always zero, as is the second lowest for '10.10.x' and above.
+- Print a warning if the version number can't be understood. */
++/* Given a version string, return the version as a statically-allocated
++ array of three non-negative integers. If the version string is
++ invalid, return null.
++
++ Version strings must consist of one, two, or three tokens, each
++ separated by a single period. Each token must contain only the
++ characters '0' through '9' and is converted to an equivalent
++ integer. Omitted tokens are treated as zeros. For example:
++
++ "10" becomes {10,0,0}
++ "10.10" becomes {10,10,0}
++ "10.10.1" becomes {10,10,1}
++ "10.000010.1" becomes {10,10,1}
++ "10.010.001" becomes {10,10,1}
++ "000010.10.00001" becomes {10,10,1} */
++
++enum version_components { MAJOR, MINOR, TINY };
++
++static const unsigned long *
++parse_version (const char *version_str)
++{
++ size_t version_len;
++ char *end;
++ static unsigned long version_array[3];
++
++ if (! version_str)
++ return NULL;
++
++ version_len = strlen (version_str);
++ if (version_len < 1)
++ return NULL;
++
++ /* Version string must consist of digits and periods only. */
++ if (strspn (version_str, "0123456789.") != version_len)
++ return NULL;
++
++ if (! ISDIGIT (version_str[0]) || ! ISDIGIT (version_str[version_len - 1]))
++ return NULL;
++
++ version_array[MAJOR] = strtoul (version_str, &end, 10);
++ version_str = end + ((*end == '.') ? 1 : 0);
++
++ /* Version string must not contain adjacent periods. */
++ if (*version_str == '.')
++ return NULL;
++
++ version_array[MINOR] = strtoul (version_str, &end, 10);
++ version_str = end + ((*end == '.') ? 1 : 0);
++
++ version_array[TINY] = strtoul (version_str, &end, 10);
++
++ /* Version string must contain no more than three tokens. */
++ if (*end != '\0')
++ return NULL;
++
++ return version_array;
++}
++
++/* Given a three-component version represented as an array of
++ non-negative integers, return a statically-allocated string suitable
++ for the legacy __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.
++ If the version is invalid and cannot be coerced into a valid form,
++ return null.
++
++ The legacy format is a four-character string -- two chars for the
++ major number and one each for the minor and tiny numbers. Major
++ numbers are zero-padded if necessary. Minor and tiny numbers from
++ 10 through 99 are permitted but are clamped to 9 (for example,
++ {10,9,10} produces "1099"). Versions containing numbers greater
++ than 99 are rejected. */
++
+ static const char *
+-version_as_macro (void)
++version_as_legacy_macro (const unsigned long *version)
+ {
+- static char result[7] = "1000";
+- int minorDigitIdx;
++ unsigned long major, minor, tiny;
++ static char result[sizeof "9999"];
++
++ if (! version)
++ return NULL;
++
++ major = version[MAJOR];
++ minor = version[MINOR];
++ tiny = version[TINY];
++
++ if (major > 99 || minor > 99 || tiny > 99)
++ return NULL;
++
++ minor = ((minor > 9) ? 9 : minor);
++ tiny = ((tiny > 9) ? 9 : tiny);
++
++ /* NOTE: Cast result of sizeof so that result of sprintf is not
++ converted to an unsigned type. */
++ if (sprintf (result, "%02lu%lu%lu", major, minor, tiny)
++ != (int) sizeof "9999" - 1)
++ return NULL;
+
+- if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
++ return result;
++}
++
++/* Given a three-component version represented as an array of
++ non-negative integers, return a statically-allocated string suitable
++ for the modern __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro
++ or the __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ macro. If the
++ version is invalid, return null.
++
++ The modern format is a five- or six-character string -- one or two
++ chars for the major number and two each for the minor and tiny
++ numbers, which are zero-padded if necessary (for example, {8,1,0}
++ produces "80100", and {10,10,1} produces "101001"). Versions
++ containing numbers greater than 99 are rejected. */
++
++static const char *
++version_as_modern_macro (const unsigned long *version)
++{
++ unsigned long major, minor, tiny;
++ static char result[sizeof "999999"];
++
++ if (! version)
++ return NULL;
++
++ major = version[MAJOR];
++ minor = version[MINOR];
++ tiny = version[TINY];
++
++ if (major > 99 || minor > 99 || tiny > 99)
++ return NULL;
++
++ /* NOTE: 'sizeof ((x > y) ? "foo" : "bar")' returns size of char
++ pointer instead of char array, so use
++ '(x > y) ? sizeof "foo" : sizeof "bar"' instead. */
++ /* NOTE: Cast result of sizeof so that result of sprintf is not
++ converted to an unsigned type. */
++ if (sprintf (result, "%lu%02lu%02lu", major, minor, tiny)
++ != (int) ((major > 9) ? sizeof "999999" : sizeof "99999") - 1)
++ return NULL;
++
++ return result;
++}
++
++/* Return the value of darwin_macosx_version_min, suitably formatted
++ for the __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro. Values
++ representing OS X 10.9 and earlier are encoded using the legacy
++ four-character format, while 10.10 and later use a modern
++ six-character format. (For example, "10.9" produces "1090", and
++ "10.10.1" produces "101001".) If the value is invalid and cannot be
++ coerced into a valid form, print a warning and return "1000". */
++
++static const char *
++macosx_version_as_macro (void)
++{
++ const unsigned long *version_array;
++ const char *version_macro;
++
++ version_array = parse_version (darwin_macosx_version_min);
++ if (! version_array)
+ goto fail;
+- if (! ISDIGIT (darwin_macosx_version_min[3]))
++
++ /* Do not assume that the major number will always be exactly 10. */
++ if (version_array[MAJOR] < 10 || version_array[MAJOR] > 10)
+ goto fail;
+
+- minorDigitIdx = 3;
+- result[2] = darwin_macosx_version_min[minorDigitIdx++];
+- if (ISDIGIT (darwin_macosx_version_min[minorDigitIdx]))
+- {
+- /* Starting with OS X 10.10, the macro ends '00' rather than '0',
+- i.e. 10.10.x becomes 101000 rather than 10100. */
+- result[3] = darwin_macosx_version_min[minorDigitIdx++];
+- result[4] = '0';
+- result[5] = '0';
+- result[6] = '\0';
+- }
+- if (darwin_macosx_version_min[minorDigitIdx] != '\0'
+- && darwin_macosx_version_min[minorDigitIdx] != '.')
++ if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
++ version_macro = version_as_legacy_macro (version_array);
++ else
++ version_macro = version_as_modern_macro (version_array);
++
++ if (! version_macro)
+ goto fail;
+
+- return result;
++ return version_macro;
+
+ fail:
+ error ("unknown value %qs of -mmacosx-version-min",
+- darwin_macosx_version_min);
++ darwin_macosx_version_min);
+ return "1000";
+ }
+
+@@ -627,7 +765,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
+ builtin_define ("__CONSTANT_CFSTRINGS__");
+
+ builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
+- version_as_macro(), false);
++ macosx_version_as_macro(), false);
+
+ /* Since we do not (at 4.6) support ObjC gc for the NeXT runtime, the
+ following will cause a syntax error if one tries to compile gc attributed
+Index: gcc/testsuite/gcc.dg/darwin-minversion-10.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-10.c
+@@ -0,0 +1,16 @@
++/* PR target/63810: Test that a version with a zero-padded minor
++ number < 10 and a zero-padded tiny number < 10 produces the correct
++ four-character macro. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.07.02" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1072
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-11.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-11.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that a version with outrageous zero-padding and
++ a minor number > 9 still produces a six-character macro. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=00010.010.0000098" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101098
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-12.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-12.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that a version with outrageous zero-padding and
++ a minor number < 10 still produces a four-character macro. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=010.008.000031" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1089
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-3.c
+===================================================================
+--- gcc/testsuite/gcc.dg/darwin-minversion-3.c.orig
++++ gcc/testsuite/gcc.dg/darwin-minversion-3.c
+@@ -1,11 +1,11 @@
+-/* Test that most-minor versions greater than 9 work. */
+-/* { dg-options "-mmacosx-version-min=10.4.10" } */
++/* Test that most minor versions < 10 work. */
++/* { dg-options "-mmacosx-version-min=10.4.1" } */
+ /* { dg-do compile { target *-*-darwin* } } */
+
+ int
+ main ()
+ {
+-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1040
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1041
+ fail me;
+ #endif
+ return 0;
+Index: gcc/testsuite/gcc.dg/darwin-minversion-4.c
+===================================================================
+--- gcc/testsuite/gcc.dg/darwin-minversion-4.c.orig
++++ gcc/testsuite/gcc.dg/darwin-minversion-4.c
+@@ -1,11 +1,11 @@
+-/* Test that major versions greater than 9 work and have the additional 0. */
+-/* { dg-options "-mmacosx-version-min=10.10.0" } */
++/* Test that minor versions > 9 produce a six-character macro. */
++/* { dg-options "-mmacosx-version-min=10.10.1" } */
+ /* { dg-do compile { target *-*-darwin* } } */
+
+ int
+ main ()
+ {
+-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101000
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101001
+ fail me;
+ #endif
+ return 0;
+Index: gcc/testsuite/gcc.dg/darwin-minversion-5.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-5.c
+@@ -0,0 +1,16 @@
++/* PR target/63810: Test that a version with minor number < 10 and tiny
++ number > 9 produces a four-character macro with the tiny number
++ clamped to 9. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.9.10" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1099
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-6.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-6.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that tiny numbers are preserved in
++ six-character macros. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.10.11" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101011
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-7.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-7.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that tiny numbers < 10 are preserved in
++ four-character macros. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.9.1" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1091
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-8.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-8.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that a version with minor number > 9 and no
++ tiny number produces a six-character macro ending in "00". */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.11" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101100
++ fail me;
++#endif
++ return 0;
++}
+Index: gcc/testsuite/gcc.dg/darwin-minversion-9.c
+===================================================================
+--- /dev/null
++++ gcc/testsuite/gcc.dg/darwin-minversion-9.c
+@@ -0,0 +1,15 @@
++/* PR target/63810: Test that a version with a zero-padded minor
++ number < 10 produces a four-character macro. */
++/* Added by Lawrence Velázquez <larryv at macports.org>. */
++
++/* { dg-options "-mmacosx-version-min=10.08.4" } */
++/* { dg-do compile { target *-*-darwin* } } */
++
++int
++main ()
++{
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1084
++ fail me;
++#endif
++ return 0;
++}
Deleted: trunk/dports/lang/gcc5/files/patch-10.10.diff
===================================================================
--- trunk/dports/lang/gcc5/files/patch-10.10.diff 2014-11-21 02:34:34 UTC (rev 128427)
+++ trunk/dports/lang/gcc5/files/patch-10.10.diff 2014-11-21 03:25:33 UTC (rev 128428)
@@ -1,89 +0,0 @@
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61407#c16
---- gcc/config/darwin-c.c.orig
-+++ gcc/config/darwin-c.c
-@@ -572,20 +572,31 @@ find_subframework_header (cpp_reader *pfile, const char *header, cpp_dir **dirp)
-
- /* Return the value of darwin_macosx_version_min suitable for the
- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
-- so '10.4.2' becomes 1040. The lowest digit is always zero.
-- Print a warning if the version number can't be understood. */
-+ so '10.4.2' becomes 1040 and '10.10.0' becomes 101000. The lowest
-+ digit is always zero. Print a warning if the version number
-+ can't be understood. */
- static const char *
- version_as_macro (void)
- {
-- static char result[] = "1000";
-+ static char result[7] = "1000";
-+ int minorDigitIdx;
-
- if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
- goto fail;
- if (! ISDIGIT (darwin_macosx_version_min[3]))
- goto fail;
-- result[2] = darwin_macosx_version_min[3];
-- if (darwin_macosx_version_min[4] != '\0'
-- && darwin_macosx_version_min[4] != '.')
-+
-+ minorDigitIdx = 3;
-+ result[2] = darwin_macosx_version_min[minorDigitIdx++];
-+ if (ISDIGIT(darwin_macosx_version_min[minorDigitIdx])) {
-+ /* Starting with 10.10 numeration for mactro changed */
-+ result[3] = darwin_macosx_version_min[minorDigitIdx++];
-+ result[4] = '0';
-+ result[5] = '0';
-+ result[6] = '\0';
-+ }
-+ if (darwin_macosx_version_min[minorDigitIdx] != '\0'
-+ && darwin_macosx_version_min[minorDigitIdx] != '.')
- goto fail;
-
- return result;
---- gcc/config/darwin-driver.c.orig
-+++ gcc/config/darwin-driver.c
-@@ -57,7 +57,7 @@ darwin_find_version_from_kernel (char *new_flag)
- version_p = osversion + 1;
- if (ISDIGIT (*version_p))
- major_vers = major_vers * 10 + (*version_p++ - '0');
-- if (major_vers > 4 + 9)
-+ if (major_vers > 4 + 10)
- goto parse_failed;
- if (*version_p++ != '.')
- goto parse_failed;
---- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc.orig
-+++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -940,8 +940,10 @@
-
- COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
- CHECK_SIZE_AND_OFFSET(dirent, d_ino);
--#if SANITIZER_MAC
-+#if SANITIZER_MAC && ( !defined(__DARWIN_64_BIT_INO_T) || __DARWIN_64_BIT_INO_T)
- CHECK_SIZE_AND_OFFSET(dirent, d_seekoff);
-+#elif SANITIZER_MAC
-+// There is no d_seekoff with non 64-bit ino_t
- #elif SANITIZER_FREEBSD
- // There is no 'd_off' field on FreeBSD.
- #else
---- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h.orig
-+++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -392,12 +392,20 @@
- #endif
-
- #if SANITIZER_MAC
-+# if ! defined(__DARWIN_64_BIT_INO_T) || __DARWIN_64_BIT_INO_T
- struct __sanitizer_dirent {
- unsigned long long d_ino;
- unsigned long long d_seekoff;
- unsigned short d_reclen;
- // more fields that we don't care about
- };
-+# else
-+ struct __sanitizer_dirent {
-+ unsigned int d_ino;
-+ unsigned short d_reclen;
-+ // more fields that we don't care about
-+ };
-+# endif
- #elif SANITIZER_FREEBSD
- struct __sanitizer_dirent {
- unsigned int d_fileno;
Added: trunk/dports/lang/gcc5/files/patch-isl-0.13.diff
===================================================================
--- trunk/dports/lang/gcc5/files/patch-isl-0.13.diff (rev 0)
+++ trunk/dports/lang/gcc5/files/patch-isl-0.13.diff 2014-11-21 03:25:33 UTC (rev 128428)
@@ -0,0 +1,107 @@
+Fix build with isl 0.13 and later.
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63801
+--- gcc/graphite-interchange.c.orig 2014-11-12 12:28:36.000000000 -0600
++++ gcc/graphite-interchange.c 2014-11-20 00:24:36.000000000 -0600
+@@ -30,13 +30,7 @@
+ #include <isl/union_map.h>
+ #include <isl/ilp.h>
+ #include <isl/val.h>
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+ #include <isl/val_gmp.h>
+-#if defined(__cplusplus)
+-}
+-#endif
+ #endif
+
+ #include "system.h"
+--- gcc/graphite-isl-ast-to-gimple.c.orig 2014-11-15 09:37:49.000000000 -0600
++++ gcc/graphite-isl-ast-to-gimple.c 2014-11-20 00:26:15.000000000 -0600
+@@ -25,13 +25,7 @@
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+ #include <isl/ast_build.h>
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+ #include <isl/val_gmp.h>
+-#if defined(__cplusplus)
+-}
+-#endif
+ #endif
+
+ #include "system.h"
+--- gcc/graphite-optimize-isl.c.orig 2014-11-15 09:37:49.000000000 -0600
++++ gcc/graphite-optimize-isl.c 2014-11-20 00:50:22.000000000 -0600
+@@ -460,7 +460,7 @@
+ if (flag_loop_unroll_jam && (i != (ScheduleDimensions - depth)))
+ continue;
+
+- if (isl_band_member_is_zero_distance (Band, i))
++ if (isl_band_member_is_coincident (Band, i))
+ {
+ isl_map *TileMap;
+ isl_union_map *TileUMap;
+@@ -559,6 +559,7 @@
+ {
+
+ isl_schedule *schedule;
++ isl_schedule_constraints *schedule_constraints;
+ isl_union_set *domain;
+ isl_union_map *validity, *proximity, *dependences;
+ isl_union_map *schedule_map;
+@@ -574,11 +575,16 @@
+
+ proximity = isl_union_map_copy (validity);
+
++ schedule_constraints = isl_schedule_constraints_on_domain(domain);
++ schedule_constraints = isl_schedule_constraints_set_proximity(schedule_constraints, proximity);
++ schedule_constraints = isl_schedule_constraints_set_validity(schedule_constraints, isl_union_map_copy(validity));
++ schedule_constraints = isl_schedule_constraints_set_coincidence(schedule_constraints, validity);
++
+ isl_options_set_schedule_max_constant_term (scop->ctx, CONSTANT_BOUND);
+ isl_options_set_schedule_maximize_band_depth (scop->ctx, 1);
+ isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
+ isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_CONTINUE);
+- schedule = isl_union_set_compute_schedule (domain, validity, proximity);
++ schedule = isl_schedule_constraints_compute_schedule(schedule_constraints);
+ isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_ABORT);
+
+ if (!schedule)
+--- gcc/graphite-poly.c.orig 2014-11-15 09:37:49.000000000 -0600
++++ gcc/graphite-poly.c 2014-11-20 00:26:29.000000000 -0600
+@@ -29,13 +29,7 @@
+ #include <isl/ilp.h>
+ #include <isl/aff.h>
+ #include <isl/val.h>
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+ #include <isl/val_gmp.h>
+-#if defined(__cplusplus)
+-}
+-#endif
+ #endif
+
+ #include "system.h"
+--- gcc/graphite-sese-to-poly.c.orig 2014-11-10 14:32:31.000000000 -0600
++++ gcc/graphite-sese-to-poly.c 2014-11-20 00:26:49.000000000 -0600
+@@ -27,17 +27,7 @@
+ #include <isl/constraint.h>
+ #include <isl/aff.h>
+ #include <isl/val.h>
+-/* For C++ linkage of C functions.
+- Missing from isl/val_gmp.h in isl 0.12 versions.
+- Appearing in isl/val_gmp.h in isl 0.13.
+- To be removed when passing to isl 0.13. */
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+ #include <isl/val_gmp.h>
+-#if defined(__cplusplus)
+-}
+-#endif
+ #endif
+
+ #include "system.h"
Deleted: trunk/dports/lang/gcc5/files/yosemite-libtool.patch
===================================================================
--- trunk/dports/lang/gcc5/files/yosemite-libtool.patch 2014-11-21 02:34:34 UTC (rev 128427)
+++ trunk/dports/lang/gcc5/files/yosemite-libtool.patch 2014-11-21 03:25:33 UTC (rev 128428)
@@ -1,260 +0,0 @@
-Index: boehm-gc/configure
-===================================================================
---- boehm-gc/configure.orig
-+++ boehm-gc/configure
-@@ -7508,7 +7508,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: gcc/configure
-===================================================================
---- gcc/configure.orig
-+++ gcc/configure
-@@ -14546,7 +14546,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libatomic/configure
-===================================================================
---- libatomic/configure.orig
-+++ libatomic/configure
-@@ -7329,7 +7329,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libbacktrace/configure
-===================================================================
---- libbacktrace/configure.orig
-+++ libbacktrace/configure
-@@ -7576,7 +7576,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libcilkrts/configure
-===================================================================
---- libcilkrts/configure.orig
-+++ libcilkrts/configure
-@@ -7546,7 +7546,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libffi/configure
-===================================================================
---- libffi/configure.orig
-+++ libffi/configure
-@@ -7125,7 +7125,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libgfortran/configure
-===================================================================
---- libgfortran/configure.orig
-+++ libgfortran/configure
-@@ -8810,7 +8810,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libgo/configure
-===================================================================
---- libgo/configure.orig
-+++ libgo/configure
-@@ -7246,7 +7246,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libgomp/configure
-===================================================================
---- libgomp/configure.orig
-+++ libgomp/configure
-@@ -7312,7 +7312,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libitm/configure
-===================================================================
---- libitm/configure.orig
-+++ libitm/configure
-@@ -8002,7 +8002,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libjava/classpath/configure
-===================================================================
---- libjava/classpath/configure.orig
-+++ libjava/classpath/configure
-@@ -8368,7 +8368,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libjava/configure
-===================================================================
---- libjava/configure.orig
-+++ libjava/configure
-@@ -9580,7 +9580,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libobjc/configure
-===================================================================
---- libobjc/configure.orig
-+++ libobjc/configure
-@@ -6794,7 +6794,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libquadmath/configure
-===================================================================
---- libquadmath/configure.orig
-+++ libquadmath/configure
-@@ -6986,7 +6986,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libsanitizer/configure
-===================================================================
---- libsanitizer/configure.orig
-+++ libsanitizer/configure
-@@ -8506,7 +8506,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libssp/configure
-===================================================================
---- libssp/configure.orig
-+++ libssp/configure
-@@ -7123,7 +7123,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libstdc++-v3/configure
-===================================================================
---- libstdc++-v3/configure.orig
-+++ libstdc++-v3/configure
-@@ -7861,7 +7861,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: libvtv/configure
-===================================================================
---- libvtv/configure.orig
-+++ libvtv/configure
-@@ -8614,7 +8614,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: lto-plugin/configure
-===================================================================
---- lto-plugin/configure.orig
-+++ lto-plugin/configure
-@@ -6825,7 +6825,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-Index: zlib/configure
-===================================================================
---- zlib/configure.orig
-+++ zlib/configure
-@@ -6594,7 +6594,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-- 10.[012]*)
-+ 10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141120/4bf3cea0/attachment-0001.html>
More information about the macports-changes
mailing list