diff -urN armhf-cross-toolchain-base-1.91/debian/changelog arm64-cross-toolchain-base-1.91/debian/changelog --- armhf-cross-toolchain-base-1.91/debian/changelog 2012-11-19 11:40:49.000000000 +0000 +++ arm64-cross-toolchain-base-1.91/debian/changelog 2012-11-28 18:39:24.000000000 +0000 @@ -1,5 +1,6 @@ -armhf-cross-toolchain-base (1.91) raring; urgency=low +arm64-cross-toolchain-base (1.91) raring; urgency=low + [ Marcin Juszkiewicz ] * Make use of all toolchain improvements in raring. * Use only gcc-4.7 for bootstrap. * Bumped linux-source to 3.7 @@ -14,7 +15,7 @@ * removed svn-doc-updates.diff from debian/rules.patch - it is broken * Forced --disable-werror for cross binutils - aarch64 needs that - LP: 1079676 - -- Marcin Juszkiewicz Mon, 19 Nov 2012 12:06:57 +0100 + -- Wookey Wed, 28 Nov 2012 18:39:08 +0000 armhf-cross-toolchain-base (1.90) raring; urgency=low diff -urN armhf-cross-toolchain-base-1.91/debian/control.in arm64-cross-toolchain-base-1.91/debian/control.in --- armhf-cross-toolchain-base-1.91/debian/control.in 2012-11-14 09:59:22.000000000 +0000 +++ arm64-cross-toolchain-base-1.91/debian/control.in 2012-11-29 16:27:20.000000000 +0000 @@ -9,7 +9,7 @@ binutils-source (>= 2.21.0.20110327-2~), eglibc-source (>= MIN_VER_EGLIBC), gcc-VER_GCC_BASE-source (>= MIN_VER_GCC), - linux-source (>= MIN_VER_LINUX), EXTRA_DEPS + linux-source-3.6.4 (>= MIN_VER_LINUX), EXTRA_DEPS autoconf (>= 2.64), autoconf2.64, autogen, automake (<< 1:1.12), automake (>= 1:1.11), bison (>= 1:2.3), chrpath, debhelper (>= 5.0.62), dpkg-dev (>= 1.15.3.1), fakeroot, file, flex, diff -urN armhf-cross-toolchain-base-1.91/debian/rules arm64-cross-toolchain-base-1.91/debian/rules --- armhf-cross-toolchain-base-1.91/debian/rules 2012-11-19 11:13:50.000000000 +0000 +++ arm64-cross-toolchain-base-1.91/debian/rules 2012-12-10 17:22:47.000000000 +0000 @@ -14,9 +14,9 @@ DISTRO ?= $(shell lsb_release -is) ifeq ($(DISTRO),Debian) - MIN_VER_EGLIBC := 2.13-5~ - MIN_VER_LINUX := 3.2 - MIN_VER_GCC := 4.7.2-5 + MIN_VER_EGLIBC := 2.16-0arm64.1 + MIN_VER_LINUX := 3.6.4 + MIN_VER_GCC := 4.7.2-7 VER_LINUX := $(shell apt-cache policy linux-source|grep '\*\*\*'|sed -e 's/ ... \([0-9\.]*\)+.*/\1/g') DEB_VER_LINUX := $(shell apt-cache policy linux-source-3.2|grep '\*\*\*'|sed -e 's/ ... \([0-9\.\-]*\).*/\1/g') # default version of gcc which will be used @@ -98,7 +98,7 @@ info: @echo "Binutils version: ${VER_BINUTILS} ${DEB_VER_BINUTILS} ${PKG_VER_BINUTILS}" - @echo "GCC 4.7 version: ${VER_GCC} ${DEB_VER_GCC} ${VER_GCC_BASE}" + @echo "GCC 4.7 version: ${VER_GCC} ${DEB_VER_GCC} ${VER_GCC_BASE}" @echo "Eglibc version: ${VER_EGLIBC} ${DEB_VER_EGLIBC}" @echo "Linux version: ${VER_LINUX} ${DEB_VER_LINUX}" @echo @@ -138,16 +138,16 @@ export DEBEMAIL="`echo $$DEBMAIL | sed -e 's/.*<\(.*\)>/\1/g'`"; \ export DEBFULLNAME="`echo $$DEBMAIL | sed -e 's/\(.*\)<.*>/\1/g'`"; \ cd linux-source-${VER_LINUX} ;\ - export ARCH=arm ;\ + export ARCH=arm64 ;\ make omap2plus_defconfig ;\ make oldnoconfig ;\ echo 1 >.version ;\ make deb-pkg rm -rf tmp install -d tmp - dpkg-deb -x linux-libc-dev_${DEB_VER_LINUX}_armel.deb tmp - dpkg-deb -e linux-libc-dev_${DEB_VER_LINUX}_armel.deb tmp/DEBIAN - sed -i -e 's/armel/${CROSS_ARCH}/g' tmp/DEBIAN/control + dpkg-deb -x linux-libc-dev_${DEB_VER_LINUX}_arm64.deb tmp + dpkg-deb -e linux-libc-dev_${DEB_VER_LINUX}_arm64.deb tmp/DEBIAN + sed -i -e 's/arm64/${CROSS_ARCH}/g' tmp/DEBIAN/control cd tmp/usr/include ;\ rm -rf drm scsi ;\ rm -f `find . -name .install` ;\ @@ -221,9 +221,9 @@ dpkg-deb -x gcc-${VER_GCC_BASE}-${CROSS_GNU_TYPE}_${DEB_VER_GCC}_${HOST_ARCH}.deb debian/tmp dpkg-deb -x cpp-${VER_GCC_BASE}-${CROSS_GNU_TYPE}_${DEB_VER_GCC}_${HOST_ARCH}.deb debian/tmp cd debian/tmp/$(PF)/bin/ && \ - ln -sf ${CROSS_GNU_TYPE}-gcc-${VER_GCC} ${CROSS_GNU_TYPE}-gcc && \ - ln -sf ${CROSS_GNU_TYPE}-cpp-${VER_GCC} ${CROSS_GNU_TYPE}-cpp && \ - ln -sf ${CROSS_GNU_TYPE}-gcov-${VER_GCC} ${CROSS_GNU_TYPE}-gcov + ln -sf ${CROSS_GNU_TYPE}-gcc-${VER_GCC_BASE} ${CROSS_GNU_TYPE}-gcc && \ + ln -sf ${CROSS_GNU_TYPE}-cpp-${VER_GCC_BASE} ${CROSS_GNU_TYPE}-cpp && \ + ln -sf ${CROSS_GNU_TYPE}-gcov-${VER_GCC_BASE} ${CROSS_GNU_TYPE}-gcov endef $(stamp)build-gcc2: $(stamp)init-gcc $(stamp)install-eglibc1 @@ -257,11 +257,11 @@ $(stamp)build-eglibc1: $(stamp)init-eglibc $(stamp)install-linux $(stamp)install-gcc1 export PATH=${CURDIR}/debian/tmp/$(PF)/bin/:${PATH} ;\ - export LD_LIBRARY_PATH=${CURDIR}/debian/tmp/$(PF)/$(HOST_GNU_TYPE)/${CROSS_GNU_TYPE}/lib/:${CURDIR}/gcc/debian/libgcc1-armel-cross/usr/${CROSS_GNU_TYPE}/lib/ ;\ + export LD_LIBRARY_PATH=${CURDIR}/debian/tmp/$(PF)/$(HOST_GNU_TYPE)/${CROSS_GNU_TYPE}/lib/:${CURDIR}/gcc/debian/libgcc1-arm64-cross/usr/${CROSS_GNU_TYPE}/lib/ ;\ export LINUX_SOURCE=${CURDIR}/debian/tmp/usr ;\ cp -r ${CURDIR}/debian/tmp/usr/include/${CROSS_GNU_TYPE}/asm ${CURDIR}/debian/tmp/usr/include/asm ;\ cd eglibc-${VER_EGLIBC} ;\ - PATCHED_SOURCES=yes WITH_BUILD_SYSROOT=${CURDIR}/debian/tmp DEB_STAGE=stage1 PKG_IGNORE_CURRENTLY_BUILDING=1 BACKPORT=false fakeroot dpkg-buildpackage -b -uc -us -a${CROSS_ARCH} -d + PATCHED_SOURCES=yes WITH_BUILD_SYSROOT=${CURDIR}/debian/tmp DEB_STAGE=stage1 PKG_IGNORE_CURRENTLY_BUILDING=1 BACKPORT=false DEB_BUILD_PROFILE=stage1 fakeroot dpkg-buildpackage -b -uc -us -a${CROSS_ARCH} -d touch $@ $(stamp)install-eglibc1: $(stamp)build-eglibc1 @@ -275,10 +275,10 @@ $(stamp)build-eglibc2: $(stamp)init-eglibc $(stamp)install-gcc2 export PATH=${CURDIR}/debian/tmp/$(PF)/bin/:${PATH} ;\ - export LD_LIBRARY_PATH=${CURDIR}/debian/tmp/$(PF)/$(HOST_GNU_TYPE)/${CROSS_GNU_TYPE}/lib/:${CURDIR}/gcc/debian/libgcc1-armel-cross/usr/${CROSS_GNU_TYPE}/lib/ ;\ + export LD_LIBRARY_PATH=${CURDIR}/debian/tmp/$(PF)/$(HOST_GNU_TYPE)/${CROSS_GNU_TYPE}/lib/:${CURDIR}/gcc/debian/libgcc1-arm64-cross/usr/${CROSS_GNU_TYPE}/lib/ ;\ export LINUX_SOURCE=${CURDIR}/debian/tmp/usr ;\ export DEB_BUILD_OPTIONS="nocheck notest notests" ; \ - cd eglibc-${VER_EGLIBC} && PATCHED_SOURCES=yes WITH_BUILD_SYSROOT=${CURDIR}/debian/tmp PKG_IGNORE_CURRENTLY_BUILDING=1 BACKPORT=false fakeroot dpkg-buildpackage -b -uc -us -a${CROSS_ARCH} -d + cd eglibc-${VER_EGLIBC} && PATCHED_SOURCES=yes WITH_BUILD_SYSROOT=${CURDIR}/debian/tmp PKG_IGNORE_CURRENTLY_BUILDING=1 BACKPORT=false DEB_BUILD_PROFILE=stage1 fakeroot dpkg-buildpackage -b -uc -us -a${CROSS_ARCH} -d touch $@ $(stamp)install-eglibc2: $(stamp)build-eglibc2 @@ -292,7 +292,8 @@ clean: rm -rf linux-source-${VER_LINUX} rm -rf eglibc-${VER_EGLIBC} - rm -rf gcc gcc47 + rm -rf gcc-${DEB_VER_GCC} + rm -rf gcc rm -rf binutils-${PKG_VER_BINUTILS} rm -rf debian/tmp debian/files rm -f *.*deb *.changes @@ -343,7 +344,7 @@ sed -i -e'/^Depends/d' tmp/DEBIAN/control; \ rm tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross; \ mkdir -p tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross; \ - cp gcc47/debian/gcc-${VER_GCC_BASE}-${CROSS_GNU_TYPE}-base/usr/share/doc/gcc-${VER_GCC_BASE}-${CROSS_GNU_TYPE}-base/* tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross; \ + cp gcc/debian/gcc-${VER_GCC_BASE}-${CROSS_GNU_TYPE}-base/usr/share/doc/gcc-${VER_GCC_BASE}-${CROSS_GNU_TYPE}-base/* tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross; \ mv tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross/changelog.Debian.gz \ tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross/changelog.Debian.gcc-${VER_GCC_BASE}.gz; \ gzip -c9 debian/changelog > tmp/usr/share/doc/libgcc1-${CROSS_ARCH}-cross/changelog.Debian.gz;\ @@ -359,10 +360,10 @@ ln -sf ../../arm-linux-gnueabi/lib sf; \ cd $(CURDIR); \ fi; \ - if [ 'libc6-dev-armhf-cross' = $$pkgname ]; then \ - install -d tmp/usr/arm-linux-gnueabi/lib; \ - cd tmp/usr/arm-linux-gnueabi/lib; \ - ln -sf ../../arm-linux-gnueabihf/lib hf; \ + + if [ 'libc6-dev-arm64-cross' = $$pkgname ]; then \ + install -d tmp/usr/aarch64-linux-gnu/lib; \ + cd tmp/usr/aarch64-linux-gnu/lib; \ cd $(CURDIR); \ fi; \ if [ 'libc6' = `echo $$pkgname | cut -d'-' -f1` ]; then \ @@ -397,31 +398,8 @@ binary: binary-arch binary-indep binary-arch: build-arch -binary-indep: build dpkg-cross mangle-debian-files-indep $(stamp)make-dummies - -DUMMYNAME = -ifeq ($(CROSS_ARCH),armel) - DUMMYNAME = armel-armhf -else ifeq ($(CROSS_ARCH),armhf) - DUMMYNAME = armhf-armel -endif +binary-indep: build dpkg-cross mangle-debian-files-indep -$(stamp)make-dummies: $(stamp)debian-files-base - install -d tmp2/DEBIAN -ifneq (,$(DUMMYNAME)) - install -m 0644 debian/dummies/libc6-dev-$(DUMMYNAME)-cross tmp2/DEBIAN/control - sed -i -e 's/VERSION/$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)/g' tmp2/DEBIAN/control - sed -i -e 's/SRCNAME/$(DEB_NAME_ACT) ($(DEB_VER_ACT))/g' tmp2/DEBIAN/control - PKG_IGNORE_CURRENTLY_BUILDING=1 dpkg-deb -b tmp2 ../libc6-dev-$(DUMMYNAME)-cross_$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)_all.deb - $(call generate_debian_files, ../libc6-dev-$(DUMMYNAME)-cross_$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)_all.deb) - - install -m 0644 debian/dummies/libc6-$(DUMMYNAME)-cross tmp2/DEBIAN/control - sed -i -e 's/VERSION/$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)/g' tmp2/DEBIAN/control - sed -i -e 's/SRCNAME/$(DEB_NAME_ACT) ($(DEB_VER_ACT))/g' tmp2/DEBIAN/control - PKG_IGNORE_CURRENTLY_BUILDING=1 dpkg-deb -b tmp2 ../libc6-$(DUMMYNAME)-cross_$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)_all.deb - $(call generate_debian_files, ../libc6-$(DUMMYNAME)-cross_$(DEB_VER_EGLIBC)cross$(DEB_VER_ACT)_all.deb) -endif - touch $@ $(stamp)debian-files-base: rm -f debian/files @@ -437,7 +415,8 @@ done endef -mangle-debian-files-indep: $(stamp)debian-files-base repack-debs-indep $(stamp)make-dummies +mangle-debian-files-indep: $(stamp)debian-files-base repack-debs-indep + rm -f debian/files $(call generate_debian_files, ${DEB_LIST_ALL}) sed -i -e "s/_all.deb/cross${DEB_VER_ACT}_all.deb/g" debian/files sed -i -e "s/_${HOST_ARCH}.deb/cross${DEB_VER_ACT}_${HOST_ARCH}.deb/g" debian/files diff -urN armhf-cross-toolchain-base-1.91/debian/rules~ arm64-cross-toolchain-base-1.91/debian/rules~