Preparing final mips64el-gcc

18 files changed, 181 insertions, 41 deletions

diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
new file mode 100644
index 000000000..3c61dbfca
--- /dev/null
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
@@ -0,0 +1,92 @@
+# Contributor: Nicolás Reynolds <fauno@parabola.nu>
+# Contributor (mipsel): Vojtech Horky <vojta . horky at-symbol seznam . cz>
+# This package is used to bootstrap a cross glibc and full featured cross gcc
+# Change the following variables to match your target
+_pkgname=gcc
+_target="mips64el-unknown-linux-gnu"
+_sysroot="/usr/${_target}"
+_ARCH=mips
+
+unset LDFLAGS CFLAGS CXXFLAGS
+
+pkgname=cross-${_target}-gcc-core-shared
+pkgver=4.6.2
+pkgrel=8
+pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (shared version)"
+url="http://www.gnu.org/software/binutils/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
+makedepends=("cross-${_target}-glibc-headers"
+             "cross-${_target}-gcc-core")
+options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
+source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+md5sums=('028115c4fbfb6cfd75d6369f4a90d87e')
+
+build() {
+  cd ${srcdir}
+  mkdir gcc-build && cd gcc-build
+  mkdir ${_target}
+
+  Copy headers for libgcc2
+  cp -av /usr/${_target}/usr/include ${_target}/include
+
+    CC_FOR_BUILD=${CHOST}-gcc \
+    CFLAGS=" -pipe " \
+    LDFLAGS= \
+    ${srcdir}/${_pkgname}-${pkgver}/configure \
+        --build=${CHOST} \
+        --host=${CHOST} \
+        --target=${_target} \
+        --prefix=/usr \
+        --with-local-prefix=${_sysroot} \
+        --disable-multilib \
+        --disable-libmudflap \
+        --with-sysroot=${_sysroot} \
+        --enable-shared \
+        --with-arch=loongson2f \
+        --with-abi=n32 \
+        --enable-__cxa_atexit \
+        --with-gmp \
+        --with-mpfr \
+        --with-mpc \
+        --with-ppl \
+        --enable-cloog-backend=isl \
+        --with-libelf \
+        --enable-lto \
+        --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
+        --enable-target-optspace \
+        --disable-libgomp \
+        --disable-libmudflap \
+        --disable-nls \
+        --enable-languages=c
+
+    msg2 "Configuring gcc and libgcc"
+    make ${MAKEFLAGS} configure-gcc configure-libcpp configure-build-libiberty
+
+    msg2 "Making libcpp and libiberty"
+    make ${MAKEFLAGS} all-libcpp all-build-libiberty
+
+    msg2 "Configuring libdecnumber"
+    make ${MAKEFLAGS} configure-libdecnumber
+
+    msg2 "Making libdecnumber"
+    make ${MAKEFLAGS} -C libdecnumber libdecnumber.a 
+
+    msg2 "Making mvars"
+    make ${MAKEFLAGS} -C gcc libgcc.mvars
+
+# Remove -lc since we don't have it yet
+    sed -r -i -e 's@-lc@@g' gcc/libgcc.mvars
+
+    msg2 "Making gcc and libgcc"
+    make ${MAKEFLAGS} all-gcc all-target-libgcc
+}
+
+package() {
+	cd ${srcdir}/${_pkgname}-build
+	
+	make ${MAKEFLAGS} DESTDIR=${pkgdir} install-gcc install-target-libgcc
+
+    rm -r ${pkgdir}/usr/share
+}
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
index ea816086f..a83a1238a 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
@@ -185,6 +185,11 @@ package() {
                  -x c /dev/null   \
                  -o ${pkgdir}${_sysroot}/usr/lib/libc.so
 
+# This will help gcc-shared to find headers for libgcc2
+  msg2 "Symlinking headers"
+  rm -r ${pkgdir}${_sysroot}/include
+  ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include
+
 }
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '98d028ee63fca2821414ebcac0af0e5b'
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
index 4dd3c364c..e5e37beee 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
@@ -6,12 +6,12 @@
 
 _pkgname=glibc
 _target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/lib/cross-${_target}"
+_sysroot="/usr/${_target}"
 _ARCH=mips
 
 unset CFLAGS CXXFLAGS LDFLAGS
 
