diff options
| author | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
| commit | 61c0330cc243abf13fdd01f377a7f80bd3989eb1 (patch) | |
| tree | 119b08ae76294f23e2b1b7e72ff9a06afa9e8509 /gcc-4.8/fixincludes | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.zip toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.gz toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.bz2 | |
[4.8] Merge GCC 4.8.2
Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197
Diffstat (limited to 'gcc-4.8/fixincludes')
| -rw-r--r-- | gcc-4.8/fixincludes/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc-4.8/fixincludes/fixincl.x | 6 | ||||
| -rw-r--r-- | gcc-4.8/fixincludes/inclhack.def | 4 | ||||
| -rw-r--r-- | gcc-4.8/fixincludes/tests/base/iso/math_iso.h | 2 |
4 files changed, 21 insertions, 6 deletions
diff --git a/gcc-4.8/fixincludes/ChangeLog b/gcc-4.8/fixincludes/ChangeLog index c717658..25cd5cf 100644 --- a/gcc-4.8/fixincludes/ChangeLog +++ b/gcc-4.8/fixincludes/ChangeLog @@ -1,3 +1,18 @@ +2013-10-16 Release Manager + + * GCC 4.8.2 released. + +2013-05-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Backport from mainline: + 2013-05-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * inclhack.def (solaris_pow_int_overload): Update comment. + Change guard to match <cmath>. + * fixincl.x: Regenerate. + * tests/base/iso/math_iso.h [SOLARIS_POW_INT_OVERLOAD_CHECK]: + Matching change. + 2013-05-31 Release Manager * GCC 4.8.1 released. diff --git a/gcc-4.8/fixincludes/fixincl.x b/gcc-4.8/fixincludes/fixincl.x index 29fc52a..e28a842 100644 --- a/gcc-4.8/fixincludes/fixincl.x +++ b/gcc-4.8/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Saturday December 29, 2012 at 09:17:09 AM BRST + * It has been AutoGen-ed Thursday May 16, 2013 at 03:34:25 PM MEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Dec 29 09:17:10 BRST 2012 +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 16 15:34:25 MEST 2013 * * You must regenerate it. Use the ./genfixes script. * @@ -6663,7 +6663,7 @@ static tTestDesc aSolaris_Pow_Int_OverloadTests[] = { */ static const char* apzSolaris_Pow_Int_OverloadPatch[] = { "format", - "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\ + "#if __cplusplus < 201103L\n\ %0\n\ #endif", (char*)NULL }; diff --git a/gcc-4.8/fixincludes/inclhack.def b/gcc-4.8/fixincludes/inclhack.def index 2406920..8648e57 100644 --- a/gcc-4.8/fixincludes/inclhack.def +++ b/gcc-4.8/fixincludes/inclhack.def @@ -3447,7 +3447,7 @@ fix = { /* - * The pow overloads with int were removed in C++ 2011. + * The pow overloads with int were removed in C++ 2011 DR 550. */ fix = { hackname = solaris_pow_int_overload; @@ -3456,7 +3456,7 @@ fix = { select = "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\)" " *\\{[^{}]*\n[^{}]*\\}"; c_fix = format; - c_fix_arg = "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n%0\n#endif"; + c_fix_arg = "#if __cplusplus < 201103L\n%0\n#endif"; test_text = " inline long double pow(long double __X, int __Y) { return\n" diff --git a/gcc-4.8/fixincludes/tests/base/iso/math_iso.h b/gcc-4.8/fixincludes/tests/base/iso/math_iso.h index 6c08a94..a1313a7 100644 --- a/gcc-4.8/fixincludes/tests/base/iso/math_iso.h +++ b/gcc-4.8/fixincludes/tests/base/iso/math_iso.h @@ -10,7 +10,7 @@ #if defined( SOLARIS_POW_INT_OVERLOAD_CHECK ) -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L inline long double pow(long double __X, int __Y) { return __powl(__X, (long double) (__Y)); } #endif |