diff options
author | Johnny Halfmoon | 2016-05-29 12:11:39 +0200 |
---|---|---|
committer | Johnny Halfmoon | 2016-05-29 12:11:39 +0200 |
commit | a4bee146374a60f2c556da31ae33e174fbb8f96d (patch) | |
tree | 4cb9189325ba7c824f0ef4e3e9fcc731ed524c14 | |
parent | 861f17240fc096a74484e043831825159e8f7b77 (diff) | |
download | aur-a4bee146374a60f2c556da31ae33e174fbb8f96d.tar.gz |
update gcc and newlib version
-rwxr-xr-x | PKGBUILD | 16 | ||||
-rw-r--r-- | gcc-4.9-fix-build-with-gcc-6.patch | 126 |
2 files changed, 136 insertions, 6 deletions
@@ -7,22 +7,24 @@ _reldate=20${_relshortdate} _relverdate=${_relver}-${_reldate} # This is how I want to define the pkgver, but the AUR doesn't understand it, because multiple _ characters are not allowed #pkgver=${_relver}_${_reldate//-/_} -pkgver=4.9_2014.09 +pkgver=4.9_2015.06 pkgrel=1 -_newlibver=linaro-2.1.0-2014.09 +_newlibver=linaro-2.2.0-2015.01 +_newlibvershort=15.01 #_newlibver=2.0.0 pkgdesc="The GNU Compiler Collection - cross compiler for ARM EABI (bare-metal) target." arch=(i686 x86_64) url="https://releases.linaro.org/" license=('GPL' 'LGPL') groups=('arm-none-eabi-toolchain') -depends=('arm-none-eabi-binutils>=2.23.2' 'gmp' 'mpfr' 'libmpc') +depends=('arm-none-eabi-binutils>=2.26-1' 'gmp' 'mpfr' 'libmpc') makedepends=('flex' 'bison') provides=('arm-none-eabi-gcc') conflicts=('arm-none-eabi-gcc' 'cross-arm-none-eabi-gcc') options=(staticlibs !libtool !emptydirs !strip zipman docs) source=(http://releases.linaro.org/${_relshortdate}/components/toolchain/gcc-linaro/${_relver}/gcc-linaro-${_relverdate}.tar.xz - http://releases.linaro.org/14.09/components/toolchain/newlib-linaro/newlib-${_newlibver}.tar.bz2 + http://releases.linaro.org/${_newlibvershort}/components/toolchain/newlib-linaro/newlib-${_newlibver}.tar.xz + gcc-4.9-fix-build-with-gcc-6.patch gcc-${_relver}-multilib2.patch gcc-${_relver}-no-exceptions.patch) _basedir=gcc-linaro-${_relverdate} @@ -38,10 +40,12 @@ _reldate=20${_relshortdate} cd ${srcdir}/${_basedir} patch -Np0 -i "${srcdir}/gcc-${_relver}-multilib2.patch" patch -Np0 -i "${srcdir}/gcc-${_relver}-no-exceptions.patch" + patch -Np0 -i "${srcdir}/gcc-4.9-fix-build-with-gcc-6.patch" mkdir build cd build +# --build=${CHOST} \ export CFLAGS="-O2" export CXXFLAGS="-O2" unset CPPFLAGS @@ -82,7 +86,7 @@ package() { # vim: set ts=2 sw=2 ft=sh et: sha256sums=('c708c486f62f0d283f8615d7bc05d9830d50e15c52cfe213ec3992f6c190c222' - 'ed92e8547246834725a3c5743fa41d3f573e3e5d2e5066d433ac3c29e6676fc8' + 'd29fe53d70f545c2fb080b9686e05d0f8af5088fec9b7dc78bc788a98765ef99' + 'b328e9cdca4e2869490d932191b78ef1a61c60382cea3a23d1ef86e7c1fb86a7' '104b9aa652804a56338470983e6975af1d1e5440eb8bddae3a01a966d2b332cf' '3a1d6a17aba8a578ade3552a6d1beb66a129fb4f3268539596d39cbbef88ac6c') - diff --git a/gcc-4.9-fix-build-with-gcc-6.patch b/gcc-4.9-fix-build-with-gcc-6.patch new file mode 100644 index 000000000000..f7cb0b5d13b8 --- /dev/null +++ b/gcc-4.9-fix-build-with-gcc-6.patch @@ -0,0 +1,126 @@ +--- gcc/cp/Make-lang.in +++++ 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 gcc/cp/cfns.gperf gcc/cp/cfns.gperf +index 05ca753..d9b16b8 100644 +--- gcc/cp/cfns.gperf ++++ 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 gcc/cp/cfns.h gcc/cp/cfns.h +index c845ddf..65801d1 100644 +--- gcc/cp/cfns.h ++++ 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 gcc/cp/except.c gcc/cp/except.c +index 221971a..32340f5 100644 +--- gcc/cp/except.c ++++ 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 + |