Ticket #45840: gcc49.diff

File gcc49.diff, 28.9 KB (added by larryv (Lawrence Velázquez), 10 years ago)

patch against the ports tree updating gcc49 to @4.9.2, refreshing the symbol lookup patch, and adding a fix for handling of deployment targets

  • dports/lang/gcc49/Portfile 

    diff --git a/dports/lang/gcc49/Portfile b/dports/lang/gcc49/Portfile
index 328af51..26c990b 100644
    a b PortGroup compiler_blacklist_versions 1.0 
    88name                gcc49
    99subport             libgcc {}
    1010
    11 # TODO: On next update, increase epoch to 2 and remove libgcc's separate epoch.
    12 epoch               1
    13 version             4.9.1
    14 revision            1
     11epoch               2
     12version             4.9.2
    1513platforms           darwin
    1614categories          lang
    1715maintainers         mww openmaintainer
    … … master_sites ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/re 
    3129distname            gcc-${version}
    3230use_bzip2           yes
    3331
    34 checksums           rmd160  7a829a260648a190afa1d6c616c78ddc861f4f7d \
    35                     sha256  d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
     32checksums           rmd160  bc6454e7c67c6f5fd2c98cdd1364ebb1739e1347 \
     33                    sha256  2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
    3634
    3735depends_lib         port:gmp port:mpfr port:libiconv port:libmpc path:lib/pkgconfig/cloog-isl.pc:cloog path:lib/libgcc/libgcc_s.1.dylib:libgcc port:ld64 port:cctools
    3836depends_run         port:gcc_select
    … … depends_run port:gcc_select 
    4038depends_skip_archcheck-append gcc_select ld64 cctools
    4139license_noconflict  gmp mpfr ppl libmpc
    4240
    43 patch.pre_args      -p1
    44 patchfiles          Fix-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch \
    45                     yosemite-symbol-lookup.patch
     41patchfiles-append   yosemite-symbol-lookup.patch
     42
     43# Handle deployment targets correctly (GCC PR target/63810
     44# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
     45patchfiles-append   macosx-deployment-target-macro.patch
    4646
    4747set major           4.9
    4848
    … … destroot.target install install-info-host 
    113113if {${subport} eq "libgcc"} {
    114114    conflicts       libgcc-devel
    115115
    116     epoch 2
    117 
    118116    # http://trac.macports.org/ticket/35770
    119117    # http://trac.macports.org/ticket/38814
    120118    # While there can be multiple versions of these runtimes in a single

  • new file dports/lang/gcc49/files/macosx-deployment-target-macro.patch 

    diff --git a/dports/lang/gcc49/files/macosx-deployment-target-macro.patch b/dports/lang/gcc49/files/macosx-deployment-target-macro.patch
new file mode 100644
index 0000000..5f5eb3e
    - +  
     1Index: gcc/config/darwin-c.c
     2===================================================================
     3--- gcc/config/darwin-c.c.orig
     4+++ gcc/config/darwin-c.c
     5@@ -570,42 +570,167 @@ find_subframework_header (cpp_reader *pf
     6   return 0;
     7 }
     8 
     9-/* Return the value of darwin_macosx_version_min suitable for the
     10-   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro, so '10.4.2'
     11-   becomes 1040 and '10.10.0' becomes 101000.  The lowest digit is
     12-   always zero, as is the second lowest for '10.10.x' and above.
     13-   Print a warning if the version number can't be understood.  */
     14+/*  Given a version string, return the version as a statically-allocated
     15+    array of three non-negative integers.  If the version string is
     16+    invalid, return null.
     17+
     18+    Version strings must consist of one, two, or three tokens, each
     19+    separated by a single period.  Each token must contain only the
     20+    characters '0' through '9' and is converted to an equivalent
     21+    integer.  Omitted tokens are treated as zeros.  For example:
     22+
     23+        "10"              becomes   {10,0,0}
     24+        "10.10"           becomes   {10,10,0}
     25+        "10.10.1"         becomes   {10,10,1}
     26+        "10.000010.1"     becomes   {10,10,1}
     27+        "10.010.001"      becomes   {10,10,1}
     28+        "000010.10.00001" becomes   {10,10,1}  */
     29+
     30+enum version_components { MAJOR, MINOR, TINY };
     31+
     32+static const unsigned long *
     33+parse_version (const char *version_str)
     34+{
     35+  size_t version_len;
     36+  char *end;
     37+  static unsigned long version_array[3];
     38+
     39+  if (! version_str)
     40+    return NULL;
     41+
     42+  version_len = strlen (version_str);
     43+  if (version_len < 1)
     44+    return NULL;
     45+
     46+  /* Version string must consist of digits and periods only.  */
     47+  if (strspn (version_str, "0123456789.") != version_len)
     48+    return NULL;
     49+
     50+  if (! ISDIGIT (version_str[0]) || ! ISDIGIT (version_str[version_len - 1]))
     51+    return NULL;
     52+
     53+  version_array[MAJOR] = strtoul (version_str, &end, 10);
     54+  version_str = end + ((*end == '.') ? 1 : 0);
     55+
     56+  /* Version string must not contain adjacent periods.  */
     57+  if (*version_str == '.')
     58+    return NULL;
     59+
     60+  version_array[MINOR] = strtoul (version_str, &end, 10);
     61+  version_str = end + ((*end == '.') ? 1 : 0);
     62+
     63+  version_array[TINY] = strtoul (version_str, &end, 10);
     64+
     65+  /* Version string must contain no more than three tokens.  */
     66+  if (*end != '\0')
     67+    return NULL;
     68+
     69+  return version_array;
     70+}
     71+
     72+/*  Given a three-component version represented as an array of
     73+    non-negative integers, return a statically-allocated string suitable
     74+    for the legacy __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.
     75+    If the version is invalid and cannot be coerced into a valid form,
     76+    return null.
     77+
     78+    The legacy format is a four-character string -- two chars for the
     79+    major number and one each for the minor and tiny numbers.  Major
     80+    numbers are zero-padded if necessary.  Minor and tiny numbers from
     81+    10 through 99 are permitted but are clamped to 9 (for example,
     82+    {10,9,10} produces "1099").  Versions containing numbers greater
     83+    than 99 are rejected.  */
     84+
     85 static const char *
     86-version_as_macro (void)
     87+version_as_legacy_macro (const unsigned long *version)
     88 {
     89-  static char result[7] = "1000";
     90-  int minorDigitIdx;
     91+  unsigned long major = version[MAJOR];
     92+  unsigned long minor = version[MINOR];
     93+  unsigned long tiny = version[TINY];
     94+  static char result[sizeof "9999"];
     95+
     96+  if (major > 99 || minor > 99 || tiny > 99)
     97+    return NULL;
     98+
     99+  minor = ((minor > 9) ? 9 : minor);
     100+  tiny = ((tiny > 9) ? 9 : tiny);
     101+
     102+  /* NOTE: Cast result of sizeof so that result of sprintf is not
     103+     converted to an unsigned type.  */
     104+  if (sprintf (result, "%02lu%lu%lu", major, minor, tiny)
     105+      != (int) sizeof "9999" - 1)
     106+    return NULL;
     107 
     108-  if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
     109+  return result;
     110+}
     111+
     112+/*  Given a three-component version represented as an array of
     113+    non-negative integers, return a statically-allocated string suitable
     114+    for the modern __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro
     115+    or the __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ macro.  If the
     116+    version is invalid, return null.
     117+
     118+    The modern format is a five- or six-character string -- one or two
     119+    chars for the major number and two each for the minor and tiny
     120+    numbers, which are zero-padded if necessary (for example, {8,1,0}
     121+    produces "80100", and {10,10,1} produces "101001").  Versions
     122+    containing numbers greater than 99 are rejected.  */
     123+
     124+static const char *
     125+version_as_modern_macro (const unsigned long *version)
     126+{
     127+  unsigned long major = version[MAJOR];
     128+  unsigned long minor = version[MINOR];
     129+  unsigned long tiny = version[TINY];
     130+  static char result[sizeof "999999"];
     131+
     132+  if (major > 99 || minor > 99 || tiny > 99)
     133+    return NULL;
     134+
     135+  /* NOTE: 'sizeof "foo"' returns size of char array, but
     136+     'sizeof ((x > y) ? "foo" : "bar")' returns size of char pointer.  */
     137+  /* NOTE: Cast result of sizeof so that result of sprintf is not
     138+     converted to an unsigned type.  */
     139+  if (sprintf (result, "%lu%02lu%02lu", major, minor, tiny)
     140+      != (int) ((major > 9) ? sizeof "999999" : sizeof "99999") - 1)
     141+    return NULL;
     142+
     143+  return result;
     144+}
     145+
     146+/*  Return the value of darwin_macosx_version_min, suitably formatted
     147+    for the __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.  (For
     148+    example, "10.9" produces "1090", and "10.10.1" produces "101001".)
     149+    If its value is invalid and cannot be coerced into a valid form,
     150+    print a warning and return "1000".  */
     151+
     152+static const char *
     153+macosx_version_as_macro (void)
     154+{
     155+  const unsigned long *version_array;
     156+  const char *version_macro;
     157+
     158+  version_array = parse_version (darwin_macosx_version_min);
     159+  if (! version_array)
     160     goto fail;
     161-  if (! ISDIGIT (darwin_macosx_version_min[3]))
     162+
     163+  /* Do not assume that the major number will always be exactly 10.  */
     164+  if (version_array[MAJOR] < 10 || version_array[MAJOR] > 10)
     165     goto fail;
     166 
     167-  minorDigitIdx = 3;
     168-  result[2] = darwin_macosx_version_min[minorDigitIdx++];
     169-  if (ISDIGIT (darwin_macosx_version_min[minorDigitIdx]))
     170-  {
     171-    /* Starting with OS X 10.10, the macro ends '00' rather than '0',
     172-       i.e. 10.10.x becomes 101000 rather than 10100.  */
     173-    result[3] = darwin_macosx_version_min[minorDigitIdx++];
     174-    result[4] = '0';
     175-    result[5] = '0';
     176-    result[6] = '\0';
     177-  }
     178-  if (darwin_macosx_version_min[minorDigitIdx] != '\0'
     179-      && darwin_macosx_version_min[minorDigitIdx] != '.')
     180+  if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
     181+    version_macro = version_as_legacy_macro (version_array);
     182+  else
     183+    version_macro = version_as_modern_macro (version_array);
     184+
     185+  if (! version_macro)
     186     goto fail;
     187 
     188-  return result;
     189+  return version_macro;
     190 
     191  fail:
     192   error ("unknown value %qs of -mmacosx-version-min",
     193-        darwin_macosx_version_min);
     194+         darwin_macosx_version_min);
     195   return "1000";
     196 }
     197 
     198@@ -627,7 +752,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
     199     builtin_define ("__CONSTANT_CFSTRINGS__");
     200 
     201   builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
     202-                            version_as_macro(), false);
     203+                            macosx_version_as_macro(), false);
     204 
     205   /* Since we do not (at 4.6) support ObjC gc for the NeXT runtime, the
     206      following will cause a syntax error if one tries to compile gc attributed
     207Index: gcc/testsuite/gcc.dg/darwin-minversion-10.c
     208===================================================================
     209--- /dev/null
     210+++ gcc/testsuite/gcc.dg/darwin-minversion-10.c
     211@@ -0,0 +1,16 @@
     212+/* PR 63810: Test that a version with a zero-padded minor number < 10
     213+   and a zero-padded tiny number < 10 produces the correct
     214+   four-character macro.  */
     215+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     216+
     217+/* { dg-options "-mmacosx-version-min=10.07.02" } */
     218+/* { dg-do compile { target *-*-darwin* } } */
     219+
     220+int
     221+main ()
     222+{
     223+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1072
     224+  fail me;
     225+#endif
     226+  return 0;
     227+}
     228Index: gcc/testsuite/gcc.dg/darwin-minversion-11.c
     229===================================================================
     230--- /dev/null
     231+++ gcc/testsuite/gcc.dg/darwin-minversion-11.c
     232@@ -0,0 +1,15 @@
     233+/* PR 63810: Test that a version with outrageous zero-padding and
     234+   a minor number > 9 still produces a six-character macro.  */
     235+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     236+
     237+/* { dg-options "-mmacosx-version-min=00010.010.0000098" } */
     238+/* { dg-do compile { target *-*-darwin* } } */
     239+
     240+int
     241+main ()
     242+{
     243+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101098
     244+  fail me;
     245+#endif
     246+  return 0;
     247+}
     248Index: gcc/testsuite/gcc.dg/darwin-minversion-12.c
     249===================================================================
     250--- /dev/null
     251+++ gcc/testsuite/gcc.dg/darwin-minversion-12.c
     252@@ -0,0 +1,15 @@
     253+/* PR 63810: Test that a version with outrageous zero-padding and
     254+   a minor number < 10 still produces a four-character macro.  */
     255+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     256+
     257+/* { dg-options "-mmacosx-version-min=010.008.000031" } */
     258+/* { dg-do compile { target *-*-darwin* } } */
     259+
     260+int
     261+main ()
     262+{
     263+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1089
     264+  fail me;
     265+#endif
     266+  return 0;
     267+}
     268Index: gcc/testsuite/gcc.dg/darwin-minversion-3.c
     269===================================================================
     270--- gcc/testsuite/gcc.dg/darwin-minversion-3.c.orig
     271+++ gcc/testsuite/gcc.dg/darwin-minversion-3.c
     272@@ -1,11 +1,11 @@
     273-/* Test that most-minor versions greater than 9 work.  */
     274-/* { dg-options "-mmacosx-version-min=10.4.10" } */
     275+/* Test that most minor versions < 10 work.  */
     276+/* { dg-options "-mmacosx-version-min=10.4.1" } */
     277 /* { dg-do compile { target *-*-darwin* } } */
     278 
     279 int
     280 main ()
     281 {
     282-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1040
     283+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1041
     284   fail me;
     285 #endif
     286   return 0;
     287Index: gcc/testsuite/gcc.dg/darwin-minversion-4.c
     288===================================================================
     289--- gcc/testsuite/gcc.dg/darwin-minversion-4.c.orig
     290+++ gcc/testsuite/gcc.dg/darwin-minversion-4.c
     291@@ -1,11 +1,11 @@
     292-/* Test that major versions greater than 9 work and have the additional 0.  */
     293-/* { dg-options "-mmacosx-version-min=10.10.0" } */
     294+/* Test that minor versions > 9 produce a 6-digit macro.  */
     295+/* { dg-options "-mmacosx-version-min=10.10.1" } */
     296 /* { dg-do compile { target *-*-darwin* } } */
     297 
     298 int
     299 main ()
     300 {
     301-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101000
     302+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101001
     303   fail me;
     304 #endif
     305   return 0;
     306Index: gcc/testsuite/gcc.dg/darwin-minversion-5.c
     307===================================================================
     308--- /dev/null
     309+++ gcc/testsuite/gcc.dg/darwin-minversion-5.c
     310@@ -0,0 +1,15 @@
     311+/* PR 63810: Test that a version with minor number < 10 and tiny number > 9
     312+   produces a four-character macro with the tiny number clamped to 9.  */
     313+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     314+
     315+/* { dg-options "-mmacosx-version-min=10.9.10" } */
     316+/* { dg-do compile { target *-*-darwin* } } */
     317+
     318+int
     319+main ()
     320+{
     321+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1099
     322+  fail me;
     323+#endif
     324+  return 0;
     325+}
     326Index: gcc/testsuite/gcc.dg/darwin-minversion-6.c
     327===================================================================
     328--- /dev/null
     329+++ gcc/testsuite/gcc.dg/darwin-minversion-6.c
     330@@ -0,0 +1,14 @@
     331+/* PR 63810: Test that tiny numbers are preserved in six-character macros.  */
     332+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     333+
     334+/* { dg-options "-mmacosx-version-min=10.10.11" } */
     335+/* { dg-do compile { target *-*-darwin* } } */
     336+
     337+int
     338+main ()
     339+{
     340+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101011
     341+  fail me;
     342+#endif
     343+  return 0;
     344+}
     345Index: gcc/testsuite/gcc.dg/darwin-minversion-7.c
     346===================================================================
     347--- /dev/null
     348+++ gcc/testsuite/gcc.dg/darwin-minversion-7.c
     349@@ -0,0 +1,15 @@
     350+/* PR 63810: Test that tiny numbers < 10 are preserved in four-character
     351+   macros.  */
     352+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     353+
     354+/* { dg-options "-mmacosx-version-min=10.9.1" } */
     355+/* { dg-do compile { target *-*-darwin* } } */
     356+
     357+int
     358+main ()
     359+{
     360+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1091
     361+  fail me;
     362+#endif
     363+  return 0;
     364+}
     365Index: gcc/testsuite/gcc.dg/darwin-minversion-8.c
     366===================================================================
     367--- /dev/null
     368+++ gcc/testsuite/gcc.dg/darwin-minversion-8.c
     369@@ -0,0 +1,16 @@
     370+/* PR 63810: Test that a version with minor number > 9 and no tiny
     371+   number produces a six-character macro with "00" as the last two
     372+   characters.  */
     373+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     374+
     375+/* { dg-options "-mmacosx-version-min=10.11" } */
     376+/* { dg-do compile { target *-*-darwin* } } */
     377+
     378+int
     379+main ()
     380+{
     381+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101100
     382+  fail me;
     383+#endif
     384+  return 0;
     385+}
     386Index: gcc/testsuite/gcc.dg/darwin-minversion-9.c
     387===================================================================
     388--- /dev/null
     389+++ gcc/testsuite/gcc.dg/darwin-minversion-9.c
     390@@ -0,0 +1,15 @@
     391+/* PR 63810: Test that a version with a zero-padded minor number < 10
     392+   produces a four-character macro.  */
     393+/* Added by Lawrence Velázquez <larryv@macports.org>.  */
     394+
     395+/* { dg-options "-mmacosx-version-min=10.08.4" } */
     396+/* { dg-do compile { target *-*-darwin* } } */
     397+
     398+int
     399+main ()
     400+{
     401+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1084
     402+  fail me;
     403+#endif
     404+  return 0;
     405+}

  • dports/lang/gcc49/files/yosemite-symbol-lookup.patch 

    diff --git a/dports/lang/gcc49/files/yosemite-symbol-lookup.patch b/dports/lang/gcc49/files/yosemite-symbol-lookup.patch
index a8eee2c..9b1bbd8 100644
    a b  
    1 Index: gcc-4.9.1/boehm-gc/configure
     1Index: boehm-gc/configure
    22===================================================================
    3 --- gcc-4.9.1.orig/boehm-gc/configure
    4 +++ gcc-4.9.1/boehm-gc/configure
     3--- boehm-gc/configure.orig
     4+++ boehm-gc/configure
    55@@ -7508,7 +7508,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    66       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    77        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/boehm-gc/configure 
    1111          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    1212        10.*)
    1313          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    14 Index: gcc-4.9.1/gcc/configure
     14Index: gcc/configure
    1515===================================================================
    16 --- gcc-4.9.1.orig/gcc/configure
    17 +++ gcc-4.9.1/gcc/configure
    18 @@ -14415,7 +14415,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     16--- gcc/configure.orig
     17+++ gcc/configure
     18@@ -14424,7 +14424,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    1919       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    2020        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    2121          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    … … Index: gcc-4.9.1/gcc/configure 
    2424          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    2525        10.*)
    2626          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    27 Index: gcc-4.9.1/libatomic/configure
     27Index: libatomic/configure
    2828===================================================================
    29 --- gcc-4.9.1.orig/libatomic/configure
    30 +++ gcc-4.9.1/libatomic/configure
     29--- libatomic/configure.orig
     30+++ libatomic/configure
    3131@@ -7324,7 +7324,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    3232       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    3333        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libatomic/configure 
    3737          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    3838        10.*)
    3939          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    40 Index: gcc-4.9.1/libbacktrace/configure
     40Index: libbacktrace/configure
    4141===================================================================
    42 --- gcc-4.9.1.orig/libbacktrace/configure
    43 +++ gcc-4.9.1/libbacktrace/configure
     42--- libbacktrace/configure.orig
     43+++ libbacktrace/configure
    4444@@ -7576,7 +7576,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    4545       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    4646        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libbacktrace/configure 
    5050          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    5151        10.*)
    5252          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    53 Index: gcc-4.9.1/libcilkrts/configure
     53Index: libcilkrts/configure
    5454===================================================================
    55 --- gcc-4.9.1.orig/libcilkrts/configure
    56 +++ gcc-4.9.1/libcilkrts/configure
     55--- libcilkrts/configure.orig
     56+++ libcilkrts/configure
    5757@@ -7544,7 +7544,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    5858       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    5959        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libcilkrts/configure 
    6363          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    6464        10.*)
    6565          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    66 Index: gcc-4.9.1/libffi/configure
     66Index: libffi/configure
    6767===================================================================
    68 --- gcc-4.9.1.orig/libffi/configure
    69 +++ gcc-4.9.1/libffi/configure
     68--- libffi/configure.orig
     69+++ libffi/configure
    7070@@ -7125,7 +7125,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    7171       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    7272        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libffi/configure 
    7676          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    7777        10.*)
    7878          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    79 Index: gcc-4.9.1/libgfortran/configure
     79Index: libgfortran/configure
    8080===================================================================
    81 --- gcc-4.9.1.orig/libgfortran/configure
    82 +++ gcc-4.9.1/libgfortran/configure
    83 @@ -8804,7 +8804,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     81--- libgfortran/configure.orig
     82+++ libgfortran/configure
     83@@ -8805,7 +8805,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    8484       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    8585        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    8686          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    … … Index: gcc-4.9.1/libgfortran/configure 
    8989          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    9090        10.*)
    9191          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    92 Index: gcc-4.9.1/libgo/configure
     92Index: libgo/configure
    9393===================================================================
    94 --- gcc-4.9.1.orig/libgo/configure
    95 +++ gcc-4.9.1/libgo/configure
     94--- libgo/configure.orig
     95+++ libgo/configure
    9696@@ -7243,7 +7243,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    9797       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    9898        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libgo/configure 
    102102          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    103103        10.*)
    104104          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    105 Index: gcc-4.9.1/libgomp/configure
     105Index: libgomp/configure
    106106===================================================================
    107 --- gcc-4.9.1.orig/libgomp/configure
    108 +++ gcc-4.9.1/libgomp/configure
     107--- libgomp/configure.orig
     108+++ libgomp/configure
    109109@@ -7312,7 +7312,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    110110       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    111111        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libgomp/configure 
    115115          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    116116        10.*)
    117117          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    118 Index: gcc-4.9.1/libitm/configure
     118Index: libitm/configure
    119119===================================================================
    120 --- gcc-4.9.1.orig/libitm/configure
    121 +++ gcc-4.9.1/libitm/configure
     120--- libitm/configure.orig
     121+++ libitm/configure
    122122@@ -8002,7 +8002,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    123123       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    124124        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libitm/configure 
    128128          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    129129        10.*)
    130130          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    131 Index: gcc-4.9.1/libjava/classpath/configure
     131Index: libjava/classpath/configure
    132132===================================================================
    133 --- gcc-4.9.1.orig/libjava/classpath/configure
    134 +++ gcc-4.9.1/libjava/classpath/configure
     133--- libjava/classpath/configure.orig
     134+++ libjava/classpath/configure
    135135@@ -8368,7 +8368,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    136136       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    137137        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libjava/classpath/configure 
    141141          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    142142        10.*)
    143143          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    144 Index: gcc-4.9.1/libjava/configure
     144Index: libjava/configure
    145145===================================================================
    146 --- gcc-4.9.1.orig/libjava/configure
    147 +++ gcc-4.9.1/libjava/configure
     146--- libjava/configure.orig
     147+++ libjava/configure
    148148@@ -9580,7 +9580,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    149149       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    150150        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libjava/configure 
    154154          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    155155        10.*)
    156156          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    157 Index: gcc-4.9.1/libobjc/configure
     157Index: libobjc/configure
    158158===================================================================
    159 --- gcc-4.9.1.orig/libobjc/configure
    160 +++ gcc-4.9.1/libobjc/configure
     159--- libobjc/configure.orig
     160+++ libobjc/configure
    161161@@ -6794,7 +6794,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    162162       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    163163        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libobjc/configure 
    167167          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    168168        10.*)
    169169          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    170 Index: gcc-4.9.1/libquadmath/configure
     170Index: libquadmath/configure
    171171===================================================================
    172 --- gcc-4.9.1.orig/libquadmath/configure
    173 +++ gcc-4.9.1/libquadmath/configure
     172--- libquadmath/configure.orig
     173+++ libquadmath/configure
    174174@@ -6986,7 +6986,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    175175       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    176176        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libquadmath/configure 
    180180          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    181181        10.*)
    182182          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    183 Index: gcc-4.9.1/libsanitizer/configure
     183Index: libsanitizer/configure
    184184===================================================================
    185 --- gcc-4.9.1.orig/libsanitizer/configure
    186 +++ gcc-4.9.1/libsanitizer/configure
     185--- libsanitizer/configure.orig
     186+++ libsanitizer/configure
    187187@@ -8506,7 +8506,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    188188       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    189189        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libsanitizer/configure 
    193193          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    194194        10.*)
    195195          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    196 Index: gcc-4.9.1/libssp/configure
     196Index: libssp/configure
    197197===================================================================
    198 --- gcc-4.9.1.orig/libssp/configure
    199 +++ gcc-4.9.1/libssp/configure
     198--- libssp/configure.orig
     199+++ libssp/configure
    200200@@ -7123,7 +7123,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    201201       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    202202        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libssp/configure 
    206206          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    207207        10.*)
    208208          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    209 Index: gcc-4.9.1/libstdc++-v3/configure
     209Index: libstdc++-v3/configure
    210210===================================================================
    211 --- gcc-4.9.1.orig/libstdc++-v3/configure
    212 +++ gcc-4.9.1/libstdc++-v3/configure
     211--- libstdc++-v3/configure.orig
     212+++ libstdc++-v3/configure
    213213@@ -7856,7 +7856,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    214214       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    215215        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libstdc++-v3/configure 
    219219          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    220220        10.*)
    221221          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    222 Index: gcc-4.9.1/libvtv/configure
     222Index: libvtv/configure
    223223===================================================================
    224 --- gcc-4.9.1.orig/libvtv/configure
    225 +++ gcc-4.9.1/libvtv/configure
     224--- libvtv/configure.orig
     225+++ libvtv/configure
    226226@@ -8614,7 +8614,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    227227       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    228228        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/libvtv/configure 
    232232          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    233233        10.*)
    234234          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    235 Index: gcc-4.9.1/lto-plugin/configure
     235Index: lto-plugin/configure
    236236===================================================================
    237 --- gcc-4.9.1.orig/lto-plugin/configure
    238 +++ gcc-4.9.1/lto-plugin/configure
     237--- lto-plugin/configure.orig
     238+++ lto-plugin/configure
    239239@@ -6804,7 +6804,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    240240       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    241241        10.0,*86*-darwin8*|10.0,*-darwin[91]*)
    … … Index: gcc-4.9.1/lto-plugin/configure 
    245245          _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    246246        10.*)
    247247          _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
    248 Index: gcc-4.9.1/zlib/configure
     248Index: zlib/configure
    249249===================================================================
    250 --- gcc-4.9.1.orig/zlib/configure
    251 +++ gcc-4.9.1/zlib/configure
     250--- zlib/configure.orig
     251+++ zlib/configure
    252252@@ -6594,7 +6594,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
    253253       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    254254        10.0,*86*-darwin8*|10.0,*-darwin[91]*)