diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | gcc-4.9-fix-build-with-gcc-6.patch | 126 |
3 files changed, 7 insertions, 140 deletions
@@ -1,6 +1,6 @@ pkgbase = gcc49 pkgdesc = The GNU Compiler Collection - pkgver = 4.9.3 + pkgver = 4.9.4 pkgrel = 1 url = http://gcc.gnu.org arch = i686 @@ -15,14 +15,12 @@ pkgbase = gcc49 makedepends = libmpc makedepends = doxygen options = !emptydirs - source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.3/gcc-4.9.3.tar.bz2 + source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/gcc-4.9.4.tar.bz2 source = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.12.2.tar.bz2 source = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.18.1.tar.gz - source = gcc-4.9-fix-build-with-gcc-6.patch - md5sums = 6f831b4d251872736e8e9cc09746f327 + md5sums = 87c24a4090c1577ba817ec6882602491 md5sums = e039bfcfb6c2ab039b8ee69bf883e824 md5sums = e34fca0540d840e5d0f6427e98c92252 - md5sums = 91f27a8002df38cf2ca971ca80feb9d7 pkgname = gcc49 @@ -4,7 +4,7 @@ pkgname=('gcc49') _pkgver=4.9 -_pkgver_minor=3 +_pkgver_minor=4 pkgver=${_pkgver}.${_pkgver_minor} _islver=0.12.2 _cloogver=0.18.1 @@ -18,12 +18,10 @@ checkdepends=('dejagnu' 'inetutils') options=('!emptydirs') source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2" "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2" - "ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-${_cloogver}.tar.gz" - "gcc-4.9-fix-build-with-gcc-6.patch") -md5sums=('6f831b4d251872736e8e9cc09746f327' + "ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-${_cloogver}.tar.gz") +md5sums=('87c24a4090c1577ba817ec6882602491' 'e039bfcfb6c2ab039b8ee69bf883e824' - 'e34fca0540d840e5d0f6427e98c92252' - '91f27a8002df38cf2ca971ca80feb9d7') + 'e34fca0540d840e5d0f6427e98c92252') _basedir=gcc-${pkgver} _libdir="usr/lib/gcc/$CHOST/$pkgver" @@ -38,9 +36,6 @@ prepare() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - # fix build with GCC 6 - patch -p1 < "${srcdir}/gcc-4.9-fix-build-with-gcc-6.patch" - # Arch Linux installs x86_64 libraries /lib [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 diff --git a/gcc-4.9-fix-build-with-gcc-6.patch b/gcc-4.9-fix-build-with-gcc-6.patch deleted file mode 100644 index e158c9d6d932..000000000000 --- a/gcc-4.9-fix-build-with-gcc-6.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/gcc/cp/Make-lang.in -++++ b/gcc/cp/Make-lang.in -@@ -111,7 +111,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # -diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf -index 05ca753..d9b16b8 100644 ---- a/gcc/cp/cfns.gperf -+++ b/gcc/cp/cfns.gperf -@@ -1,3 +1,5 @@ -+%language=C++ -+%define class-name libc_name - %{ - /* Copyright (C) 2000-2014 Free Software Foundation, Inc. - -@@ -16,14 +18,6 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - <http://www.gnu.org/licenses/>. */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index c845ddf..65801d1 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ -output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2014 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - <http://www.gnu.org/licenses/>. */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { -diff --git a/gcc/cp/except.c b/gcc/cp/except.c -index 221971a..32340f5 100644 ---- a/gcc/cp/except.c -+++ b/gcc/cp/except.c -@@ -1030,7 +1030,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a --- -2.8.2 - |