Created
September 7, 2012 16:00
-
-
Save lbt/3667408 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| david@ash:/maemo/mer/mer/devel/mer-core/binutils$ git diff HEAD~1 | cat | |
| diff --git a/baselibs.conf b/baselibs.conf | |
| index 3b735a7..93b6820 100644 | |
| --- a/baselibs.conf | |
| +++ b/baselibs.conf | |
| @@ -1,4 +1,4 @@ | |
| -arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel | |
| +arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl armv7tnhl:armv7tnhl mipsel:mipsel | |
| cross-armv5tel-binutils-accel | |
| targettype x86 block! | |
| @@ -7,6 +7,7 @@ cross-armv5tel-binutils-accel | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel block! | |
| targettype armv5tel autoreqprov off | |
| @@ -49,6 +50,7 @@ cross-armv6l-binutils-accel | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel block! | |
| targettype armv6l autoreqprov off | |
| @@ -91,6 +93,7 @@ cross-armv7l-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel block! | |
| targettype armv7l autoreqprov off | |
| @@ -133,6 +136,7 @@ cross-armv7hl-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7l block! | |
| targettype armv7nhl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel block! | |
| targettype armv7hl autoreqprov off | |
| @@ -175,6 +179,7 @@ cross-armv7nhl-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel block! | |
| targettype armv7nhl autoreqprov off | |
| @@ -210,6 +215,49 @@ cross-armv7nhl-binutils-accel | |
| targettype armv7nhl preun " done " | |
| +cross-armv7tnhl-binutils-accel | |
| + targettype x86 block! | |
| + targettype 32bit block! | |
| + targettype armv5tel block! | |
| + targettype armv6l block! | |
| + targettype armv7l block! | |
| + targettype armv7hl block! | |
| + targettype armv7nhl block! | |
| + targettype mipsel block! | |
| + | |
| + targettype armv7tnhl autoreqprov off | |
| + targettype armv7tnhl provides "cross-arm-binutils-accel" | |
| + targettype armv7tnhl requires "glibc-x86-arm" | |
| + targettype armv7tnhl requires "zlib-x86-arm" | |
| + targettype armv7tnhl requires "binutils" | |
| + targettype armv7tnhl prefix /emul/ia32-linux | |
| + targettype armv7tnhl extension -arm | |
| + targettype armv7tnhl +/ | |
| + targettype armv7tnhl -/usr/share/man | |
| + targettype armv7tnhl -/usr/share/doc | |
| + targettype armv7tnhl requires "meego-accelerator" | |
| + | |
| + | |
| + | |
| + targettype armv7tnhl post " for bin in addr2line ar as c++filt gprov ld nm objcopy objdump ranlib readelf size strings strip ; do" | |
| + targettype armv7tnhl post " binary="/usr/bin/${bin}" " | |
| + targettype armv7tnhl post " if test -e ${binary} -a ! -e ${binary}.orig-arm ; then" | |
| + targettype armv7tnhl post " mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}" | |
| + targettype armv7tnhl post " else " | |
| + targettype armv7tnhl post " echo "${binary} not installed or ${binary}.orig-arm already present !" " | |
| + targettype armv7tnhl post " fi " | |
| + targettype armv7tnhl post " done " | |
| + | |
| + targettype armv7tnhl preun " for bin in addr2line ar as c++filt gprov ld nm objcopy objdump ranlib readelf size strings strip ; do" | |
| + targettype armv7tnhl preun " binary="/usr/bin/${bin}" " | |
| + targettype armv7tnhl preun " if test -e ${binary}.orig-arm ; then" | |
| + targettype armv7tnhl preun " rm ${binary} && mv ${binary}.orig-arm ${binary}" | |
| + targettype armv7tnhl preun " else " | |
| + targettype armv7tnhl preun " echo "${binary}.orig-arm not present !" " | |
| + targettype armv7tnhl preun " fi " | |
| + targettype armv7tnhl preun " done " | |
| + | |
| + | |
| cross-mipsel-binutils-accel | |
| targettype x86 block! | |
| targettype 32bit block! | |
| @@ -218,6 +266,7 @@ cross-mipsel-binutils-accel | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype armv7tnhl block! | |
| targettype mipsel autoreqprov off | |
| targettype mipsel provides "cross-arm-binutils-accel" | |
| diff --git a/baselibs.conf.old b/baselibs.conf.old | |
| index 68b975d..3b735a7 100644 | |
| --- a/baselibs.conf.old | |
| +++ b/baselibs.conf.old | |
| @@ -1,4 +1,4 @@ | |
| -arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl | |
| +arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel | |
| cross-armv5tel-binutils-accel | |
| targettype x86 block! | |
| @@ -7,6 +7,7 @@ cross-armv5tel-binutils-accel | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype mipsel block! | |
| targettype armv5tel autoreqprov off | |
| targettype armv5tel provides "cross-arm-binutils-accel" | |
| @@ -48,6 +49,7 @@ cross-armv6l-binutils-accel | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype mipsel block! | |
| targettype armv6l autoreqprov off | |
| targettype armv6l provides "cross-arm-binutils-accel" | |
| @@ -89,6 +91,7 @@ cross-armv7l-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7hl block! | |
| targettype armv7nhl block! | |
| + targettype mipsel block! | |
| targettype armv7l autoreqprov off | |
| targettype armv7l provides "cross-arm-binutils-accel" | |
| @@ -130,6 +133,7 @@ cross-armv7hl-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7l block! | |
| targettype armv7nhl block! | |
| + targettype mipsel block! | |
| targettype armv7hl autoreqprov off | |
| targettype armv7hl provides "cross-arm-binutils-accel" | |
| @@ -171,6 +175,7 @@ cross-armv7nhl-binutils-accel | |
| targettype armv6l block! | |
| targettype armv7l block! | |
| targettype armv7hl block! | |
| + targettype mipsel block! | |
| targettype armv7nhl autoreqprov off | |
| targettype armv7nhl provides "cross-arm-binutils-accel" | |
| @@ -204,3 +209,45 @@ cross-armv7nhl-binutils-accel | |
| targettype armv7nhl preun " fi " | |
| targettype armv7nhl preun " done " | |
| + | |
| +cross-mipsel-binutils-accel | |
| + targettype x86 block! | |
| + targettype 32bit block! | |
| + targettype armv5tel block! | |
| + targettype armv6l block! | |
| + targettype armv7l block! | |
| + targettype armv7hl block! | |
| + targettype armv7nhl block! | |
| + | |
| + targettype mipsel autoreqprov off | |
| + targettype mipsel provides "cross-arm-binutils-accel" | |
| + targettype mipsel requires "glibc-x86-arm" | |
| + targettype mipsel requires "zlib-x86-arm" | |
| + targettype mipsel requires "binutils" | |
| + targettype mipsel prefix /emul/ia32-linux | |
| + targettype mipsel extension -arm | |
| + targettype mipsel +/ | |
| + targettype mipsel -/usr/share/man | |
| + targettype mipsel -/usr/share/doc | |
| + targettype mipsel requires "meego-accelerator" | |
| + | |
| + | |
| + | |
| + targettype mipsel post " for bin in addr2line ar as c++filt gprov ld nm objcopy objdump ranlib readelf size strings strip ; do" | |
| + targettype mipsel post " binary="/usr/bin/${bin}" " | |
| + targettype mipsel post " if test -e ${binary} -a ! -e ${binary}.orig-arm ; then" | |
| + targettype mipsel post " mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}" | |
| + targettype mipsel post " else " | |
| + targettype mipsel post " echo "${binary} not installed or ${binary}.orig-arm already present !" " | |
| + targettype mipsel post " fi " | |
| + targettype mipsel post " done " | |
| + | |
| + targettype mipsel preun " for bin in addr2line ar as c++filt gprov ld nm objcopy objdump ranlib readelf size strings strip ; do" | |
| + targettype mipsel preun " binary="/usr/bin/${bin}" " | |
| + targettype mipsel preun " if test -e ${binary}.orig-arm ; then" | |
| + targettype mipsel preun " rm ${binary} && mv ${binary}.orig-arm ${binary}" | |
| + targettype mipsel preun " else " | |
| + targettype mipsel preun " echo "${binary}.orig-arm not present !" " | |
| + targettype mipsel preun " fi " | |
| + targettype mipsel preun " done " | |
| + | |
| diff --git a/binutils.changes b/binutils.changes | |
| index 760c77b..813e3b5 100644 | |
| --- a/binutils.changes | |
| +++ b/binutils.changes | |
| @@ -1,3 +1,6 @@ | |
| +* Fri Sep 07 2012 David Greaves <david@dgreaves.com> - 2.22 | |
| + - Added armv7tnhl | |
| + | |
| * Tue Feb 07 2012 Carsten Munk <carsten.munk@gmail.com> - 2.22 | |
| - Pull some patches relevant to MIPS from branch update, and | |
| fix for PR10144 | |
| diff --git a/precheckin.sh b/precheckin.sh | |
| index 32c9388..724af1b 100644 | |
| --- a/precheckin.sh | |
| +++ b/precheckin.sh | |
| @@ -2,7 +2,7 @@ | |
| NAME=binutils | |
| SPECNAME=${NAME}.spec | |
| -ARCHES="armv5tel armv6l armv7l armv7hl armv7nhl mipsel" | |
| +ARCHES="armv5tel armv6l armv7l armv7hl armv7nhl armv7tnhl mipsel" | |
| TOBASELIBS="" | |
| TOBASELIBS_ARCH="" | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment