Change make-syscalls.sh to make syscall interception possible.

sysdeps/unix/make-syscalls.sh

 #! /bin/sh
 
 # Usage: make-syscalls.sh ../sysdeps/unix/common
 # Expects $sysdirs in environment.
 
 ##############################################################################
 
 # Syscall Signature Key Letters for BP Thunks:
 #
 # a: unchecked address (e.g., 1st arg to mmap)
@@ skipping 141 matching lines @@
   esac
 
   echo "                \$(common-objpfx)sysd-syscalls \\"
   echo "                \$(common-objpfx)s-proto$cancellable.d"
   case x"$callnum" in
   x_)
   echo "\
         (echo '/* Dummy module requested by syscalls.list */'; \\"
   ;;
   x*)
+  case $args in
+  *:*)
+  set `echo $args |

[pasko-google - do not use, 2011/09/06 14:18:56]

type=`echo ...`

[khim, 2011/09/06 14:25:34]

We need sed construct to pull other argument types.

+      sed -e 's/^\(.\):\(.*\)/\2 \10/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \11/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \12/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \13/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \14/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \15/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \16/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \17/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \18/' \
+          -e 's/^\([^ ]\)\(.*\)/\2 \19/'`
+    ;;
+    *) set int;;

[pasko-google - do not use, 2011/09/06 14:18:56]

too many leading spaces

[khim, 2011/09/06 14:25:34]

Done.

+  esac
+  rtn=$1; shift
+  case $rtn in
+    [bp]*) frtn='void *';;
+    *) frtn='int ';;
+  esac
   echo "\
         \$(make-target-directory)
-        (echo 'int __unimplemented_syscall(const char *name);'; \\
-         echo 'int $strong (void);'; \\
-         echo 'libc_hidden_proto ($strong)'; \\
-         echo 'int $strong (void) { return __unimplemented_syscall(\"$syscall\"); }'; \\
+        (echo '#define $strong ${strong}_RENAMED'; \\"
+  for name in $weak; do
+    case $name in
+      *@@*)
+        base=`echo $name | sed 's/@@.*//'`
+        echo "   echo '#define $base ${base}_RENAMED'; \\"
+        ;;
+      *@*)
+        base=`echo $name | sed 's/@.*//'`
+        echo "   echo '#define $base ${base}_RENAMED'; \\"
+        ;;
+      *)
+        echo "   echo '#define $name ${name}_RENAMED'; \\"

[pasko-google - do not use, 2011/09/06 14:18:56]

base=$name
..
esac
echo "..."

[khim, 2011/09/06 14:25:34]

Done.

+        ;;
+    esac
+  done
+  echo "\
+         echo '#include <sysdep.h>'; \\
+         echo '#undef $strong'; \\"
+  for name in $weak; do
+    case $name in
+      *@@*)
+        base=`echo $name | sed 's/@@.*//'`
+        echo "   echo '#undef $base'; \\"
+        ;;
+      *@*)
+        base=`echo $name | sed 's/@.*//'`
+        echo "   echo '#undef $base'; \\"
+        ;;
+      *)
+        echo "   echo '#undef $name'; \\"

[pasko-google - do not use, 2011/09/06 14:18:56]

ditto

[khim, 2011/09/06 14:25:34]

Done.

+        ;;
+    esac
+  done
+  echo "\
+         echo '$frtn$strong ( ); /* $args */'; \\
+         echo 'libc_hidden_proto ($strong)'; \\"
+  echo -n "      echo '$frtn$strong ("
+  sprtr=
+  for arg; do
+    echo -n "$sprtr"
+    case $arg in
+      [abIpP]*) echo -n "void *$arg";;
+      f*) echo -n "int $arg[2]";;
+      i*) echo -n "int $arg";;
+      n*) echo -n "size_t $arg";;
+      [sS]*) echo -n "char *$arg";;
+      V*) echo -n "unsigned char *$arg";;
+      W*) echo -n "int *$arg";;
+    esac
+    sprtr=", "
+  done
+  echo ") {'; \\"
+  echo -n "      echo '  return INLINE_SYSCALL ($syscall, $nargs"
+  for arg; do
+    echo -n ", $arg"
+  done
+  echo ");'; \\
+         echo '}'; \\
          echo 'strong_alias ($strong, __${syscall}_nocancel)'; \\
          echo 'libc_hidden_def ($strong)'; \\"
   ;;
   esac
 
   # Append any weak aliases or versions defined for this syscall function.
 
   # A shortcoming in the current gas is that it will only allow one
   # version-alias per symbol.  So we create new strong aliases as needed.
   vcount=""
@@ skipping 25 matching lines @@
           echo "         echo 'strong_alias ($strong, $source)'; \\"
         fi
         echo "   echo 'symbol_version($source, $base, $ver);'; \\"
         ;;
       !*)
         name=`echo $name | sed 's/.//'`
         echo "   echo 'strong_alias ($strong, $name)'; \\"
         echo "   echo 'libc_hidden_def ($name)'; \\"
         ;;
       *)
-        echo "   echo 'int $name (void);'; \\"
+        echo "   echo '$frtn$name ( );'; \\"
         echo "   echo 'libc_hidden_proto ($name)'; \\"
         echo "   echo 'weak_alias ($strong, $name)'; \\"
         echo "   echo 'libc_hidden_weak ($name)'; \\"
         ;;
     esac
   done
 
   # And finally, pipe this all into the compiler.
   echo '        ) | $(compile-syscall) '"\
 \$(foreach p,\$(patsubst %$file,%,\$(basename \$(@F))),\$(\$(p)CPPFLAGS))"
@@ skipping 113 matching lines @@
         ) | \$(COMPILE.c) -x c -o \$@ -"
 ### Use this for debugging intermediate output:
 ###     ) >\$(@:.ob=.c)
 ###     \$(subst -c,-E,\$(COMPILE.c)) -o \$(@:.ob=.ib) \$(@:.ob=.c)
 ###     \$(COMPILE.c) -x cpp-output -o \$@ \$(@:.ob=.ib)"
     echo endif
     ;;
   esac
 
 done