[arch-commits] Commit in gcc/trunk (PKGBUILD r158095.patch r160561.patch)
Allan McRae
allan at archlinux.org
Wed Aug 11 12:46:24 UTC 2010
Date: Wednesday, August 11, 2010 @ 08:46:24
Author: allan
Revision: 87242
upgpkg: gcc 4.5.1-1
upstream update, ppl and elfutils rebuild
Modified:
gcc/trunk/PKGBUILD
Deleted:
gcc/trunk/r158095.patch
gcc/trunk/r160561.patch
---------------+
PKGBUILD | 41 ++++++++++++++---------------------
r158095.patch | 13 -----------
r160561.patch | 64 --------------------------------------------------------
3 files changed, 17 insertions(+), 101 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-11 12:45:59 UTC (rev 87241)
+++ PKGBUILD 2010-08-11 12:46:24 UTC (rev 87242)
@@ -6,33 +6,29 @@
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada')
-pkgver=4.5.0
-pkgrel=7
-_snapshot=4.5-20100610
+pkgver=4.5.1
+pkgrel=1
+#_snapshot=4.5-20100610
_libstdcppmanver=20100719 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'custom')
url="http://gcc.gnu.org"
-makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-2' 'cloog-ppl>=0.15.8' 'libelf' 'gcc-ada')
+makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-2' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada')
options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2
+ #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64.patch
- gcc-hash-style-both.patch
- r160561.patch
- r158095.patch)
-md5sums=('d0c6573f18e61d0a6c6fe742066346cd'
- '4c5369d27b8cb4c4e447553f064d0f16'
- '2c191ab600e600c774a65674c542e210'
- 'a569128d6daf741b242e39f5c24debe4'
- 'a7527896c33759ccc40bb82173f8f27f'
+ gcc-hash-style-both.patch)
+md5sums=('dc8959e31b01a65ce10d269614815054'
+ 'b294953ff0bb2f20c7acb2bf005d832a'
+ '7567c2f8df8a8bf61b48fe414b88de65'
+ '3c11b7037896e967eddf8178af2ddd98'
+ 'c92111e2e22fc60d1e0adb1b5c7fa4f9'
'226ae0c6364cfe2c1f7ac88d06088d5a'
'4030ee1c08dd1e843c0225b772360e76'
- '6fd395bacbd7b6e47c7b74854b478363'
- '79cb26e66eb2502171ef69438fa8666d'
- '982bb1e959f3a36d2e205dec1e5b31a1')
+ '6fd395bacbd7b6e47c7b74854b478363')
if [ -n "${_snapshot}" ]; then
@@ -49,6 +45,9 @@
cd ${_basedir}
+ # "Add" ppl-0.11 compatibility
+ sed -i "/ppl_minor_version=/s#10#11#" configure
+
# Do not install libiberty
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -60,12 +59,6 @@
fi
patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44258
- patch -Np1 -i ${srcdir}/r160561.patch
-
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45008
- patch -Np1 -i ${srcdir}/r158095.patch
-
echo ${pkgver} > gcc/BASE-VER
mkdir build && cd build
@@ -111,7 +104,7 @@
package_gcc()
{
- depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.8' 'libelf')
+ depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils')
groups=('base-devel')
install=gcc.install
Deleted: r158095.patch
===================================================================
--- r158095.patch 2010-08-11 12:45:59 UTC (rev 87241)
+++ r158095.patch 2010-08-11 12:46:24 UTC (rev 87242)
@@ -1,13 +0,0 @@
---- a/gcc/cp/decl.c
-+++ b/gcc/cp/decl.c
-@@ -12023,9 +12023,7 @@ start_preparsed_function (tree decl1, tree attrs, int flags)
-
- if ((DECL_DECLARED_INLINE_P (decl1)
- || DECL_TEMPLATE_INSTANTIATION (decl1))
-- && ! DECL_INTERFACE_KNOWN (decl1)
-- /* Don't try to defer nested functions for now. */
-- && ! decl_function_context (decl1))
-+ && ! DECL_INTERFACE_KNOWN (decl1))
- DECL_DEFER_OUTPUT (decl1) = 1;
- else
- DECL_INTERFACE_KNOWN (decl1) = 1;
Deleted: r160561.patch
===================================================================
--- r160561.patch 2010-08-11 12:45:59 UTC (rev 87241)
+++ r160561.patch 2010-08-11 12:46:24 UTC (rev 87242)
@@ -1,64 +0,0 @@
---- trunk/gcc/tree-sra.c 2010/06/10 16:44:04 160560
-+++ trunk/gcc/tree-sra.c 2010/06/10 16:49:09 160561
-@@ -1689,9 +1689,10 @@
-
- /* Build a subtree of accesses rooted in *ACCESS, and move the pointer in the
- linked list along the way. Stop when *ACCESS is NULL or the access pointed
-- to it is not "within" the root. */
-+ to it is not "within" the root. Return false iff some accesses partially
-+ overlap. */
-
--static void
-+static bool
- build_access_subtree (struct access **access)
- {
- struct access *root = *access, *last_child = NULL;
-@@ -1706,24 +1707,32 @@
- last_child->next_sibling = *access;
- last_child = *access;
-
-- build_access_subtree (access);
-+ if (!build_access_subtree (access))
-+ return false;
- }
-+
-+ if (*access && (*access)->offset < limit)
-+ return false;
-+
-+ return true;
- }
-
- /* Build a tree of access representatives, ACCESS is the pointer to the first
-- one, others are linked in a list by the next_grp field. Decide about scalar
-- replacements on the way, return true iff any are to be created. */
-+ one, others are linked in a list by the next_grp field. Return false iff
-+ some accesses partially overlap. */
-
--static void
-+static bool
- build_access_trees (struct access *access)
- {
- while (access)
- {
- struct access *root = access;
-
-- build_access_subtree (&access);
-+ if (!build_access_subtree (&access))
-+ return false;
- root->next_grp = access;
- }
-+ return true;
- }
-
- /* Return true if expr contains some ARRAY_REFs into a variable bounded
-@@ -2062,9 +2071,7 @@
- struct access *access;
-
- access = sort_and_splice_var_accesses (var);
-- if (access)
-- build_access_trees (access);
-- else
-+ if (!access || !build_access_trees (access))
- disqualify_candidate (var,
- "No or inhibitingly overlapping accesses.");
- }
More information about the arch-commits
mailing list