51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
|
2004-10-19 Jakub Jelinek <jakub@redhat.com>
|
||
|
|
|
||
|
|
* c-cppbuiltin.c (define__GNUC__): Also define __GNUC_RH_RELEASE__.
|
||
|
|
|
||
|
|
--- gcc/c-cppbuiltin.c.jj 2004-10-07 21:27:38.000000000 +0200
|
||
|
|
+++ gcc/c-cppbuiltin.c 2004-10-19 11:41:50.000000000 +0200
|
||
|
|
@@ -257,13 +257,13 @@ define__GNUC__ (void)
|
||
|
|
{
|
||
|
|
/* The format of the version string, enforced below, is
|
||
|
|
([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? */
|
||
|
|
- const char *q, *v = version_string;
|
||
|
|
+ const char *q, *v = version_string, *vstart, *vend;
|
||
|
|
|
||
|
|
while (*v && !ISDIGIT (*v))
|
||
|
|
v++;
|
||
|
|
gcc_assert (*v && (v <= version_string || v[-1] == '-'));
|
||
|
|
|
||
|
|
- q = v;
|
||
|
|
+ vstart = q = v;
|
||
|
|
while (ISDIGIT (*v))
|
||
|
|
v++;
|
||
|
|
builtin_define_with_value_n ("__GNUC__", q, v - q);
|
||
|
|
@@ -289,6 +289,27 @@ define__GNUC__ (void)
|
||
|
|
builtin_define_with_value_n ("__GNUC_PATCHLEVEL__", "0", 1);
|
||
|
|
|
||
|
|
gcc_assert (!*v || *v == ' ' || *v == '-');
|
||
|
|
+
|
||
|
|
+ vend = v;
|
||
|
|
+ v = strchr (v, '(');
|
||
|
|
+ if (v != NULL && strncmp (v + 1, "Red Hat ", 8) == 0)
|
||
|
|
+ {
|
||
|
|
+ v += 9;
|
||
|
|
+ if (strncmp (v, "Linux ", 6) == 0)
|
||
|
|
+ v += 6;
|
||
|
|
+
|
||
|
|
+ gcc_assert (strncmp (v, vstart, vend - vstart) == 0);
|
||
|
|
+ gcc_assert (v[vend - vstart] == '-');
|
||
|
|
+
|
||
|
|
+ v += vend - vstart + 1;
|
||
|
|
+ q = v;
|
||
|
|
+ gcc_assert (ISDIGIT (*v));
|
||
|
|
+ while (ISDIGIT (*v))
|
||
|
|
+ v++;
|
||
|
|
+ builtin_define_with_value_n ("__GNUC_RH_RELEASE__", q, v - q);
|
||
|
|
+
|
||
|
|
+ gcc_assert (!*v || *v == ')' || *v == '.');
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Define macros used by <stdint.h>. Currently only defines limits
|