[PATCH 2.4] scripts: Support output of new ld

[PATCH 2.4] scripts: Support output of new ld

[Joshua Kwan]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

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. 

Signed-off-by: Joshua Kwan <joshk@triplehelix.org>

-- 
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}'
 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 881 bytes --]

Re: [PATCH 2.4] scripts: Support output of new ld

[Marcelo Tosatti]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]


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



On Fri, Sep 17, 2004 at 11:57:33PM -0700, Joshua Kwan wrote:
> 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. 
> 
> Signed-off-by: Joshua Kwan <joshk@triplehelix.org>
> 
> -- 
> 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}'
>  



[-- Attachment #2: ver_linux.rej --]
[-- Type: text/plain, Size: 579 bytes --]

***************
*** 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

Re: [PATCH 2.4] scripts: Support output of new ld

[Joshua Kwan]

On Mon, Sep 20, 2004 at 01:19:13PM -0300, Marcelo Tosatti wrote:
> (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 ;)

> 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

-- 
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}'