summaryrefslogtreecommitdiff
path: root/core/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'core/gcc')
-rw-r--r--core/gcc/PKGBUILD101
-rw-r--r--core/gcc/gcc-4.7.0-cloog-0.17.patch24
-rw-r--r--core/gcc/gcc-4.7.1-libada-pic.patch12
-rw-r--r--core/gcc/gcc-4.7.1-libgo-mksysinfo.patch15
-rw-r--r--core/gcc/gcc-4.7.1-libgo-write.patch13
-rw-r--r--core/gcc/gcc_pure64.patch26
6 files changed, 51 insertions, 140 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 2ca966bd0..28b61a605 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176037 2013-01-26 23:37:17Z allan $
+# $Id: PKGBUILD 184258 2013-05-05 07:09:51Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -9,34 +9,29 @@ if [ "${CARCH}" != "mips64el" ]; then
else
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
fi
-pkgver=4.7.2
+pkgver=4.8.0
pkgrel=4
-#_snapshot=4.7-20120721
+_snapshot=4.8-20130502
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'doxygen')
+makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
[[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs' '!distcc')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- gcc-4.7.1-libgo-write.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
- 'df82dd175ac566c8a6d46b11ac21f14c')
+checkdepends=('dejagnu' 'inetutils')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2)
+ #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+md5sums=('672a1ad73f8391c5a6b3c4429eb0d798')
if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
+ _basedir=gcc-${_snapshot}
else
- _basedir="${srcdir}/gcc-${pkgver}"
+ _basedir=gcc-${pkgver}
fi
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+prepare() {
+ cd ${srcdir}/${_basedir}
# Do not run fixincludes
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -45,19 +40,22 @@ build() {
[[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
[[ $CARCH == "mips64el" ]] && sed -i 's/lib32/lib/' gcc/config/mips/t-linux64
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
- patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-
echo ${pkgver} > gcc/BASE-VER
+ # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+ mkdir ${srcdir}/gcc-build
+}
+
+build() {
+ cd ${srcdir}/gcc-build
+
# using -pipe causes spurious test-suite failures
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
CFLAGS=${CFLAGS/-pipe/}
CXXFLAGS=${CXXFLAGS/-pipe/}
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
# Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built.
export BOOT_CFLAGS="$CFLAGS"
export CFLAGS_FOR_BUILD="$CFLAGS"
@@ -77,7 +75,7 @@ build() {
languages=c,c++,fortran,lto,objc,obj-c++
fi
- ${_basedir}/configure --prefix=/usr \
+ ${srcdir}/${_basedir}/configure --prefix=/usr \
--libdir=/usr/lib --libexecdir=/usr/lib \
--mandir=/usr/share/man --infodir=/usr/share/info \
--with-bugurl=https://labs.parabola.nu/ \
@@ -85,15 +83,13 @@ build() {
--enable-shared --enable-threads=posix \
--with-system-zlib --enable-__cxa_atexit \
--disable-libunwind-exceptions --enable-clocale=gnu \
- --disable-libstdcxx-pch --enable-libstdcxx-time \
+ --disable-libstdcxx-pch \
--enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --disable-ppl-version-check --disable-cloog-version-check \
+ --enable-cloog-backend=isl --disable-cloog-version-check \
--enable-lto --enable-gold --enable-ld=default \
--enable-plugin --with-plugin-ld=ld.gold \
- $extra \
- --disable-multilib --disable-libssp \
- --disable-build-with-cxx --disable-build-poststage1-with-cxx \
+ $extra --disable-install-libiberty \
+ --disable-multilib --disable-libssp --disable-werror \
--enable-checking=release
make
@@ -113,7 +109,7 @@ check() {
# do not abort on error as some are "expected"
make -k check || true
- ${_basedir}/contrib/test_summary
+ ${srcdir}/${_basedir}/contrib/test_summary
fi
}
@@ -129,9 +125,10 @@ package_gcc-libs()
for lib in libmudflap libgomp libstdc++-v3/src; do
make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
done
- [ "$CARCH" != "mips64el" ] && for lib in libitm; do
+ [ "$CARCH" != "mips64el" ] && for lib in libitm libsanitizer/asan; do
make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
done
+
make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
[ "$CARCH" != "mips64el" ] && make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
@@ -147,14 +144,14 @@ package_gcc-libs()
find ${pkgdir} -name *.a -delete
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
}
package_gcc()
{
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
+ depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
groups=('base-devel')
install=gcc.install
@@ -163,23 +160,20 @@ package_gcc()
make -j1 DESTDIR=${pkgdir} install
install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
- mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
+ mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
# unfortunately it is much, much easier to install the lot and clean-up the mess...
- # -f makes rm return 0 if the archive doesn't exist
rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
rm -f $pkgdir/usr/lib/*.so*
- rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc}.a
+ rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
rm -f $pkgdir/usr/lib/libgfortran.spec
- rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h
+ rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
- rm -fr $pkgdir/usr/lib/go
+ rm -rf $pkgdir/usr/lib/go
rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm -f $pkgdir/usr/share/man/man3/ffi*
# many packages expect this symlinks
ln -s gcc ${pkgdir}/usr/bin/cc
@@ -219,7 +213,7 @@ EOF
${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
}
@@ -237,10 +231,15 @@ package_gcc-fortran()
ln -s gfortran ${pkgdir}/usr/bin/f95
- rm ${pkgdir}/usr/lib/libgfortran.so*
+ # remove files included in gcc-libs or gcc
+ rm -f ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
+ rm -f ${pkgdir}/usr/lib/libquadmath.{a,so*}
+ rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
+ rm -f ${pkgdir}/usr/share/info/libquadmath.info
+ rm -fr ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
}
@@ -254,11 +253,13 @@ package_gcc-objc()
install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- # remove libraries included in gcc-libs
- rm -f ${pkgdir}/usr/lib/libobjc.so*
+ # remove files included in gcc-libs or gcc
+ rm ${pkgdir}/usr/lib/lib{gcc_s,objc}.so*
+ rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{*.o,lib*}
+ rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/unwind.h
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
}
@@ -275,7 +276,7 @@ package_gcc-ada()
ln -s gcc ${pkgdir}/usr/bin/gnatgcc
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
}
@@ -291,6 +292,6 @@ package_gcc-go()
install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
# Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
}
diff --git a/core/gcc/gcc-4.7.0-cloog-0.17.patch b/core/gcc/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/core/gcc/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
- LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
-
- if test "${cloog_org}" = yes ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
-- || CLOOG_VERSION_MINOR != 16 \
-- || CLOOG_VERSION_REVISION < 1
-+ || CLOOG_VERSION_MINOR != 17
- choke me
- #endif
- ;
diff --git a/core/gcc/gcc-4.7.1-libada-pic.patch b/core/gcc/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/core/gcc/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- -fexceptions -DIN_RTS @have_getipinfo@
-
- host_subdir = @host_subdir@
diff --git a/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
-- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-- rusage=`echo $rusage | sed -e 's/^ *//'`
- # Remove anonymous unions from GNU/Linux <bits/resource.h>.
- rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+ rusage=`echo $rusage | sed -e 's/^ *//'`
- nrusage=
- while test -n "$rusage"; do
- field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/core/gcc/gcc-4.7.1-libgo-write.patch b/core/gcc/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/core/gcc/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- G* g = runtime_g();
-
- if(g == nil || g->writebuf == nil) {
-- runtime_write(2, v, n);
-+ ssize_t bytesWritten = runtime_write(2, v, n);
-+ (void)bytesWritten;
- return;
- }
-
diff --git a/core/gcc/gcc_pure64.patch b/core/gcc/gcc_pure64.patch
deleted file mode 100644
index a9b09bbcf..000000000
--- a/core/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
-
- LIBGCC = stmp-multilib