X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ia32rtools.git;a=blobdiff_plain;f=run_imp.sh;h=b069eba59fead04b0bcab118a59d41dfcd991f0b;hp=c1df2d16af18fe91ca6b9caee1f894b1a7faf355;hb=ee554c95296119b6b8d82856fbb09ffb8c9dc419;hpb=beb04e26b3ba6208551d98ce78689464bb1100a4

diff --git a/run_imp.sh b/run_imp.sh
index c1df2d1..b069eba 100755
--- a/run_imp.sh
+++ b/run_imp.sh
@@ -1,13 +1,23 @@
 #!/bin/sh
 
-grep 'extrn ' $1 | awk '{print $2}' | awk -F: '{print $1}' > $2_implist
-extra_libs=`ls *.lib 2> /dev/null`
+# warning: i686-w64-mingw32- on Ubuntu 14.04
+# contains broken InterlockedDecrement
+test -n "$mingwb" || mingwb=i686-w64-mingw32
 
-echo ".data" > $2
-echo ".align 4" >> $2
+target_s=$1
+src_asm=$2
+implist=${target_s}_implist
+tmpsym=${target_s}_tmpsym
+shift 2
 
-cat $2_implist | while read i; do
-  rm -f $2_tmpsym
+grep 'extrn ' $src_asm | awk '{print $2}' | \
+  awk -F: '{print $1}' > $implist
+
+echo ".data" > $target_s
+echo ".align 4" >> $target_s
+
+cat $implist | while read i; do
+  rm -f $tmpsym
   case $i in
   __imp_*)
     si=`echo $i | cut -c 7-`
@@ -17,22 +27,28 @@ cat $2_implist | while read i; do
     ;;
   esac
 
-  grep "\<_$si\>" /usr/i586-mingw32msvc/lib/lib* $extra_libs | awk '{print $3}' | \
+  grep -e "\<_\?_$si\>" -e "@$si\>" /usr/$mingwb/lib/lib* "$@" | awk '{print $3}' | \
     while read f; do
-      sym=`i586-mingw32msvc-nm $f | grep "\<_$si\>" | grep ' T ' | awk '{print $3}'`
+      sym=`${mingwb}-nm $f | grep -e "\<_\?_$si\>" -e " @$si\>" | grep ' T ' | awk '{print $3}'`
       if test -n "$sym"; then
-        echo $sym > $2_tmpsym
+        echo $sym > $tmpsym
         break
       fi
     done
-  sym=`cat $2_tmpsym`
+  sym=`cat $tmpsym`
   if test -z "$sym"; then
-    echo "no file/sym for $i, lf $f"
-    exit 1
+    # could be a data import
+    if test -n "$data_symf" && grep -q "$si" $data_symf; then
+      continue
+    else
+      echo "$target_s: no file/sym for $i"
+      rm $target_s
+      exit 1
+    fi
   fi
 
-  echo ".globl $i" >> $2
-  echo "$i:" >> $2
-  echo "  .long $sym" >> $2
-  echo >> $2
+  echo ".globl $i" >> $target_s
+  echo "$i:" >> $target_s
+  echo "  .long $sym" >> $target_s
+  echo >> $target_s
 done