<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131155] trunk/dports/lang</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131155">131155</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-01-06 05:30:56 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gcc48: update to 4.8.4 and revbump applicable dragonegg ports</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangdragonegg33Portfile">trunk/dports/lang/dragonegg-3.3/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg34Portfile">trunk/dports/lang/dragonegg-3.4/Portfile</a></li>
<li><a href="#trunkdportslanggcc48Portfile">trunk/dports/lang/gcc48/Portfile</a></li>
<li><a href="#trunkdportslanggcc48filesmacosxversionminpatch">trunk/dports/lang/gcc48/files/macosx-version-min.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc48filesisl014compatibilitypatch">trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangdragonegg33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.3/Portfile (131154 => 131155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.3/Portfile 2015-01-06 13:28:48 UTC (rev 131154)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2015-01-06 13:30:56 UTC (rev 131155)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> set gcc_version_no_dot 47
</span><span class="cx"> }
</span><span class="cx"> subport ${name}-gcc-4.8 {
</span><del>- revision 12
</del><ins>+ revision 13
</ins><span class="cx"> set gcc_version 4.8
</span><span class="cx"> set gcc_version_no_dot 48
</span><span class="cx"> #Fixing issue with TARGET_CPU_DEFAULT_max.
</span></span></pre></div>
<a id="trunkdportslangdragonegg34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.4/Portfile (131154 => 131155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.4/Portfile 2015-01-06 13:28:48 UTC (rev 131154)
+++ trunk/dports/lang/dragonegg-3.4/Portfile 2015-01-06 13:30:56 UTC (rev 131155)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> set gcc_version_no_dot 47
</span><span class="cx"> }
</span><span class="cx"> subport ${name}-gcc-4.8 {
</span><del>- revision 7
</del><ins>+ revision 8
</ins><span class="cx"> set gcc_version 4.8
</span><span class="cx"> set gcc_version_no_dot 48
</span><span class="cx"> #Fixing issue with TARGET_CPU_DEFAULT_max.
</span></span></pre></div>
<a id="trunkdportslanggcc48Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc48/Portfile (131154 => 131155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/Portfile 2015-01-06 13:28:48 UTC (rev 131154)
+++ trunk/dports/lang/gcc48/Portfile 2015-01-06 13:30:56 UTC (rev 131155)
</span><span class="lines">@@ -9,8 +9,7 @@
</span><span class="cx">
</span><span class="cx"> # Whenever this port is bumped for version/revision, please revbump dragonegg-*-gcc-4.8
</span><span class="cx"> epoch 2
</span><del>-version 4.8.3
-revision 4
</del><ins>+version 4.8.4
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories lang
</span><span class="cx"> maintainers mww openmaintainer
</span><span class="lines">@@ -30,8 +29,8 @@
</span><span class="cx"> distname gcc-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 2c7214ff607cbe822282c04d1d6f9fea765c82c5 \
- sha256 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e
</del><ins>+checksums rmd160 c742500ab9d930f2193f8053def21e10cc8b0c4b \
+ sha256 4a80aa23798b8e9b5793494b8c976b39b8d9aa2e53cd5ed5534aff662a7f8695
</ins><span class="cx">
</span><span class="cx"> depends_lib port:cctools \
</span><span class="cx"> path:lib/pkgconfig/cloog-isl.pc:cloog \
</span><span class="lines">@@ -48,9 +47,6 @@
</span><span class="cx"> depends_skip_archcheck-append gcc_select ld64 cctools
</span><span class="cx"> license_noconflict gmp mpfr ppl libmpc
</span><span class="cx">
</span><del>-# Enable building with MacPorts' isl (#45984).
-patchfiles-append isl-0.14-compatibility.patch
-
</del><span class="cx"> # Handle OS X deployment targets correctly (GCC PR target/63810
</span><span class="cx"> # <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
</span><span class="cx"> patchfiles-append macosx-version-min.patch
</span><span class="lines">@@ -153,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- file rename ${destroot}${prefix}/lib/${name}/pkgconfig/libgcj-4.8.pc ${destroot}${prefix}/lib/pkgconfig/
</del><ins>+ move ${destroot}${prefix}/lib/${name}/pkgconfig/libgcj-${major}.pc ${destroot}${prefix}/lib/pkgconfig/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> select.group gcc
</span></span></pre></div>
<a id="trunkdportslanggcc48filesisl014compatibilitypatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch (131154 => 131155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch 2015-01-06 13:28:48 UTC (rev 131154)
+++ trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch 2015-01-06 13:30:56 UTC (rev 131155)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-Index: gcc/graphite-clast-to-gimple.c
-===================================================================
---- gcc/graphite-clast-to-gimple.c.orig
-+++ gcc/graphite-clast-to-gimple.c
-@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
- #include <isl/union_map.h>
- #include <isl/list.h>
- #include <isl/constraint.h>
--#include <isl/ilp.h>
-+#include <isl/deprecated/ilp_int.h>
- #include <isl/aff.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
-Index: gcc/graphite-interchange.c
-===================================================================
---- gcc/graphite-interchange.c.orig
-+++ gcc/graphite-interchange.c
-@@ -24,11 +24,12 @@ along with GCC; see the file COPYING3.
- #include "config.h"
-
- #ifdef HAVE_cloog
-+#include <isl/deprecated/constraint_int.h>
- #include <isl/aff.h>
- #include <isl/set.h>
- #include <isl/map.h>
- #include <isl/union_map.h>
--#include <isl/ilp.h>
-+#include <isl/deprecated/ilp_int.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
- #endif
-Index: gcc/graphite-optimize-isl.c
-===================================================================
---- gcc/graphite-optimize-isl.c.orig
-+++ gcc/graphite-optimize-isl.c
-@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.
- #include <isl/schedule.h>
- #include <isl/band.h>
- #include <isl/aff.h>
-+#include <isl/deprecated/aff_int.h>
- #include <isl/options.h>
- #endif
-
-@@ -365,7 +366,7 @@ getScheduleForBandList(isl_band_list *Ba
- {
- for (i = ScheduleDimensions - 1 ; i >= 0 ; i--)
- {
-- if (isl_band_member_is_zero_distance(Band, i))
-+ if (isl_band_member_is_coincident(Band, i))
- {
- isl_map *TileMap;
- isl_union_map *TileUMap;
-Index: gcc/graphite-poly.c
-===================================================================
---- gcc/graphite-poly.c.orig
-+++ gcc/graphite-poly.c
-@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
- #include <isl/map.h>
- #include <isl/union_map.h>
- #include <isl/constraint.h>
--#include <isl/ilp.h>
-+#include <isl/deprecated/ilp_int.h>
- #include <isl/aff.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
-Index: gcc/graphite-sese-to-poly.c
-===================================================================
---- gcc/graphite-sese-to-poly.c.orig
-+++ gcc/graphite-sese-to-poly.c
-@@ -24,8 +24,9 @@ along with GCC; see the file COPYING3.
- #include <isl/set.h>
- #include <isl/map.h>
- #include <isl/union_map.h>
--#include <isl/constraint.h>
-+#include <isl/deprecated/constraint_int.h>
- #include <isl/aff.h>
-+#include <isl/deprecated/aff_int.h>
- #include <cloog/cloog.h>
- #include <cloog/cloog.h>
- #include <cloog/isl/domain.h>
</del></span></pre></div>
<a id="trunkdportslanggcc48filesmacosxversionminpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc48/files/macosx-version-min.patch (131154 => 131155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/files/macosx-version-min.patch 2015-01-06 13:28:48 UTC (rev 131154)
+++ trunk/dports/lang/gcc48/files/macosx-version-min.patch 2015-01-06 13:30:56 UTC (rev 131155)
</span><span class="lines">@@ -2,13 +2,14 @@
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- gcc/config/darwin-c.c.orig
</span><span class="cx"> +++ gcc/config/darwin-c.c
</span><del>-@@ -570,29 +570,180 @@ find_subframework_header (cpp_reader *pf
</del><ins>+@@ -570,42 +570,180 @@ find_subframework_header (cpp_reader *pf
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -/* Return the value of darwin_macosx_version_min suitable for the
</span><del>-- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
-- so '10.4.2' becomes 1040. The lowest digit is always zero.
</del><ins>+- __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.
</ins><span class="cx"> - Print a warning if the version number can't be understood. */
</span><span class="cx"> +/* Given a version string, return the version as a statically-allocated
</span><span class="cx"> + array of three non-negative integers. If the version string is
</span><span class="lines">@@ -85,7 +86,8 @@
</span><span class="cx"> -version_as_macro (void)
</span><span class="cx"> +version_as_legacy_macro (const unsigned long *version)
</span><span class="cx"> {
</span><del>-- static char result[] = "1000";
</del><ins>+- static char result[7] = "1000";
+- int minorDigitIdx;
</ins><span class="cx"> + unsigned long major, minor, tiny;
</span><span class="cx"> + static char result[sizeof "9999"];
</span><span class="cx"> +
</span><span class="lines">@@ -174,10 +176,20 @@
</span><span class="cx"> + /* Do not assume that the major number will always be exactly 10. */
</span><span class="cx"> + if (version_array[MAJOR] < 10 || version_array[MAJOR] > 10)
</span><span class="cx"> goto fail;
</span><del>-- result[2] = darwin_macosx_version_min[3];
-- if (darwin_macosx_version_min[4] != '\0'
-- && darwin_macosx_version_min[4] != '.')
-+
</del><ins>+
+- 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] != '.')
</ins><span class="cx"> + if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
</span><span class="cx"> + version_macro = version_as_legacy_macro (version_array);
</span><span class="cx"> + else
</span><span class="lines">@@ -196,7 +208,7 @@
</span><span class="cx"> return "1000";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -614,7 +765,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
</del><ins>+@@ -627,7 +765,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
</ins><span class="cx"> builtin_define ("__CONSTANT_CFSTRINGS__");
</span><span class="cx">
</span><span class="cx"> builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
</span><span class="lines">@@ -205,124 +217,6 @@
</span><span class="cx">
</span><span class="cx"> /* Since we do not (at 4.6) support ObjC gc for the NeXT runtime, the
</span><span class="cx"> following will cause a syntax error if one tries to compile gc attributed
</span><del>-Index: gcc/config/darwin-driver.c
-===================================================================
---- gcc/config/darwin-driver.c.orig
-+++ gcc/config/darwin-driver.c
-@@ -29,8 +29,8 @@ along with GCC; see the file COPYING3.
- #include <sys/sysctl.h>
- #include "xregex.h"
-
--static bool
--darwin_find_version_from_kernel (char *new_flag)
-+static char *
-+darwin_find_version_from_kernel (void)
- {
- char osversion[32];
- size_t osversion_len = sizeof (osversion) - 1;
-@@ -39,6 +39,7 @@ darwin_find_version_from_kernel (char *n
- char minor_vers[6];
- char * version_p;
- char * version_pend;
-+ char * new_flag;
-
- /* Determine the version of the running OS. If we can't, warn user,
- and do nothing. */
-@@ -46,7 +47,7 @@ darwin_find_version_from_kernel (char *n
- &osversion_len, NULL, 0) == -1)
- {
- warning (0, "sysctl for kern.osversion failed: %m");
-- return false;
-+ return NULL;
- }
-
- /* Try to parse the first two parts of the OS version number. Warn
-@@ -57,8 +58,6 @@ darwin_find_version_from_kernel (char *n
- version_p = osversion + 1;
- if (ISDIGIT (*version_p))
- major_vers = major_vers * 10 + (*version_p++ - '0');
-- if (major_vers > 4 + 9)
-- goto parse_failed;
- if (*version_p++ != '.')
- goto parse_failed;
- version_pend = strchr(version_p, '.');
-@@ -74,17 +73,16 @@ darwin_find_version_from_kernel (char *n
- if (major_vers - 4 <= 4)
- /* On 10.4 and earlier, the old linker is used which does not
- support three-component system versions. */
-- sprintf (new_flag, "10.%d", major_vers - 4);
-+ asprintf (&new_flag, "10.%d", major_vers - 4);
- else
-- sprintf (new_flag, "10.%d.%s", major_vers - 4,
-- minor_vers);
-+ asprintf (&new_flag, "10.%d.%s", major_vers - 4, minor_vers);
-
-- return true;
-+ return new_flag;
-
- parse_failed:
- warning (0, "couldn%'t understand kern.osversion %q.*s",
- (int) osversion_len, osversion);
-- return false;
-+ return NULL;
- }
-
- #endif
-@@ -105,7 +103,7 @@ darwin_default_min_version (unsigned int
- const unsigned int argc = *decoded_options_count;
- struct cl_decoded_option *const argv = *decoded_options;
- unsigned int i;
-- static char new_flag[sizeof ("10.0.0") + 6];
-+ const char *new_flag;
-
- /* If the command-line is empty, just return. */
- if (argc <= 1)
-@@ -142,16 +140,16 @@ darwin_default_min_version (unsigned int
-
- #ifndef CROSS_DIRECTORY_STRUCTURE
-
-- /* Try to find the version from the kernel, if we fail - we print a message
-- and give up. */
-- if (!darwin_find_version_from_kernel (new_flag))
-- return;
-+ /* Try to find the version from the kernel, if we fail - we print a message
-+ and give up. */
-+ new_flag = darwin_find_version_from_kernel ();
-+ if (!new_flag)
-+ return;
-
- #else
-
-- /* For cross-compilers, default to the target OS version. */
--
-- strncpy (new_flag, DEF_MIN_OSX_VERSION, sizeof (new_flag));
-+ /* For cross-compilers, default to the target OS version. */
-+ new_flag = DEF_MIN_OSX_VERSION;
-
- #endif /* CROSS_DIRECTORY_STRUCTURE */
-
-@@ -165,7 +163,6 @@ darwin_default_min_version (unsigned int
- memcpy (*decoded_options + 2, argv + 1,
- (argc - 1) * sizeof (struct cl_decoded_option));
- return;
--
- }
-
- /* Translate -filelist and -framework options in *DECODED_OPTIONS
-Index: gcc/testsuite/gcc.dg/darwin-minversion-1.c
-===================================================================
---- gcc/testsuite/gcc.dg/darwin-minversion-1.c.orig
-+++ gcc/testsuite/gcc.dg/darwin-minversion-1.c
-@@ -2,7 +2,8 @@
- /* { dg-options "-mmacosx-version-min=10.1" } */
- /* { dg-do run { target *-*-darwin* } } */
-
--int main(void)
-+int
-+main ()
- {
- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1010
- fail me;
</del><span class="cx"> Index: gcc/testsuite/gcc.dg/darwin-minversion-10.c
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- /dev/null
</span><span class="lines">@@ -384,34 +278,19 @@
</span><span class="cx"> +#endif
</span><span class="cx"> + return 0;
</span><span class="cx"> +}
</span><del>-Index: gcc/testsuite/gcc.dg/darwin-minversion-2.c
-===================================================================
---- gcc/testsuite/gcc.dg/darwin-minversion-2.c.orig
-+++ gcc/testsuite/gcc.dg/darwin-minversion-2.c
-@@ -2,7 +2,8 @@
- /* { dg-options "-mmacosx-version-min=10.1 -mmacosx-version-min=10.3" } */
- /* { dg-do run { target *-*-darwin* } } */
-
--int main(void)
-+int
-+main ()
- {
- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1030
- fail me;
</del><span class="cx"> Index: gcc/testsuite/gcc.dg/darwin-minversion-3.c
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- gcc/testsuite/gcc.dg/darwin-minversion-3.c.orig
</span><span class="cx"> +++ gcc/testsuite/gcc.dg/darwin-minversion-3.c
</span><del>-@@ -1,10 +1,11 @@
</del><ins>+@@ -1,11 +1,11 @@
</ins><span class="cx"> -/* Test that most-minor versions greater than 9 work. */
</span><span class="cx"> -/* { dg-options "-mmacosx-version-min=10.4.10" } */
</span><span class="cx"> +/* Test that most minor versions < 10 work. */
</span><span class="cx"> +/* { dg-options "-mmacosx-version-min=10.4.1" } */
</span><span class="cx"> /* { dg-do compile { target *-*-darwin* } } */
</span><span class="cx">
</span><del>--int main(void)
-+int
-+main ()
</del><ins>+ int
+ main ()
</ins><span class="cx"> {
</span><span class="cx"> -#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1040
</span><span class="cx"> +#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1041
</span><span class="lines">@@ -420,21 +299,23 @@
</span><span class="cx"> return 0;
</span><span class="cx"> Index: gcc/testsuite/gcc.dg/darwin-minversion-4.c
</span><span class="cx"> ===================================================================
</span><del>---- /dev/null
</del><ins>+--- gcc/testsuite/gcc.dg/darwin-minversion-4.c.orig
</ins><span class="cx"> +++ gcc/testsuite/gcc.dg/darwin-minversion-4.c
</span><del>-@@ -0,0 +1,12 @@
</del><ins>+@@ -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" } */
</ins><span class="cx"> +/* Test that minor versions > 9 produce a six-character macro. */
</span><span class="cx"> +/* { dg-options "-mmacosx-version-min=10.10.1" } */
</span><del>-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
</del><ins>+ /* { dg-do compile { target *-*-darwin* } } */
+
+ int
+ main ()
+ {
+-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101000
</ins><span class="cx"> +#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101001
</span><del>-+ fail me;
-+#endif
-+ return 0;
-+}
</del><ins>+ fail me;
+ #endif
+ return 0;
</ins><span class="cx"> Index: gcc/testsuite/gcc.dg/darwin-minversion-5.c
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- /dev/null
</span></span></pre>
</div>
</div>
</body>
</html>