Merge branch 'master' of ssh://gparabola/abslibre

Conflicts:
	cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD

1 files changed, 11 insertions, 8 deletions

diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
index 69bdf6deb..2f3f65cff 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
@@ -11,16 +11,20 @@ pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture"
 url="http://www.gnu.org/software/binutils/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libmpc' 'sh' "cross-mips64el-linux-gnu-gcc-base" "cross-${_target}-binutils" "cross-${_target}-glibc" 'cloog' 'ppl')
+#depends=('libmpc' 'sh' "cross-mips64el-linux-gnu-gcc-base" "cross-${_target}-binutils" "cross-${_target}-glibc" 'cloog' 'ppl')
+depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
 options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
 source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-core-${pkgver}.tar.bz2")
 md5sums=('780f614ab18c7a9066dec6387d7490b2')
 
-export PATH=${_sysroot}/bin:/usr/bin/cross/${_target}:$PATH
-
 build() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
-	
+
+        # -march=x86-64 and -mtune=generic don't work on mips64el, we
+        # also want to use -mfix-loongson2f-nop.
+	export CFLAGS_FOR_TARGET="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
+	export CXXFLAGS_FOR_TARGET="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
+
 	./configure \
 		"--prefix=${_sysroot}" \
 		"--bindir=/usr/bin" "--program-prefix=${_target}-" \
@@ -29,11 +33,10 @@ build() {
         --enable-shared \
 		--with-gnu-as --with-gnu-ld \
 		--disable-nls --disable-threads \
-		--enable-languages=c,c++,lto,fortran,objc,obj-c++ \
+		--enable-languages=c \
 		--disable-multilib --disable-libgcj \
-        --enable-cloog-backend=isl \
-		--without-headers #--disable-shared
-	
+        --enable-cloog-backend=isl
+#		--enable-languages=c,c++,lto,fortran,objc,obj-c++ \
 	make all # -gcc "inhibit_libc=true"
 }