scripts: Support output of new ld
PATCH 1/1 scripts: Support output of new ld
Hello,
This is one in a handful of small patches that I'll be sending along in the near future. This patch allows scripts/ver_linux to find out the ld version for versions of ld that have different output on 'ld -v' (new ones have "GNU" at the beginning.)
Marcelo, please apply.
Signature · 13 lines
Joshua Kwan
--- a/scripts/ver_linux 2004-09-05 01:31:23.000000000 -0700
+++ b/scripts/ver_linux 2004-09-05 01:31:47.000000000 -0700
@@ -22,7 +22,8 @@
'/GNU Make/{print "Gnu make ",$NF}'
ld -v 2>&1 | awk -F\) '{print $1}' | awk \
- '/BFD/{print "binutils ",$NF}'
+ '/BFD/{print "binutils ",$NF}
+ /^GNU/{print "binutils ",$4}'
fdformat --version | awk -F\- '{print "util-linux ", $NF}'Hi Joshua,
(We met at Palo Alto in a Debian dinner on a chinese restaurant, remember? :))
Unfortunately this patch doenst apply cleanly
[marcelo@logos linux-2.4]$ fp /tmp/gnu
bk import -tpatch -r -CR -yscripts: Support output of new ld /tmp/patch4572 . Patching...
Patch failed. **** patch log follows ****
Patching file scripts/ver_linux
1 out of 1 hunk FAILED -- saving rejects to file scripts/ver_linux.rej
Its easy enough to be applied by hand but I prefer if you generate a clean patch instead
reject file attached
Quoted 17 lines · Joshua Kwan
Hello,
This is one in a handful of small patches that I'll be sending along in the near future. This patch allows
scripts/ver_linuxto find out the ld version for versions of ld that have different output on 'ld -v' (new ones have "GNU" at the beginning.)Marcelo, please apply.
Signed-off-by Joshua Kwan <[email protected]>Signature · 1 line
Joshua Kwan
scripts/ver_linux line 29
Quoted 9 lines
scripts/ver_linux +2
-1@@ -22,7 +22,8 @@ '/GNU Make/{print "Gnu make ",$NF}' ld -v 2>&1 | awk -F\) '{print $1}' | awk \ - '/BFD/{print "binutils ",$NF}' + '/BFD/{print "binutils ",$NF} + /^GNU/{print "binutils ",$4}' fdformat --version | awk -F\- '{print "util-linux ", $NF}'
***************
*** 22,28 ****
'/GNU Make/{print "Gnu make ",$NF}'
20
ld -v 2>&1 | awk -F\) '{print $1}' | awk \
- '/BFD/{print "binutils ",$NF}'
20
fdformat --version | awk -F\- '{print "util-linux ", $NF}'
20
--- 22,29 ----
'/GNU Make/{print "Gnu make ",$NF}'
20
ld -v 2>&1 | awk -F\) '{print $1}' | awk \
+ '/BFD/{print "binutils ",$NF}
+ /^GNU/{print "binutils ",$4}'
20
fdformat --version | awk -F\- '{print "util-linux ", $NF}'
20
Quoted 1 line · Marcelo Tosatti
(We met at Palo Alto in a Debian dinner on a chinese restaurant, remember? :))
Oh! At the time I wasn't aware it was /this/ particular Marcelo... well, hello then ;)
Quoted 1 line
Unfortunately this patch doenst apply cleanly
Huh, strange, my mailer must have munged it, or maybe things have changed in BK. Here's a diff from a fresh checkout of linux-2.4. Just in case my mail client munges it again I've also put it at
http://people.debian.org/~joshk/gnu_ld.diff
Signature · 14 lines
Joshua Kwan
===== scripts/ver_linux 1.8 vs edited =====
--- 1.8/scripts/ver_linux Wed Dec 17 23:34:53 2003
+++ edited/scripts/ver_linux Mon Sep 20 16:54:07 2004
@@ -22,7 +22,8 @@
'/GNU Make/{print "Gnu make ",$NF}'
ld -v 2>&1 | awk -F\) '{print $1}' | awk \
- '/BFD/{print "binutils ",$NF}'
+ '/BFD/{print "binutils ",$NF}
+ /^GNU/{print "binutils ",$4}'
fdformat --version | awk -F\- '{print "util-linux ", $NF}'