Skip to contentSkip to conversation

some scripts: replace gawk, head, bc with shell, update

PATCH Superseded Oleg Verych 1 participant 1 message Jan 31, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 some scripts: replace gawk, head, bc with shell, update

scripts: replace gawk, head, bc with shell, update

Replacing overhead of using some (external) programs instead of good old `sh'.

Cc Roman Zippel <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc William Stearns <[email protected]>
Cc Martin Schlemmer <[email protected]>

---
-o--=O`C
#oo'L O
<___=E M

 scripts/gen_initramfs_list.sh | 44 +++++++++++++++++++++---------------------
 scripts/makelst               | 34 ++++++++++++++++----------------
 2 files changed, 40 insertions(+), 38 deletions(-)
scripts/makelst renamed from scripts/makelst~4-update-gawk-bc-head-rip +17 -17
@@ -1,31 +1,31 @@
-#!/bin/bash
+#!/bin/sh
 # A script to dump mixed source code & assembly
 # with correct relocations from System.map
-# Requires the following lines in Rules.make.
-# Author(s): DJ Barrow ([email protected],[email protected]) 
-#            William Stearns <[email protected]>
+# Requires the following lines in makefile:
 #%.lst: %.c
 #	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -g -c -o $*.o $<
-#	$(TOPDIR)/scripts/makelst $*.o $(TOPDIR)/System.map $(OBJDUMP)
+#	$(srctree)/scripts/makelst $*.o $(objtree)/System.map $(OBJDUMP)
 #
-#    Copyright (C) 2000 IBM Corporation
-#    Author(s): DJ Barrow ([email protected],[email protected]) 
+# Copyright (C) 2000 IBM Corporation
+# Author(s): DJ Barrow ([email protected],[email protected])
+#            William Stearns <[email protected]>
 #
 
-t1=`$3 --syms $1 | grep .text | grep " F " | head -n 1`
+# awk style field access
+field() {
+  shift $1 ; echo $1
+}
+
+t1=`$3 --syms $1 | grep .text | grep -m1 " F "`
 if [ -n "$t1" ]; then
-  t2=`echo $t1 | gawk '{ print $6 }'`
+  t2=`field 6 $t1`
   if [ ! -r $2 ]; then
     echo "No System.map" >&2
-    t7=0
   else
     t3=`grep $t2 $2`
-    t4=`echo $t3 | gawk '{ print $1 }'`
-    t5=`echo $t1 | gawk '{ print $1 }'`
-    t6=`echo $t4 - $t5 | tr a-f A-F`
-    t7=`( echo  ibase=16 ; echo $t6 ) | bc`
+    t4=`field 1 $t3`
+    t5=`field 1 $t1`
+    t6=`printf "%lu" $((0x$t4 - 0x$t5))`
   fi
-else
-  t7=0
 fi
-$3 -r --source --adjust-vma=$t7 $1
+$3 -r --source --adjust-vma=${t6:-0} $1
scripts/gen_initramfs_list.sh renamed from scripts/gen_initramfs_list.sh~4gawk-rip +23 -21

67 lines not on this page · raw message