diff options
| author | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
| commit | 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d (patch) | |
| tree | 1b5f0d96c51b51168b3713058a1b62e92f1136eb /gcc-4.6/libcpp | |
| parent | d7030123e04baab5dbff9c9ee04c0de99bd9a774 (diff) | |
| download | toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.gz toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.bz2 toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.zip | |
Sync down FSF r184235@google/gcc-4_6_2-mobile branch
1) Get mostly new patches from FSF gcc-4.6 branch
2) Fix PR52129
3) Insert GNU-stack note for all ARM targets
Change-Id: I2b9926981210e517e4021242908074319a91d6bd
Diffstat (limited to 'gcc-4.6/libcpp')
| -rw-r--r-- | gcc-4.6/libcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc-4.6/libcpp/ChangeLog.google-4_6 | 9 | ||||
| -rw-r--r-- | gcc-4.6/libcpp/include/cpplib.h | 2 | ||||
| -rw-r--r-- | gcc-4.6/libcpp/init.c | 8 | ||||
| -rw-r--r-- | gcc-4.6/libcpp/po/ChangeLog | 4 |
5 files changed, 22 insertions, 5 deletions
diff --git a/gcc-4.6/libcpp/ChangeLog b/gcc-4.6/libcpp/ChangeLog index 7308385dc..eb10d631b 100644 --- a/gcc-4.6/libcpp/ChangeLog +++ b/gcc-4.6/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2011-10-26 Release Manager + + * GCC 4.6.2 released. + 2011-06-27 Release Manager * GCC 4.6.1 released. diff --git a/gcc-4.6/libcpp/ChangeLog.google-4_6 b/gcc-4.6/libcpp/ChangeLog.google-4_6 new file mode 100644 index 000000000..9c5138321 --- /dev/null +++ b/gcc-4.6/libcpp/ChangeLog.google-4_6 @@ -0,0 +1,9 @@ +2011-12-06 Jeffrey Yasskin <jyasskin@google.com> + + Backport from rev 180707 + + 2011-10-31 Jason Merrill <jason@redhat.com> + + PR c++/50920 + * include/cpplib.h (enum c_lang): Rename CLK_CXX0X to CLK_CXX11, + CLK_GNUCXX0X to CLK_GNUCXX11. diff --git a/gcc-4.6/libcpp/include/cpplib.h b/gcc-4.6/libcpp/include/cpplib.h index 8fa28819b..0f32863b4 100644 --- a/gcc-4.6/libcpp/include/cpplib.h +++ b/gcc-4.6/libcpp/include/cpplib.h @@ -157,7 +157,7 @@ enum cpp_ttype /* C language kind, used when calling cpp_create_reader. */ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC1X, CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_STDC1X, - CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX0X, CLK_CXX0X, CLK_ASM}; + CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11, CLK_ASM}; /* Payload of a NUMBER, STRING, CHAR or COMMENT token. */ struct GTY(()) cpp_string { diff --git a/gcc-4.6/libcpp/init.c b/gcc-4.6/libcpp/init.c index cfc16e8f8..6a8f39dea 100644 --- a/gcc-4.6/libcpp/init.c +++ b/gcc-4.6/libcpp/init.c @@ -91,11 +91,11 @@ static const struct lang_flags lang_defaults[] = /* STDC1X */ { 1, 0, 1, 0, 1, 1, 1, 0 }, /* GNUCXX */ { 0, 1, 1, 0, 0, 1, 1, 0 }, /* CXX98 */ { 0, 1, 1, 0, 1, 1, 1, 0 }, - /* GNUCXX0X */ { 1, 1, 1, 0, 0, 1, 1, 1 }, - /* CXX0X */ { 1, 1, 1, 0, 1, 1, 1, 1 }, + /* GNUCXX11 */ { 1, 1, 1, 0, 0, 1, 1, 1 }, + /* CXX11 */ { 1, 1, 1, 0, 1, 1, 1, 1 }, /* ASM */ { 0, 0, 1, 0, 0, 1, 0, 0 } - /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and - CXX0X when no longer experimental (when all uses of identifiers + /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX11, and + CXX11 when no longer experimental (when all uses of identifiers in the compiler have been audited for correct handling of extended identifiers). */ }; diff --git a/gcc-4.6/libcpp/po/ChangeLog b/gcc-4.6/libcpp/po/ChangeLog index 066eaf7c3..ef4fc5d94 100644 --- a/gcc-4.6/libcpp/po/ChangeLog +++ b/gcc-4.6/libcpp/po/ChangeLog @@ -1,3 +1,7 @@ +2011-10-26 Release Manager + + * GCC 4.6.2 released. + 2011-07-08 Joseph Myers <joseph@codesourcery.com> * be.po, ca.po, da.po, de.po, el.po, es.po, fi.po, fr.po, id.po, |