gkeating 02/10/31 13:25:49
Modified: live/gcc3/gcc version.c gcc.c
Log:
Update to preferred version numbering banner
Revision Changes Path
1.52 +2 -2 src/live/gcc3/gcc/version.c
Index: version.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/version.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- version.c 2002/10/24 23:43:13 1.51
+++ version.c 2002/10/31 21:25:48 1.52
@@ -8,13 +8,13 @@
/* APPLE LOCAL begin Apple version */
/* When updating this string:
- - For each internal build, increment the number after the dash.
+ - For each internal build, increment the build number.
- When merging from the FSF, delete any (experimental) or (prerelease).
Apple doesn't mark its GCC versions as 'prerelease', because a released
compiler will be identical to the last prerelease compiler and it
makes no sense to mark released compilers as 'prerelease'.
*/
-const char version_string[] = "3.3-1230 20021020 (Apple Computer, Inc.)";
+const char version_string[] = "3.3 20021020 (Apple Computer, Inc. build 1230)";
/* APPLE LOCAL end Apple version */
/* This is the location of the online document giving instructions for
1.153 +11 -3 src/live/gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/gcc.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gcc.c 2002/10/24 23:42:58 1.152
+++ gcc.c 2002/10/31 21:25:49 1.153
@@ -6061,9 +6061,17 @@
/* APPLE LOCAL begin Apple version */
if (c1 == 'A')
{
- while (*v != '-')
- v++;
- v++;
+ char *vt = version_string;
+ while (*vt != 0 && *vt != '(')
+ vt++;
+ while (*vt != 0 && ! ISDIGIT (*vt))
+ vt++;
+ for (q = vt; *q != 0 && ISDIGIT (*q); q++)
+ ;
+ if (q == vt || *q != ')')
+ abort ();
+ v = xstrdup (vt);
+ v[q - vt] = 0;
}
/* APPLE LOCAL end Apple version */
