update to 2014.01

This commit is contained in:
Tigro 2014-02-13 16:30:54 +04:00
parent 5a9337f70a
commit 7d18f32dc7
4 changed files with 5 additions and 112 deletions

View file

@ -1,3 +1,2 @@
---
sources:
gcc-linaro-4.7-2012.10.tar.bz2: 6dcd985f46430d157b2b66ef2a1558279c961da3
gcc-linaro-4.7-2014.01.tar.bz2: b662b335e6cdd537f2d3f446c0cc1332a2d9ee3c

View file

@ -1,22 +0,0 @@
--- gcc-4.6.0/libiberty/copying-lib.texi.orig 2011-04-03 14:58:59.362150607 -0300
+++ gcc-4.6.0/libiberty/copying-lib.texi 2011-04-03 14:59:09.864200373 -0300
@@ -476,9 +476,6 @@ decision will be guided by the two goals
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
-@iftex
-@heading NO WARRANTY
-@end iftex
@ifinfo
@center NO WARRANTY
@end ifinfo
@@ -507,9 +504,6 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVI
DAMAGES.
@end enumerate
-@iftex
-@heading END OF TERMS AND CONDITIONS
-@end iftex
@ifinfo
@center END OF TERMS AND CONDITIONS
@end ifinfo

View file

@ -1,82 +0,0 @@
Index: gcc/testsuite/c-c++-common/pr33763.c
===================================================================
--- gcc/testsuite/c-c++-common/pr33763.c (revision 0)
+++ gcc/testsuite/c-c++-common/pr33763.c (revision 192121)
@@ -0,0 +1,60 @@
+/* PR tree-optimization/33763 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef struct
+{
+ void *a;
+ void *b;
+} T;
+extern void *foo (const char *, const char *);
+extern void *bar (void *, const char *, T);
+extern int baz (const char *, int);
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+baz (const char *x, int y)
+{
+ return 2;
+}
+
+int
+baz (const char *x, int y)
+{
+ return 1;
+}
+
+int xa, xb;
+
+static void *
+inl (const char *x, const char *y)
+{
+ T t = { &xa, &xb };
+ int *f = (int *) __builtin_malloc (sizeof (int));
+ const char *z;
+ int o = 0;
+ void *r = 0;
+
+ for (z = y; *z; z++)
+ {
+ if (*z == 'r')
+ o |= 1;
+ if (*z == 'w')
+ o |= 2;
+ }
+ if (o == 1)
+ *f = baz (x, 0);
+ if (o == 2)
+ *f = baz (x, 1);
+ if (o == 3)
+ *f = baz (x, 2);
+
+ if (o && *f > 0)
+ r = bar (f, "w", t);
+ return r;
+}
+
+void *
+foo (const char *x, const char *y)
+{
+ return inl (x, y);
+}
Index: gcc/tree-inline.c
===================================================================
--- gcc/tree-inline.c (revision 192120)
+++ gcc/tree-inline.c (revision 192121)
@@ -3836,6 +3836,12 @@
goto egress;
if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
+ /* For extern inline functions that get redefined we always
+ silently ignored always_inline flag. Better behaviour would
+ be to be able to keep both bodies and use extern inline body
+ for inlining, but we can't do that because frontends overwrite
+ the body. */
+ && !cg_edge->callee->local.redefined_extern_inline
/* Avoid warnings during early inline pass. */
&& cgraph_global_info_ready
/* PR 20090218-1_0.c. Body can be provided by another module. */

View file

@ -15,12 +15,12 @@
%if %{official}
%define snapshot %{nil}
%else
%define snapshot -20120413
%define snapshot -201401
%endif
%define system_compiler 1
%define branch 4.7
%define ver %{branch}.3
%define linaro 2012.10
%define ver %{branch}.4
%define linaro 2014.01
%define gccdir %{_libdir}/gcc/%{_target_platform}/%{ver}
%define multigccdir %{_libdir}/gcc/%{_target_platform}/%{ver}/32
%define multilibdir %{_prefix}/lib
@ -156,7 +156,7 @@ Name: gcc
%else
Name: gcc%{branch}
%endif
Release: 4
Release: 1
Summary: GNU Compiler Collection
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
Group: Development/C
@ -228,14 +228,12 @@ BuildRequires: pkgconfig(cloog-isl)
Patch0: gcc-4.7.1-uclibc-ldso-path.patch
Patch1: gcc-4.6.0-java-nomulti.patch
Patch2: gcc-4.6.0-make-pdf.patch
Patch3: gcc-4.7.1-linux32.patch
Patch4: gnatmake-execstack.patch
Patch5: gcc-4.7.1-linker-selection.patch
Patch6: gcc-4.7.1-autoconf-2.69.patch
Patch7: gcc-4.7.1-linker-plugin-detect.patch
Patch8: gcc-4.7.1-extern-inline-not-inlined.patch
Patch9: gcc-4.7-bug33763.patch
%description
The gcc package contains the GNU Compiler Collection version %{branch}.