-pkgname=cross-${_target}-glibc
+pkgname=${_target}-glibc
 pkgver=2.15
 pkgrel=2
 _glibcdate=20111227
@@ -20,9 +20,10 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=("${_target}-devel")
-depends=("${_ARCH}-linux-api-headers>=3.1.6" 'tzdata')
+depends=("${_target}-linux-api-headers>=3.1.6" 'tzdata')
 makedepends=("cross-${_target}-binutils"
-             "cross-${_target}-gcc-core")
+             "cross-${_target}-gcc-core-shared"
+             "cross-${_target}-glibc-headers")
 backup=(etc/gai.conf
         etc/locale.gen
         etc/nscd.conf)
@@ -41,6 +42,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgname}-${pkgver}_${_glibcdate}.
         glibc-2.15-lddebug-scopes.patch
         glibc-2.15-revert-c5a0802a.patch
         glibc-2.15-math64crash.patch
+        configure.patch
         nscd
         locale.gen.txt
         locale-gen)
@@ -125,38 +127,53 @@ build() {
   # obviously not a real fix...
   patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
 
-  ln -s ../glibc-ports ports
+  patch -Np0 -i ${srcdir}/configure.patch
 
   install -dm755 ${pkgdir}${_sysroot}/etc
   touch ${pkgdir}${_sysroot}/etc/ld.so.conf
 
+  ln -s ../glibc-ports ports
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
 
-  echo "slibdir=${_sysroot}/lib" >> configparms
+  echo "slibdir=/lib" >> configparms
+  echo "libc_cv_ctors_header=no" >> config.cache
+  echo "libc_cv_forced_unwind=yes" >> config.cache
+  echo "libc_cv_c_cleanup=yes" >> config.cache
 
   # remove hardening options from CFLAGS for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
   CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 
-
-  BUILD_CC="gcc" \
-  CC="${_target}-gcc" \
-  AR="${_target}-ar" \
-  RANLIB="${_target}-ranlib" \
-  ${srcdir}/glibc/configure \
-		--prefix=${_sysroot} \
-		--build=$CHOST --host=$_target \
-      --libdir=${_sysroot}/usr/lib --libexecdir=${_sysroot}/usr/lib \
-      --with-headers=/usr/lib/${_ARCH}/include \
-      --with-binutils=/usr/bin/cross/${_target} \
-      --enable-add-ons=nptl,libidn,ports \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --enable-multi-arch --enable-shared
+    BUILD_CC=${CHOST}-gcc \
+    CFLAGS=" -EL -march=loongson2f -mabi=n32 -O2 -U_FORTIFY_SOURCE " \
+    CC=${_target}-gcc \
+    AR=${_target}-ar \
+    RANLIB=${_target}-ranlib \
+    ${srcdir}/glibc/configure \
+        --prefix=/usr \
+        --cache-file=${srcdir}/glibc-build/config.cache \
+        --build=${CHOST} \
+        --host=${_target} \
+        --without-cvs \
+        --disable-profile \
+        --without-gd \
+        --with-headers=/usr/${_target}/usr/include \
+        --disable-debug \
+        --disable-sanity-checks \
+        --enable-kernel=2.6.27 \
+        --with-__thread \
+        --with-tls \
+        --enable-shared \
+        --with-fp \
+        --enable-add-ons=nptl,ports,libidn \
+        --enable-bind-now \
+        --enable-multi-arch
+
+      #  --libdir=${_sysroot}/usr/lib \
+      #  --libexecdir=${_sysroot}/usr/lib \
 
   # build libraries with hardening disabled
   echo "build-programs=no" >> configparms
@@ -181,7 +198,7 @@ check() {
 
 package() {
   cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
+  make install_root=${pkgdir}${_sysroot} install
 
   rm -f ${pkgdir}${_sysroot}/etc/ld.so.{cache,conf}
 
@@ -197,15 +214,15 @@ package() {
 
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}${_sysroot}/etc/locale.gen
-  sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
-  cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen
+  sed -e "s|/| |g" \
+      -e 's|\\| |g' \
+      -e "s|SUPPORTED-LOCALES=||" \
+      ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen
   sed -i "s|^|#|g" ${pkgdir}${_sysroot}/etc/locale.gen
 
   if [[ ${CARCH} = "x86_64" ]]; then
     # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/usr/bin/ldd
+    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/bin/ldd
     # Comply with multilib binaries, they look for the linker in /lib64
     mkdir ${pkgdir}${_sysroot}/lib64
     cd ${pkgdir}${_sysroot}/lib64
@@ -220,27 +237,53 @@ package() {
   #   libthread_db-1.0.so
 
 # cd $pkgdir${_sysroot}
-# strip $STRIP_BINARIES sbin/{ldconfig,sln} \
+# ${_target}-strip $STRIP_BINARIES \
+#                       sbin/{ldconfig,sln} \
 #                       usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
 #                       usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
 #                       usr/lib/getconf/* \
 #                       usr/sbin/{iconvconfig,nscd}
 # [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
 
-# strip $STRIP_STATIC usr/lib/*.a
+# ${_target}-strip $STRIP_STATIC usr/lib/*.a
 
-# strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
+# ${_target}-strip $STRIP_SHARED \
+#                     lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
 #                     lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
 #                     lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
 #                     lib/{libmemusage,libpcprofile,libSegFault}.so \
 #                     usr/lib/{pt_chown,{audit,gconv}/*.so}
-	
-	msg "Creating out-of-path executables..."
-	# symlink executables to single directory with no-arch-prefix name
-	mkdir -p ${pkgdir}/usr/bin/cross/${_target}/;
-	cd ${pkgdir}/usr/bin/cross/${_target}/;
-	for bin in ${pkgdir}/usr/bin/${_target}-*; do
-		bbin=`basename "$bin"`;
-		ln -s "/usr/bin/${bbin}" `echo "$bbin" | sed "s#^${_target}-##"`;
-	done
 }
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
+         '98d028ee63fca2821414ebcac0af0e5b'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '6970bcfeb3bf88913436d5112d16f588'
+         '7da8c554a3b591c7401d7023b1928afc'
+         'c5de2a946215d647c8af5432ec4b0da0'
+         '55febbb72139ac7b65757df085024b83'
+         '3c219ddfb619b6df903cac4cc42c611d'
+         '7ae3e426251ae33e73dbad71f9c91378'
+         'dc7550e659ddd685bd78a930d15a01f2'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
+         '98d028ee63fca2821414ebcac0af0e5b'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '6970bcfeb3bf88913436d5112d16f588'
+         '7da8c554a3b591c7401d7023b1928afc'
+         'c5de2a946215d647c8af5432ec4b0da0'
+         '55febbb72139ac7b65757df085024b83'
+         '3c219ddfb619b6df903cac4cc42c611d'
+         '7ae3e426251ae33e73dbad71f9c91378'
+         'dc7550e659ddd685bd78a930d15a01f2'
+         '39f80ba6bcda6b010a66f9c61e9a0017'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch
index cf1a97a18..cf1a97a18 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch
index d3abeff17..d3abeff17 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
index ce089b49c..ce089b49c 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch
index 6c9d2718e..6c9d2718e 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch
index e2beea881..e2beea881 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
index eb0fd822d..eb0fd822d 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch
index 11f087cb7..11f087cb7 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch
index 808cf8d7c..808cf8d7c 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch
index d315bf266..d315bf266 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch
index f532b95e8..f532b95e8 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
index 28d5dd424..28d5dd424 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc.install b/cross/mips64el-unknown-linux-gnu-glibc/glibc.install
index 7f85ade96..7f85ade96 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/glibc.install
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc.install
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/locale-gen b/cross/mips64el-unknown-linux-gnu-glibc/locale-gen
index 5aff344c4..5aff344c4 100755
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/locale-gen
+++ b/cross/mips64el-unknown-linux-gnu-glibc/locale-gen
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/locale.gen.txt b/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt
index ccdd81734..ccdd81734 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/locale.gen.txt
+++ b/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc/nscd b/cross/mips64el-unknown-linux-gnu-glibc/nscd
index 8b14f2a3f..8b14f2a3f 100755
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc/nscd
+++ b/cross/mips64el-unknown-linux-gnu-glibc/nscd