Mercurial > hg > CbC > CbC_gcc
comparison libcpp/pch.c @ 63:b7f97abdc517 gcc-4.6-20100522
update gcc from gcc-4.5.0 to gcc-4.6
author | ryoma <e075725@ie.u-ryukyu.ac.jp> |
---|---|
date | Mon, 24 May 2010 12:47:05 +0900 |
parents | 3bfb6c00c1e0 |
children | f6334be47118 |
comparison
equal
deleted
inserted
replaced
56:3c8a44c06a95 | 63:b7f97abdc517 |
---|---|
611 h = cpp_lookup (r, namebuf, m.name_length); | 611 h = cpp_lookup (r, namebuf, m.name_length); |
612 if (m.flags & NODE_POISONED | 612 if (m.flags & NODE_POISONED |
613 || h->flags & NODE_POISONED) | 613 || h->flags & NODE_POISONED) |
614 { | 614 { |
615 if (CPP_OPTION (r, warn_invalid_pch)) | 615 if (CPP_OPTION (r, warn_invalid_pch)) |
616 cpp_error (r, CPP_DL_WARNING_SYSHDR, | 616 cpp_warning_syshdr (r, CPP_W_INVALID_PCH, |
617 "%s: not used because `%.*s' is poisoned", | 617 "%s: not used because `%.*s' is poisoned", |
618 name, m.name_length, namebuf); | 618 name, m.name_length, namebuf); |
619 goto fail; | 619 goto fail; |
620 } | 620 } |
621 | 621 |
622 if (h->type != NT_MACRO) | 622 if (h->type != NT_MACRO) |
623 { | 623 { |
633 && m.name_length == sizeof ("__GCC_HAVE_DWARF2_CFI_ASM") - 1 | 633 && m.name_length == sizeof ("__GCC_HAVE_DWARF2_CFI_ASM") - 1 |
634 && !memcmp (namebuf, "__GCC_HAVE_DWARF2_CFI_ASM", m.name_length)) | 634 && !memcmp (namebuf, "__GCC_HAVE_DWARF2_CFI_ASM", m.name_length)) |
635 continue; | 635 continue; |
636 | 636 |
637 if (CPP_OPTION (r, warn_invalid_pch)) | 637 if (CPP_OPTION (r, warn_invalid_pch)) |
638 cpp_error (r, CPP_DL_WARNING_SYSHDR, | 638 cpp_warning_syshdr (r, CPP_W_INVALID_PCH, |
639 "%s: not used because `%.*s' not defined", | 639 "%s: not used because `%.*s' not defined", |
640 name, m.name_length, namebuf); | 640 name, m.name_length, namebuf); |
641 goto fail; | 641 goto fail; |
642 } | 642 } |
643 | 643 |
644 newdefn = cpp_macro_definition (r, h); | 644 newdefn = cpp_macro_definition (r, h); |
645 | 645 |
646 if (m.definition_length != ustrlen (newdefn) | 646 if (m.definition_length != ustrlen (newdefn) |
647 || memcmp (namebuf, newdefn, m.definition_length) != 0) | 647 || memcmp (namebuf, newdefn, m.definition_length) != 0) |
648 { | 648 { |
649 if (CPP_OPTION (r, warn_invalid_pch)) | 649 if (CPP_OPTION (r, warn_invalid_pch)) |
650 cpp_error (r, CPP_DL_WARNING_SYSHDR, | 650 cpp_warning_syshdr (r, CPP_W_INVALID_PCH, |
651 "%s: not used because `%.*s' defined as `%s' not `%.*s'", | 651 "%s: not used because `%.*s' defined as `%s' not `%.*s'", |
652 name, m.name_length, namebuf, newdefn + m.name_length, | 652 name, m.name_length, namebuf, newdefn + m.name_length, |
653 m.definition_length - m.name_length, | 653 m.definition_length - m.name_length, |
654 namebuf + m.name_length); | 654 namebuf + m.name_length); |
655 goto fail; | 655 goto fail; |
686 else if (cmp > 0) | 686 else if (cmp > 0) |
687 ++i; | 687 ++i; |
688 else | 688 else |
689 { | 689 { |
690 if (CPP_OPTION (r, warn_invalid_pch)) | 690 if (CPP_OPTION (r, warn_invalid_pch)) |
691 cpp_error (r, CPP_DL_WARNING_SYSHDR, | 691 cpp_warning_syshdr (r, CPP_W_INVALID_PCH, |
692 "%s: not used because `%s' is defined", | 692 "%s: not used because `%s' is defined", |
693 name, first); | 693 name, first); |
694 goto fail; | 694 goto fail; |
695 } | 695 } |
696 } | 696 } |
697 | 697 |
698 free(nl.defs); | 698 free(nl.defs); |
706 if (read (fd, &counter, sizeof (counter)) != sizeof (counter)) | 706 if (read (fd, &counter, sizeof (counter)) != sizeof (counter)) |
707 goto error; | 707 goto error; |
708 if (counter && r->counter) | 708 if (counter && r->counter) |
709 { | 709 { |
710 if (CPP_OPTION (r, warn_invalid_pch)) | 710 if (CPP_OPTION (r, warn_invalid_pch)) |
711 cpp_error (r, CPP_DL_WARNING_SYSHDR, | 711 cpp_warning_syshdr (r, CPP_W_INVALID_PCH, |
712 "%s: not used because `__COUNTER__' is invalid", | 712 "%s: not used because `__COUNTER__' is invalid", |
713 name); | 713 name); |
714 goto fail; | 714 goto fail; |
715 } | 715 } |
716 | 716 |
717 /* We win! */ | 717 /* We win! */ |
718 return 0; | 718 return 0; |