diff -Nur modutils-2.3.11/ChangeLog modutils-2.3.12/ChangeLog
--- modutils-2.3.11/ChangeLog	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/ChangeLog	Sun Jul  9 15:44:35 2000
@@ -1,3 +1,19 @@
+2000-07-09  Keith Owens  <kaos@ocs.com.au>
+
+	modutils 2.3.12
+
+	* Only read default config on first file.
+	* Add /lib/modules/.../kernel directory, positioning for Makefile rewrite.
+	* Correct modinfo -f by Yann Droneaud.
+	* Add filename to obj_file, allow %{filename} in modinfo format.
+	* Partial cleanup char vs const char.
+	* Handle gzipped objects by Willy Tarreau.
+	* SuSe patch for s390 support.
+	* SuSe patch to default aliases.
+	* IA64 support by Mike Stephens.
+	* Update hint message for kernel errors.
+	* Default to using libc, phasing out _syscall().
+
 2000-04-20  Keith Owens  <kaos@ocs.com.au>
 
 	modutils 2.3.11
diff -Nur modutils-2.3.11/INSTALL modutils-2.3.12/INSTALL
--- modutils-2.3.11/INSTALL	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/INSTALL	Sun Jul  9 15:44:35 2000
@@ -78,6 +78,16 @@
                                 own initrd boot system.
 --enable-strip                  Are binaries to be stripped during install?
                                 Default is yes.
+--disable-zlib                  Handle gzipped objects?  Default is no.
+				You probably only need this if you are booting
+				a small root filesystem and the filesystem is
+				not compressed itself.
+--disable-use-syscall           Use _syscall() functions?  Default is no.
+				Any current libc should have definitions for the
+				modutils to kernel system calls.  If you get
+				missing sys_xxx functions, try --enable-use-syscall.
+				Note that the glibc maintainers want to remove
+				_syscall() from the library ABI.
 
 To disable any of these, specify --disable-<option>.
 
diff -Nur modutils-2.3.11/Makefile.common.in modutils-2.3.12/Makefile.common.in
--- modutils-2.3.11/Makefile.common.in	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/Makefile.common.in	Sun Jul  9 15:44:35 2000
@@ -0,0 +1,20 @@
+# Common code included in every Makefile
+
+exec_prefix	= @exec_prefix@
+insmod_static	= @insmod_static@
+mandir		= @mandir@
+prefix		= @prefix@
+sbindir		= @sbindir@
+
+AR		= @AR@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+INSTALL		= @INSTALL_LOCAL@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
+PARSERCFLAGS	= @PARSERCFLAGS@
+RANLIB		= @RANLIB@
+STRIP		= @STRIP@
diff -Nur modutils-2.3.11/Makefile.in modutils-2.3.12/Makefile.in
--- modutils-2.3.11/Makefile.in	Thu Apr 20 10:04:45 2000
+++ modutils-2.3.12/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,6 +1,8 @@
-# $Id: Makefile.in 1.4 Thu, 20 Apr 2000 10:04:45 +1000 kaos $
+# $Id: Makefile.in 1.5 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir = @srcdir@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	Makefile.common
 
 TARGETS = all install-bin clean distclean realclean dep depend
 SUBDIRS = util obj insmod genksyms depmod @kerneld_SUBDIR@
diff -Nur modutils-2.3.11/config.guess modutils-2.3.12/config.guess
--- modutils-2.3.11/config.guess	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/config.guess	Sun Jul  9 14:46:03 2000
@@ -486,6 +486,7 @@
 				    s/ .*//
 				    p'`
 	case "$ld_supported_emulations" in
+	  *ia64)      echo "${UNAME_MACHINE}-unknown-linux"         ; exit 0 ;;
 	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
 	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
diff -Nur modutils-2.3.11/config.sub modutils-2.3.12/config.sub
--- modutils-2.3.11/config.sub	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/config.sub	Sun Jul  9 14:46:03 2000
@@ -149,7 +149,7 @@
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
@@ -172,7 +172,7 @@
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
diff -Nur modutils-2.3.11/configure modutils-2.3.12/configure
--- modutils-2.3.11/configure	Thu Apr 20 10:04:45 2000
+++ modutils-2.3.12/configure	Sun Jul  9 15:44:35 2000
@@ -14,31 +14,43 @@
 ac_default_prefix=/usr
 ac_help="$ac_help
   --enable-combined            Create insmod and rmmod/modprobe/lsmod/ksyms/kallsyms
-			       as one executable.  Default is one combined module,
-			       if you --disable-combined you can still combine
-			       individual modules into insmod with --enable-combined-X."
+			       as one executable.  Default is one combined
+			       module, if you --disable-combined you can still
+			       combine individual modules into insmod with
+			       --enable-combined-X."
 ac_help="$ac_help
-  --enable-combined-rmmod      Create insmod and rmmod as one executable (default)"
+  --enable-combined-rmmod      Create insmod and rmmod as one executable
+			       (default)"
 ac_help="$ac_help
-  --enable-combined-modprobe   Create insmod and modprobe as one executable (default)"
+  --enable-combined-modprobe   Create insmod and modprobe as one executable
+			       (default)"
 ac_help="$ac_help
-  --enable-combined-lsmod      Create insmod and lsmod as one executable (default)"
+  --enable-combined-lsmod      Create insmod and lsmod as one executable
+			       (default)"
 ac_help="$ac_help
-  --enable-combined-ksyms      Create insmod and ksyms as one executable (default)"
+  --enable-combined-ksyms      Create insmod and ksyms as one executable
+			       (default)"
 ac_help="$ac_help
-  --enable-combined-kallsyms   Create insmod and kallsyms as one executable (default)"
+  --enable-combined-kallsyms   Create insmod and kallsyms as one executable
+			       (default)"
 ac_help="$ac_help
-  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system (default)"
+  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system
+			       (default)"
 ac_help="$ac_help
   --enable-kerneld             Create kerneld binary (default)"
 ac_help="$ac_help
   --disable-insmod-static      Do not create insmod.static binary (default)"
 ac_help="$ac_help
-  --enable-common-sparc        Make all the utilities work on both sparc32 and sparc64
-			       as one executable (default on sparc is yes, default on
-			       other architectures is no)"
+  --enable-common-sparc        Make all the utilities work on both sparc32 and
+			       sparc64 as one executable (default on sparc is
+			       yes, default on other architectures is no)"
 ac_help="$ac_help
   --enable-strip               Strip binaries during install (default)"
+ac_help="$ac_help
+  --disable-zlib               Do not handle gzipped objects (default)"
+ac_help="$ac_help
+  --disable-use-syscall        Do not use _syscall(), use libc functions instead
+			       (default)"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -611,7 +623,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:615: checking host system type" >&5
+echo "configure:627: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -632,7 +644,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:636: checking target system type" >&5
+echo "configure:648: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -650,7 +662,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:654: checking build system type" >&5
+echo "configure:666: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -684,6 +696,7 @@
 case "$target_cpu" in
   alpha*)  ARCH=alpha ;;
   i?86)    ARCH=i386  ;;
+  ia64)    ARCH=ia64  ;;
   arm*)    ARCH=arm   ;;
   mips*)   ARCH=mips  ;;
   powerpc) ARCH=ppc   ;;
@@ -840,6 +853,32 @@
 
 
 
+# Check whether --enable-zlib or --disable-zlib was given.
+if test "${enable_zlib+set}" = set; then
+  enableval="$enable_zlib"
+  if test "$enableval" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define CONFIG_USE_ZLIB 1
+EOF
+
+  LIBS="$LIBS -lz"
+fi
+fi
+
+
+# Check whether --enable-use-syscall or --disable-use-syscall was given.
+if test "${enable_use_syscall+set}" = set; then
+  enableval="$enable_use_syscall"
+  if test "$enableval" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define CONFIG_USE_SYSCALL 1
+EOF
+
+  USE_SYSCALL="y"
+fi
+fi
+
+
 
 
 # If the user did not specify CFLAGS, use suitable values for modutils
@@ -850,7 +889,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:854: checking for $ac_word" >&5
+echo "configure:893: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -880,7 +919,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
+echo "configure:923: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -931,7 +970,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:935: checking for $ac_word" >&5
+echo "configure:974: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -963,7 +1002,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:967: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -974,12 +1013,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 978 "configure"
+#line 1017 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1005,12 +1044,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1009: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1048: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1014: checking whether we are using GNU C" >&5
+echo "configure:1053: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1019,7 +1058,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1038,7 +1077,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1042: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1081: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1072,7 +1111,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1076: checking for $ac_word" >&5
+echo "configure:1115: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1100,7 +1139,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1104: checking whether ln -s works" >&5
+echo "configure:1143: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1157,12 +1196,12 @@
 fi
 
 echo $ac_n "checking for wordexp""... $ac_c" 1>&6
-echo "configure:1161: checking for wordexp" >&5
+echo "configure:1200: checking for wordexp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wordexp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1205 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char wordexp(); below.  */
@@ -1185,7 +1224,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_wordexp=yes"
 else
@@ -1206,12 +1245,12 @@
 fi
 
 echo $ac_n "checking for glob""... $ac_c" 1>&6
-echo "configure:1210: checking for glob" >&5
+echo "configure:1249: checking for glob" >&5
 if eval "test \"`echo '$''{'ac_cv_func_glob'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1215 "configure"
+#line 1254 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glob(); below.  */
@@ -1234,7 +1273,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_glob=yes"
 else
@@ -1264,13 +1303,13 @@
 
 if test "$ARCH" = "alpha"; then
   echo $ac_n "checking for broken alpha assembler""... $ac_c" 1>&6
-echo "configure:1268: checking for broken alpha assembler" >&5
+echo "configure:1307: checking for broken alpha assembler" >&5
   cat > conftest.c <<EOF
-#line 1270 "configure"
+#line 1309 "configure"
 static int x, y;
 int main() { return y; }
 EOF
-  if { (eval echo configure:1274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:1313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     ac_broken_gas=no
     if objdump -r conftest.o | grep 'LITERAL.*y.*4$' > /dev/null; then
       cat >> confdefs.h <<\EOF
@@ -1406,7 +1445,7 @@
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "Makefile depmod/Makefile genksyms/Makefile
+trap 'rm -fr `echo "Makefile Makefile.common depmod/Makefile genksyms/Makefile
 	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -1516,7 +1555,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile depmod/Makefile genksyms/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"Makefile Makefile.common depmod/Makefile genksyms/Makefile
 	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile"}
 EOF
diff -Nur modutils-2.3.11/configure.in modutils-2.3.12/configure.in
--- modutils-2.3.11/configure.in	Thu Apr 20 10:04:45 2000
+++ modutils-2.3.12/configure.in	Sun Jul  9 15:44:35 2000
@@ -1,4 +1,4 @@
-dnl $Id: configure.in 1.11.1.3 Thu, 20 Apr 2000 10:04:45 +1000 kaos $
+dnl $Id: configure.in 1.11.1.6 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
 AC_INIT(insmod/insmod.c)
 AC_PREFIX_DEFAULT(/usr)
@@ -29,6 +29,7 @@
 case "$target_cpu" in
   alpha*)  ARCH=alpha ;;
   i?86)    ARCH=i386  ;;
+  ia64)    ARCH=ia64  ;;
   arm*)    ARCH=arm   ;;
   mips*)   ARCH=mips  ;;
   powerpc) ARCH=ppc   ;;
@@ -40,9 +41,10 @@
 done
 AC_ARG_ENABLE(combined,
 [  --enable-combined            Create insmod and rmmod/modprobe/lsmod/ksyms/kallsyms
-			       as one executable.  Default is one combined module,
-			       if you --disable-combined you can still combine
-			       individual modules into insmod with --enable-combined-X.],
+			       as one executable.  Default is one combined
+			       module, if you --disable-combined you can still
+			       combine individual modules into insmod with
+			       --enable-combined-X.],
 [if test "$enableval" = "no"; then
 	for i in rmmod modprobe lsmod ksyms kallsyms
 	do eval COMBINE_$i=""
@@ -50,7 +52,8 @@
 fi])
 
 AC_ARG_ENABLE(combined-rmmod,
-[  --enable-combined-rmmod      Create insmod and rmmod as one executable (default)],
+[  --enable-combined-rmmod      Create insmod and rmmod as one executable
+			       (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_rmmod=rmmod
   else
@@ -59,7 +62,8 @@
 AC_SUBST(COMBINE_rmmod)
 
 AC_ARG_ENABLE(combined-modprobe,
-[  --enable-combined-modprobe   Create insmod and modprobe as one executable (default)],
+[  --enable-combined-modprobe   Create insmod and modprobe as one executable
+			       (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_modprobe=modprobe
   else
@@ -68,7 +72,8 @@
 AC_SUBST(COMBINE_modprobe)
 
 AC_ARG_ENABLE(combined-lsmod,
-[  --enable-combined-lsmod      Create insmod and lsmod as one executable (default)],
+[  --enable-combined-lsmod      Create insmod and lsmod as one executable
+			       (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_lsmod=lsmod
   else
@@ -77,7 +82,8 @@
 AC_SUBST(COMBINE_lsmod)
 
 AC_ARG_ENABLE(combined-ksyms,
-[  --enable-combined-ksyms      Create insmod and ksyms as one executable (default)],
+[  --enable-combined-ksyms      Create insmod and ksyms as one executable
+			       (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_ksyms=ksyms
   else
@@ -86,7 +92,8 @@
 AC_SUBST(COMBINE_ksyms)
 
 AC_ARG_ENABLE(combined-kallsyms,
-[  --enable-combined-kallsyms   Create insmod and kallsyms as one executable (default)],
+[  --enable-combined-kallsyms   Create insmod and kallsyms as one executable
+			       (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_kallsyms=kallsyms
   else
@@ -95,7 +102,8 @@
 AC_SUBST(COMBINE_kallsyms)
 
 AC_ARG_ENABLE(compat-2-0,
-[  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system (default)],
+[  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system
+			       (default)],
 [if test "$enableval" = "yes"; then
   AC_DEFINE(COMPAT_2_0)
 fi],[AC_DEFINE(COMPAT_2_0)])
@@ -119,9 +127,9 @@
 
 COMMON_sparc=yes
 AC_ARG_ENABLE(common-sparc,
-[  --enable-common-sparc        Make all the utilities work on both sparc32 and sparc64
-			       as one executable (default on sparc is yes, default on
-			       other architectures is no)],
+[  --enable-common-sparc        Make all the utilities work on both sparc32 and
+			       sparc64 as one executable (default on sparc is
+			       yes, default on other architectures is no)],
 [if test "$enableval" = "yes"; then
   COMMON_sparc=yes
   else
@@ -143,6 +151,21 @@
 fi],[STRIP=-s])
 AC_SUBST(STRIP)
 
+AC_ARG_ENABLE(zlib,
+[  --disable-zlib               Do not handle gzipped objects (default)],
+[if test "$enableval" = "yes"; then
+  AC_DEFINE(CONFIG_USE_ZLIB)
+  LIBS="$LIBS -lz"
+fi])
+
+AC_ARG_ENABLE(use-syscall,
+[  --disable-use-syscall        Do not use _syscall(), use libc functions instead
+			       (default)],
+[if test "$enableval" = "yes"; then
+  AC_DEFINE(CONFIG_USE_SYSCALL)
+  USE_SYSCALL="y"
+fi])
+
 AC_SUBST(ARCH)
 
 # If the user did not specify CFLAGS, use suitable values for modutils
@@ -227,6 +250,6 @@
   fi
 fi
 
-AC_OUTPUT(Makefile depmod/Makefile genksyms/Makefile
+AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile
 	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile)
diff -Nur modutils-2.3.11/depmod/Makefile.in modutils-2.3.12/depmod/Makefile.in
--- modutils-2.3.11/depmod/Makefile.in	Tue Apr 18 13:38:59 2000
+++ modutils-2.3.12/depmod/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,22 +1,8 @@
-# $Id: Makefile.in 1.10 Tue, 18 Apr 2000 13:38:59 +1000 kaos $
+# $Id: Makefile.in 1.12 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFSNOARCH	:= -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS		:= -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
@@ -42,7 +28,7 @@
 all: .depend depmod
 
 depmod: $(OBJS) ../util/libutil.a ../obj/libobj.a
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean:
 	rm -f *.o
diff -Nur modutils-2.3.11/depmod/depmod.c modutils-2.3.12/depmod/depmod.c
--- modutils-2.3.11/depmod/depmod.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/depmod/depmod.c	Sun Jul  9 14:19:11 2000
@@ -37,7 +37,7 @@
        Keith Owens <kaos@ocs.com.au> April 2000.
    */
 
-#ident "$Id: depmod.c 1.13 Thu, 20 Apr 2000 14:31:49 +1000 kaos $"
+#ident "$Id: depmod.c 1.15 Sun, 09 Jul 2000 14:19:11 +1000 kaos $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -219,7 +219,7 @@
 			   newest first, so we want the last match in
 			   the chain.  In particular, this prefers
 			   kernel symbols to that of any module.
-			   
+
 			   If we are ignoring the genksyms suffix in this
 			   comparision then there are two hashes to try.
 			 */
@@ -260,7 +260,7 @@
 {
 	static char *currdir;
 	static int currdir_len;
-	FILE *fp;
+	int fp;
 	MODULE *mod;
 	SYMBOL *undefs[5000];
 	SYMBOL *defsym[5000];
@@ -278,14 +278,14 @@
 	p = strrchr(objname, '/');
 	len = 1 + (int)(p - objname);
 
-	if ((fp = fopen(objname, "r")) == NULL)
+ 	if ((fp = gzf_open(objname, O_RDONLY)) < 0)
 		return 1;
 
-	if (!(f = obj_load(fp, ET_REL))) {
-		fclose(fp);
+	if (!(f = obj_load(fp, ET_REL, objname))) {
+		gzf_close(fp);
 		return -1;
 	}
-	fclose(fp);
+	gzf_close(fp);
 
 	/*
 	 * If we have changed base directory
diff -Nur modutils-2.3.11/genksyms/Makefile.in modutils-2.3.12/genksyms/Makefile.in
--- modutils-2.3.11/genksyms/Makefile.in	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/genksyms/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,24 +1,8 @@
-# $Id: Makefile.in 1.8 Thu, 13 Apr 2000 18:17:59 +1000 kaos $
+# $Id: Makefile.in 1.10 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
-
-PARSERCFLAGS	= @PARSERCFLAGS@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFS = -I. -I$(srcdir) -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 
@@ -30,7 +14,7 @@
 all: genksyms
 
 genksyms: genksyms.o parse.o lex.o ../util/libutil.a
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 parse.o: parse.c
 	$(CC) $(CFLAGS) $(PARSERCFLAGS) $(DEFS) -c -o $@ $<
diff -Nur modutils-2.3.11/include/config.h modutils-2.3.12/include/config.h
--- modutils-2.3.11/include/config.h	Tue Oct 12 20:53:21 1999
+++ modutils-2.3.12/include/config.h	Sun Jul  9 12:35:44 2000
@@ -75,7 +75,7 @@
 
 char *fgets_strip(char *buf, int sizebuf, FILE * fin, int *lineno);
 int config_read(int all, char *force_ver, char *base_dir, char *conf_file);
-GLOB_LIST *config_lstmod(char *match, const char *type, int first_only);
-char *search_module_path(char *base);
+GLOB_LIST *config_lstmod(const char *match, const char *type, int first_only);
+char *search_module_path(const char *base);
 
 #endif /* _CONFIG_H */
diff -Nur modutils-2.3.11/include/elf_ia64.h modutils-2.3.12/include/elf_ia64.h
--- modutils-2.3.11/include/elf_ia64.h	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/include/elf_ia64.h	Sun Jul  9 14:46:03 2000
@@ -0,0 +1,9 @@
+/* Machine-specific elf macros for ia64.  */
+
+#define ELFCLASSM	ELFCLASS64
+#define ELFDATAM	ELFDATA2LSB
+
+#define MATCH_MACHINE(x)  (x == EM_IA_64)
+
+#define SHT_RELM	SHT_RELA
+#define Elf64_RelM	Elf64_Rela
diff -Nur modutils-2.3.11/include/elf_s390.h modutils-2.3.12/include/elf_s390.h
--- modutils-2.3.11/include/elf_s390.h	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/include/elf_s390.h	Sun Jul  9 14:20:59 2000
@@ -0,0 +1,10 @@
+/* Machine-specific elf macros for i386 et al.  */
+#ident "$Id: elf_s390.h 1.1 Sun, 09 Jul 2000 14:20:59 +1000 kaos $"
+
+#define ELFCLASSM	ELFCLASS32
+#define ELFDATAM	ELFDATA2MSB
+
+#define MATCH_MACHINE(x)  (x == EM_S390)
+
+#define SHT_RELM	SHT_RELA
+#define Elf32_RelM	Elf32_Rela
diff -Nur modutils-2.3.11/include/obj.h modutils-2.3.12/include/obj.h
--- modutils-2.3.11/include/obj.h	Tue Apr 18 13:38:59 2000
+++ modutils-2.3.12/include/obj.h	Sun Jul  9 14:46:03 2000
@@ -24,7 +24,7 @@
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: obj.h 1.4 Tue, 18 Apr 2000 13:38:59 +1000 kaos $"
+#ident "$Id: obj.h 1.7 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -105,6 +105,7 @@
   unsigned long local_symtab_size;
   struct obj_symbol **local_symtab;
   struct obj_symbol *symtab[HASH_BUCKETS];
+  const char *filename;
 };
 
 enum obj_reloc
@@ -162,6 +163,7 @@
 #define arch_create_got			ObjW(arch_create_got)
 #define arch_init_module		ObjW(arch_init_module)
 #define arch_load_proc_section		ObjW(arch_load_proc_section)
+#define arch_finalize_section_address	ObjW(arch_finalize_section_address)
 
 unsigned long obj_elf_hash (const char *);
 
@@ -213,7 +215,7 @@
 
 int obj_relocate (struct obj_file *f, ElfW(Addr) base);
 
-struct obj_file *obj_load (FILE *f, Elf32_Half e_type);
+struct obj_file *obj_load (int f, Elf32_Half e_type, const char *filename);
 
 void obj_free (struct obj_file *f);
 
@@ -240,6 +242,8 @@
 struct module;
 int arch_init_module (struct obj_file *f, struct module *);
 
-int arch_load_proc_section (struct obj_section *sec, FILE *fp);
+int arch_load_proc_section (struct obj_section *sec, int fp);
+
+int arch_finalize_section_address (struct obj_file *f, ElfW(Addr) base);
 
 #endif /* obj.h */
diff -Nur modutils-2.3.11/include/util.h modutils-2.3.12/include/util.h
--- modutils-2.3.11/include/util.h	Sun Dec 26 20:47:58 1999
+++ modutils-2.3.12/include/util.h	Sun Jul  9 14:19:11 2000
@@ -23,7 +23,7 @@
 #ifndef MODUTILS_UTIL_H
 #define MODUTILS_UTIL_H 1
 
-#ident "$Id: util.h 1.3 Sun, 26 Dec 1999 20:47:58 +1100 keith $"
+#ident "$Id: util.h 1.4 Sun, 09 Jul 2000 14:19:11 +1000 kaos $"
 
 #define SHELL_META "&();|<>$`\"'\\!{}[]~=+:?*" /* Sum of bj0rn and Debian */
 
@@ -61,5 +61,20 @@
 int meta_expand(char *pt, GLOB_LIST *g, char *base_dir, char *version);
 
 extern void snap_shot(const char *module_name, int number);
+
+#ifdef CONFIG_USE_ZLIB
+int gzf_open(const char *name, int mode);
+int gzf_read(int fd, void *buf, size_t count);
+off_t gzf_lseek(int fd, off_t offset, int whence);
+void gzf_close(int fd);
+
+#else /* ! CONFIG_USE_ZLIB */
+
+#define gzf_open	open
+#define gzf_read	read
+#define gzf_lseek	lseek
+#define gzf_close	close
+
+#endif /* CONFIG_USE_ZLIB */
 
 #endif /* util.h */
diff -Nur modutils-2.3.11/include/version.h modutils-2.3.12/include/version.h
--- modutils-2.3.11/include/version.h	Tue Apr  4 12:41:06 2000
+++ modutils-2.3.12/include/version.h	Sun Jul  9 09:56:57 2000
@@ -1 +1 @@
-#define MODUTILS_VERSION "2.3.11"
+#define MODUTILS_VERSION "2.3.12"
diff -Nur modutils-2.3.11/insmod/Makefile.in modutils-2.3.12/insmod/Makefile.in
--- modutils-2.3.11/insmod/Makefile.in	Tue Apr 18 13:38:59 2000
+++ modutils-2.3.12/insmod/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,23 +1,8 @@
-# $Id: Makefile.in 1.18 Tue, 18 Apr 2000 13:38:59 +1000 kaos $
+# $Id: Makefile.in 1.20 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-insmod_static=@insmod_static@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFSNOARCH	:= -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS		:= -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
@@ -63,17 +48,17 @@
 
 # Rule for building "normal" modutils executables (non-combined)
 %: %.c ../obj/libobj.a ../util/libutil.a
-	$(CC) $(CFLAGS) $(DEFSNOARCH) $(DEFS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) $(DEFSNOARCH) $(DEFS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 #=====================================================================
 
 all: .depend $(TARGETS)
 
 insmod: $(INSMODOBJS) ../obj/libobj.a ../util/libutil.a
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 insmod.static: $(INSMODOBJS) ../obj/libobj.a ../util/libutil.a
-	$(CC) -static $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) -static $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(COMB): insmod
 	ln -sf $< $@
@@ -82,7 +67,7 @@
 	ln -sf $< $@
 
 modinfo: $(MODINFOOBJS) ../obj/libobj.a ../util/libutil.a
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 install install-bin: all
 	@set -x;\
diff -Nur modutils-2.3.11/insmod/insmod.c modutils-2.3.12/insmod/insmod.c
--- modutils-2.3.11/insmod/insmod.c	Fri Apr 21 13:50:20 2000
+++ modutils-2.3.12/insmod/insmod.c	Sun Jul  9 14:48:27 2000
@@ -48,7 +48,7 @@
        Keith Owens <kaos@ocs.com.au> April 2000.
    */
 
-#ident "$Id: insmod.c 1.17 Fri, 21 Apr 2000 13:50:20 +1000 kaos $"
+#ident "$Id: insmod.c 1.20 Sun, 09 Jul 2000 14:48:27 +1000 kaos $"
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -1046,9 +1046,8 @@
 	ret = sys_init_module(m_name, (struct module *) image);
 	if (ret) {
 		error("init_module: %m");
-		if (errno == EBUSY)
-			lprintf("Hint: this error can be caused by incorrect module parameters, "
-				"including invalid IO or IRQ parameters");
+		lprintf("Hint: insmod errors can be caused by incorrect module parameters, "
+			"including invalid IO or IRQ parameters");
 	}
 
 	free(image);
@@ -1240,7 +1239,7 @@
 	int m_crcs;
 	char m_strversion[STRVERSIONLEN];
 	char *filename;
-	FILE *fp;
+	int fp;
 	struct obj_file *f;
 	struct obj_section *kallsyms = NULL;
 	int o;
@@ -1358,14 +1357,14 @@
 		printf("Using %s\n", filename);
 
 	/* And open it.  */
-	if ((fp = fopen(filename, "r")) == NULL) {
+	if ((fp = gzf_open(filename, O_RDONLY)) == -1) {
 		error_file = filename;
 		error("%s: %m", filename);
 		return 1;
 	}
 	/* Try to prevent multiple simultaneous loads.  */
 	if (dolock)
-		flock(fileno(fp), LOCK_EX);
+		flock(fp, LOCK_EX);
 
 	if (!get_kernel_info(K_SYMBOLS))
 		goto out;
@@ -1384,7 +1383,7 @@
 	}
 
 	error_file = filename;
-	if ((f = obj_load(fp, ET_REL)) == NULL)
+	if ((f = obj_load(fp, ET_REL, filename)) == NULL)
 		goto out;
 
 	/* Version correspondence?  */
@@ -1524,8 +1523,8 @@
 
       out:
 	if (dolock)
-		flock(fileno(fp), LOCK_UN);
-	fclose(fp);
+		flock(fp, LOCK_UN);
+	close(fp);
 	if (!noload)
 		snap_shot(NULL, 0);
 
diff -Nur modutils-2.3.11/insmod/kallsyms.c modutils-2.3.12/insmod/kallsyms.c
--- modutils-2.3.11/insmod/kallsyms.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/insmod/kallsyms.c	Sun Jul  9 14:19:11 2000
@@ -23,10 +23,12 @@
      Fixes:
    */
 
-#ident "$Id: kallsyms.c 1.2 Thu, 20 Apr 2000 14:31:49 +1000 kaos $"
+#ident "$Id: kallsyms.c 1.4 Sun, 09 Jul 2000 14:19:11 +1000 kaos $"
 
 #include <sys/types.h>
 #include <getopt.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "module.h"
 #include "obj.h"
@@ -73,7 +75,7 @@
 	    {0, 0, 0, 0}
     };
     char *filename = NULL;
-    FILE *fp;
+    int fp;
     struct obj_file *fin, *fout;
     int i, c;
 
@@ -104,16 +106,16 @@
 
     filename = argv[optind++];
     error_file = filename;
-    if ((fp = fopen(filename, "r")) == NULL) {
+    if ((fp = gzf_open(filename, O_RDONLY)) < 0) {
 	error("%s: %m", filename);
 	return 1;
     }
 
-    if ((fin = obj_load(fp, ET_EXEC)) == NULL) {
-	fclose(fp);
+    if ((fin = obj_load(fp, ET_EXEC, filename)) == NULL) {
+	gzf_close(fp);
 	return 1;
     }
-    fclose(fp);
+    gzf_close(fp);
 
     error_file = "kallsyms";
     if (obj_kallsyms(fin, &fout))
diff -Nur modutils-2.3.11/insmod/modinfo.c modutils-2.3.12/insmod/modinfo.c
--- modutils-2.3.11/insmod/modinfo.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/insmod/modinfo.c	Sun Jul  9 14:19:11 2000
@@ -31,7 +31,7 @@
  *   Keith Owens <kaos@ocs.com.au> December 1999.
  */
 
-#ident "$Id: modinfo.c 1.8 Thu, 20 Apr 2000 14:31:49 +1000 kaos $"
+#ident "$Id: modinfo.c 1.10 Sun, 09 Jul 2000 14:19:11 +1000 kaos $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +41,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 
 #include "module.h"
 #include "obj.h"
@@ -48,7 +49,7 @@
 #include "version.h"
 #include "config.h"
 
-extern int show_module_info(char *filename, char *fmtstr, int do_parameters);
+extern int show_module_info(const char *filename, const char *fmtstr, int do_parameters);
 extern int show_module_info_32(char *filename, char *fmtstr, int do_parameters);
 extern int show_module_info_64(char *filename, char *fmtstr, int do_parameters);
 
@@ -60,12 +61,52 @@
 #define SHOW_MODULE_INFO show_module_info		/* Not common 3264 code */
 #endif
 
-static char *get_modinfo_value(struct obj_file *f, const char *key)
+
+static int convert_escape (int c)
+{
+  switch (c)
+    {
+    case 'a':  /* WARNING: the meaning of \a is changed is -traditional is used */
+      c = '\a';
+      break;
+    case 'v':
+      c = '\v';
+      break;
+    case 'b':
+      c = '\b';
+      break;
+    case 'e': /* ESC -- non-ANSI */
+    case 'E':
+      c = '\033';
+      break;
+    case 'f':
+      c = '\f';
+      break;
+    case 'n':
+      c = '\n';
+      break;
+    case 'r':
+      c = '\r';
+      break;
+    case 't':
+      c = '\t';
+      break;
+    }
+
+  return(c);
+}
+ 
+
+static const char *get_modinfo_value(struct obj_file *f, const char *key)
 {
 	struct obj_section *sec;
 	char *p, *v, *n, *ep;
 	size_t klen = strlen(key);
 
+	if (strcmp(key, "filename") == 0) {
+		return(f->filename);
+	}
+
 	sec = obj_find_section(f, ".modinfo");
 	if (sec == NULL)
 		return NULL;
@@ -91,7 +132,7 @@
 static int append_modinfo_tag(struct obj_file *f, char *tag, char *def,
 			      char **out_str, int n)
 {
-	char *p;
+	const char *p;
 
 	p = get_modinfo_value(f, tag);
 	if (!p && !def)
@@ -110,18 +151,28 @@
 }
 
 /* Format the "format" string based on the module contents. */
-static char *format_query_string(struct obj_file *f, char *format)
+static char *format_query_string(struct obj_file *f, const char *format)
 {
 	static char buffer[1024];
-	char *in_str = format, *out_str = &buffer[0];
+	int c;
+	const char *in_str = format;
+	char *out_str = buffer;
 	char *last_char = buffer + sizeof(buffer) - 1;
 
 	while (*in_str && out_str < last_char) {
 		/* Just copy normal characters into the output. */
-		if (*in_str != '%') {
-			*out_str++ = *in_str++;
-			continue;
-		}
+		if (*in_str != '%') 
+		  {
+		    if (*in_str == '\\')
+		      c = convert_escape(*++in_str);
+		    else
+		      c = *in_str;
+
+		    ++in_str;
+
+		    *out_str++ = (char) c;
+		    continue;
+		  }
 		/* Ensure that the replacement is there. */
 		if (*++in_str == '\0') {
 			error("missing replacement");
@@ -129,6 +180,7 @@
 		}
 		/* Process the replacement as required. */
 		switch (*in_str++) {
+
 		case '%':
 			*out_str++ = '%';
 			break;
@@ -143,6 +195,11 @@
 				&out_str, last_char - out_str);
 			break;
 
+		case 'n':
+			(void) append_modinfo_tag(f, "filename", "<none>",
+				&out_str, last_char - out_str);
+			break;
+
 		case '{':{
 				char tag[128], *end = strchr(in_str, '}');
 
@@ -161,10 +218,8 @@
 				tag[end - in_str] = '\0';
 
 				/* Append the tag's value if it exists. */
-				if (append_modinfo_tag(f, tag, NULL, &out_str, last_char - out_str) < 0) {
-					error("%s: nonexistent tag", tag);
-					return NULL;
-				}
+				append_modinfo_tag(f, tag, "<none>", &out_str, last_char - out_str);
+
 				/* Advance past the end of the replacement. */
 				in_str = end + 1;
 				break;
@@ -181,7 +236,7 @@
 }
 
 static void show_parameter(struct obj_file *f, char *key, char *value,
-			   char *desc)
+			   const char *desc)
 {
 	struct obj_symbol *sym;
 	int min, max;
@@ -285,9 +340,9 @@
 	}
 }
 
-int SHOW_MODULE_INFO(char *filename, char *fmtstr, int do_parameters)
+int SHOW_MODULE_INFO(const char *filename, const char *fmtstr, int do_parameters)
 {
-	FILE *fp;
+	int fp;
 	struct obj_file *f;
 	char *p;
 
@@ -303,12 +358,12 @@
 	error_file = filename;
 
 	/* Attempt to open and parse the module file. */
-	if ((fp = fopen(filename, "r")) == NULL) {
+	if ((fp = gzf_open(filename, O_RDONLY)) < 0) {
 		error("%s: %m", filename);
 		return -1;
-	} else if ((f = obj_load(fp, ET_REL)) == NULL)
+	} else if ((f = obj_load(fp, ET_REL, filename)) == NULL)
 		return -1;
-	fclose(fp);
+	gzf_close(fp);
 
 	if (do_parameters) {
 		show_module_parameters(f);
@@ -340,6 +395,7 @@
 	printf("usage: modinfo <parameters> <module>\n");
 	printf("  -a, --author            display module author\n");
 	printf("  -d, --description       display module description\n");
+	printf("  -n, --filename          display module filename\n");
 	printf("  -f <str>\n");
 	printf("      --format <str>      print the <query-string>\n");
 	printf("  -p, --parameters        display module parameters\n");
@@ -359,7 +415,8 @@
 	{
 		{"author", 0, 0, 'a'},
 		{"description", 0, 0, 'd'},
-		{"format", 0, 0, 'f'},
+		{"filename", 0, 0, 'n'},
+		{"format", required_argument, 0, 'f'},
 		{"parameters", 0, 0, 'p'},
 		{"version", 0, 0, 'V'},
 		{"help", 0, 0, 'h'},
@@ -368,8 +425,7 @@
 	int do_parameters = 0, opt;
 	char *fmtstr = NULL;
 
-	while ((opt = getopt_long(argc, argv, "adq:pVh",
-				  &long_opts[0], NULL)) != EOF)
+	while ((opt = getopt_long(argc, argv, "adnq:pf:Vh", long_opts, NULL)) != EOF)
 		switch (opt) {
 		case 'a':
 			fmtstr = "%a\n";
@@ -377,6 +433,9 @@
 		case 'd':
 			fmtstr = "%d\n";
 			break;
+		case 'n':
+			fmtstr = "%n\n";
+			break;
 		case 'f':
 			fmtstr = xstrdup(optarg);
 			break;
@@ -387,6 +446,7 @@
 			fputs("modinfo (Linux modutils) " MODUTILS_VERSION "\n", stdout);
 			exit(0);
 		case 'h':
+
 		default:
 			modinfo_usage();
 			exit(opt == 'h' ? 0 : 1);
diff -Nur modutils-2.3.11/kerneld/Makefile.in modutils-2.3.12/kerneld/Makefile.in
--- modutils-2.3.11/kerneld/Makefile.in	Tue Dec  7 18:15:35 1999
+++ modutils-2.3.12/kerneld/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,22 +1,8 @@
-# $Id: Makefile.in 1.7 Tue, 07 Dec 1999 18:15:35 +1100 keith $
+# $Id: Makefile.in 1.9 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += $(DEBUG) $(NO_GDBM) $(EXTRA_DEFS)
@@ -46,13 +32,13 @@
 
 ifndef NO_GDBM
 PROGS += admpersist
-LDLIBS = -lgdbm
+LIBS += -lgdbm
 endif
 
 all: .depend $(PROGS)
 
 kerneld: kerneld.o ../util/libutil.a
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 install install-bin: all
 	for i in $(PROGS); do \
diff -Nur modutils-2.3.11/man/Makefile.in modutils-2.3.12/man/Makefile.in
--- modutils-2.3.11/man/Makefile.in	Thu Jan 13 20:37:36 2000
+++ modutils-2.3.12/man/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,22 +1,8 @@
-# $Id: Makefile.in 1.6 Thu, 13 Jan 2000 20:37:36 +1100 keith $
+# $Id: Makefile.in 1.8 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 ######################################################################
 
diff -Nur modutils-2.3.11/man/modinfo.8 modutils-2.3.12/man/modinfo.8
--- modutils-2.3.11/man/modinfo.8	Tue Oct 12 20:53:21 1999
+++ modutils-2.3.12/man/modinfo.8	Sun Jul  9 12:35:44 2000
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1996 Free Software Foundation, Inc.
 .\" This program is distributed according to the Gnu General Public License.
 .\" See the file COPYING in the kernel source directory
-.\" $Id: modinfo.8 1.2 Tue, 12 Oct 1999 20:53:21 +1000 keith $
+.\" $Id: modinfo.8 1.3 Sun, 09 Jul 2000 12:35:44 +1000 kaos $
 .\"
 .TH MODINFO 8 "11 Nov 1997" Linux "Linux Module Support"
 .SH NAME
@@ -24,12 +24,18 @@
 .BR \-d ", " \-\-description
 Display the module's description.
 .TP
+.BR \-n ", " \-\-filename
+Display the module's filename.
+.TP
 .BI \-f format_string ", \-\-format " format_string
 Let the user specify an arbitrary format string which can extract
 values from the ELF section in
 .I module_file
-which contains the module information. Replacements consist of a
-percent sign followed by a tag name in curly braces.
+which contains the module information.
+Replacements consist of a percent sign followed by a tag name in curly
+braces.
+A tagname of %{filename} is always supported, even if the module has no
+modinfo section.
 .TP
 .BR \-p ", " \-\-parameters
 Display the typed parameters that a module may support.
diff -Nur modutils-2.3.11/man/modules.conf.5 modutils-2.3.12/man/modules.conf.5
--- modutils-2.3.11/man/modules.conf.5	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/man/modules.conf.5	Sun Jul  9 11:15:44 2000
@@ -492,6 +492,7 @@
   path[usb]=/lib/modules/`uname \-r`/usb
   path[ide]=/lib/modules/`uname \-r`/ide
   path[ieee1394]=/lib/modules/`uname \-r`/ieee1394
+  path[kernel]=/lib/modules/`uname \-r`/kernel
 
   path[fs]=/lib/modules/`kernelversion`/fs
   path[net]=/lib/modules/`kernelversion`/net
@@ -509,6 +510,7 @@
   path[usb]=/lib/modules/`kernelversion`/usb
   path[ide]=/lib/modules/`kernelversion`/ide
   path[ieee1394]=/lib/modules/`kernelversion`/ieee1394
+  path[kernel]=/lib/modules/`kernelversion`/kernel
 
   path[fs]=/lib/modules/default/fs
   path[net]=/lib/modules/default/net
@@ -526,6 +528,7 @@
   path[usb]=/lib/modules/default/usb
   path[ide]=/lib/modules/default/ide
   path[ieee1394]=/lib/modules/default/ieee1394
+  path[kernel]=/lib/modules/default/kernel
 
   path[fs]=/lib/modules/fs
   path[net]=/lib/modules/net
@@ -543,6 +546,7 @@
   path[usb]=/lib/modules/usb
   path[ide]=/lib/modules/ide
   path[ieee1394]=/lib/modules/ieee1394
+  path[kernel]=/lib/modules/kernel
 .PP
 There are also a set of default
 .I alias
diff -Nur modutils-2.3.11/modutils.spec modutils-2.3.12/modutils.spec
--- modutils-2.3.11/modutils.spec	Fri Apr 21 19:34:16 2000
+++ modutils-2.3.12/modutils.spec	Sun Jul  9 14:19:11 2000
@@ -1,6 +1,6 @@
 Summary: Module utilities
 Name: modutils
-Version: 2.3.11
+Version: 2.3.12
 Release: 1
 Copyright: GPL
 Group: Utilities/System
diff -Nur modutils-2.3.11/obj/Makefile.in modutils-2.3.12/obj/Makefile.in
--- modutils-2.3.11/obj/Makefile.in	Tue Apr 18 13:38:59 2000
+++ modutils-2.3.12/obj/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,22 +1,8 @@
-# $Id: Makefile.in 1.11 Tue, 18 Apr 2000 13:38:59 +1000 kaos $
+# $Id: Makefile.in 1.13 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFSNOARCH	:= -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS		:= -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
diff -Nur modutils-2.3.11/obj/obj_alpha.c modutils-2.3.12/obj/obj_alpha.c
--- modutils-2.3.11/obj/obj_alpha.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/obj/obj_alpha.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_alpha.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj_alpha.c 1.3 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <assert.h>
@@ -78,7 +78,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -286,3 +286,15 @@
 
   return 1;
 }
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf64_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
+  return 1;
+}
+
diff -Nur modutils-2.3.11/obj/obj_arm.c modutils-2.3.12/obj/obj_arm.c
--- modutils-2.3.11/obj/obj_arm.c	Fri Apr 14 11:59:15 2000
+++ modutils-2.3.12/obj/obj_arm.c	Sun Jul  9 14:46:03 2000
@@ -21,7 +21,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_arm.c 1.4 Fri, 14 Apr 2000 11:59:15 +1000 kaos $"
+#ident "$Id: obj_arm.c 1.6 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <assert.h>
@@ -90,7 +90,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -297,5 +297,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_common.c modutils-2.3.12/obj/obj_common.c
--- modutils-2.3.11/obj/obj_common.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/obj/obj_common.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_common.c 1.4 Thu, 20 Apr 2000 14:31:49 +1000 kaos $"
+#ident "$Id: obj_common.c 1.5 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <assert.h>
@@ -241,6 +241,9 @@
   if (!(af & SHF_WRITE)) ac |= 8;
   if (af & SHF_EXECINSTR) ac |= 4;
   if (a->header.sh_type != SHT_NOBITS) ac |= 2;
+#if defined(ARCH_ia64)
+  if (af & SHF_IA_64_SHORT) ac -= 1;
+#endif
 
   return ac;
 }
diff -Nur modutils-2.3.11/obj/obj_i386.c modutils-2.3.12/obj/obj_i386.c
--- modutils-2.3.11/obj/obj_i386.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/obj/obj_i386.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_i386.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj_i386.c 1.3 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <assert.h>
@@ -78,7 +78,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -224,5 +224,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_ia64.c modutils-2.3.12/obj/obj_ia64.c
--- modutils-2.3.11/obj/obj_ia64.c	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/obj/obj_ia64.c	Sun Jul  9 14:46:03 2000
@@ -0,0 +1,1023 @@
+/*
+ * ia64 specific support for Elf loading and relocation.
+ * Copyright 2000 Mike Stephens <mike.stephens@intel.com>
+ *
+ * This file is part of the Linux modutils.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ident "$Id: obj_ia64.c 1.1 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
+
+#include <string.h>
+#include <assert.h>
+
+#include <module.h>
+#include <obj.h>
+#include <util.h>
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE  ~FALSE
+#endif
+
+/*======================================================================*/
+
+typedef struct _ia64_opd_t
+{
+    int offset;
+    int reloc_done;
+} ia64_opd_t;
+
+typedef struct _ia64_plt_t
+{
+    struct _ia64_plt_t *next;
+    Elf64_Addr addend;
+    int text_offset;
+    int data_offset;
+    int reloc_done;
+} ia64_plt_t;
+
+typedef struct _ia64_got_t
+{
+    struct _ia64_got_t *next;
+    Elf64_Addr addend;
+    int offset;
+    int reloc_done;
+} ia64_got_t;
+
+typedef struct _ia64_symbol_t
+{
+    struct obj_symbol root;
+    ia64_got_t *gotent;
+    ia64_opd_t *opdent;
+    ia64_plt_t *pltent;
+} ia64_symbol_t;
+
+typedef struct _ia64_file_t
+{
+    struct obj_file root;
+    struct obj_section *got;
+    struct obj_section *opd;
+    struct obj_section *pltt;
+    struct obj_section *pltd;
+    Elf64_Addr gp;
+    Elf64_Addr text;
+    Elf64_Addr data;
+    Elf64_Addr bss;
+} ia64_file_t;
+
+/*
+ * aa=gp rel address of the function descriptor in the .IA_64.pltoff section
+ */
+unsigned char ia64_plt_local[] =
+{
+    0x0b, 0x78, 0x00, 0x02, 0x00, 0x24, /* [MMI] addl r15=aa,gp;;   */
+    0x00, 0x41, 0x3c, 0x30, 0x28, 0xc0, /*       ld8 r16=[r15],8    */
+    0x01, 0x08, 0x00, 0x84,             /*       mov r14=gp;;       */
+    0x11, 0x08, 0x00, 0x1e, 0x18, 0x10, /* [MIB] ld8 gp=[r15]       */
+    0x60, 0x80, 0x04, 0x80, 0x03, 0x00, /*       mov b6=r16         */
+    0x60, 0x00, 0x80, 0x00              /*       br.few b6;;        */
+};
+
+unsigned char ia64_plt_extern[] =
+{
+    0x0b, 0x80, 0x00, 0x02, 0x00, 0x24, /* [MMI] addl r16=aa,gp;;   */
+    0xf0, 0x00, 0x40, 0x30, 0x20, 0x00, /*       ld8 r15=[r16]      */
+    0x00, 0x00, 0x04, 0x00,             /*       nop.i 0x0;;        */
+    0x0b, 0x80, 0x20, 0x1e, 0x18, 0x14, /* [MMI] ld8 r16=[r15],8;;  */
+    0x10, 0x00, 0x3c, 0x30, 0x20, 0xc0, /*       ld8 gp=[r15]       */
+    0x00, 0x09, 0x00, 0x07,             /*       mov b6=r16;;       */
+    0x11, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MIB] nop.m 0x0          */
+    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /*       nop.i 0x0          */
+    0x60, 0x00, 0x80, 0x00              /*       br.few b6;;        */
+};
+
+/*======================================================================*/
+
+/*
+ * return the instruction at slot in bundle
+ */
+Elf64_Xword
+obj_ia64_ins_extract_from_bundle(Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    switch (slot)
+    {
+    case 0 :
+        return (*bundle >> 5) & 0x1ffffffffff;
+
+    case 1 :
+        return (((*bundle >> 46) & 0x3ffff) |
+            (*(bundle + 1) << 18)) & 0x1ffffffffff;
+
+    case 2 :
+        return (*(bundle + 1) >> 23) & 0x1ffffffffff;
+
+    default:
+    }
+    return (-1);
+}
+
+/*
+ * insert a instruction at slot in bundle
+ */
+void
+obj_ia64_ins_insert_in_bundle(Elf64_Addr *bundle, Elf64_Xword slot, Elf64_Xword ins)
+{
+    Elf64_Xword i;
+    Elf64_Xword in = ins & 0x1ffffffffff;
+
+    switch (slot)
+    {
+    case 0 :
+        i = *bundle & 0xffffc0000000001f;
+       *bundle = i | (in << 5);
+        break;
+
+    case 1 :
+        i = *bundle & 0x00003fffffffffff;
+        *bundle = i | (in << 46);
+
+        ++bundle;
+        i = *bundle & 0xffffffffff800000;
+        *bundle = i | (in >> 18);
+        break;
+
+    case 2 :
+        ++bundle;
+        i = *bundle & 0x00000000007fffff;
+        *bundle = i | (in << 23);
+        break;
+    }
+}
+
+/*
+ * add a immediate 14 value to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_imm14(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffee07f01fff;
+    ins |= ((v & 0x2000) << 23) | ((v & 0x1f80) << 20) | ((v & 0x007f) << 13);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    if (((Elf64_Sxword) v > 8191) || ((Elf64_Sxword) v < -8192))
+        return obj_reloc_overflow;
+    return obj_reloc_ok;
+}
+
+/*
+ * add a immediate 22 value to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_imm22(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffe000301fff;
+    ins |= ((v & 0x200000) << 15) | ((v & 0x1f0000) << 6) |
+           ((v & 0x00ff80) << 20) | ((v & 0x00007f) << 13);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    if (((Elf64_Sxword) v > 2097151) || ((Elf64_Sxword) v < -2097152))
+        return obj_reloc_overflow;
+    return obj_reloc_ok;
+}
+
+/*
+ * add a immediate 21 value (form 1) to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_pcrel21b(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffee00001fff;
+    ins |= ((v & 0x1000000) << 12) | ((v & 0x0fffff0) << 9);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    return obj_reloc_ok;
+}
+
+/*
+ * add a immediate 21 value (form 2) to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_pcrel21m(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffee000fe03f;
+    ins |= ((v & 0x1000000) << 12) | ((v & 0x0fff800) << 9) |
+           ((v & 0x00007f0) << 2);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    return obj_reloc_ok;
+}
+
+/*
+ * add a immediate 21 value (form 3) to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_pcrel21f(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffeffc00003f;
+    ins |= ((v & 0x1000000) << 12) | ((v & 0x0fffff0) << 2);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    return obj_reloc_ok;
+}
+
+/*
+ * add a immediate 64 value to the instruction at slot in bundle
+ */
+enum obj_reloc
+obj_ia64_ins_imm64(Elf64_Xword v, Elf64_Addr *bundle, Elf64_Xword slot)
+{
+    Elf64_Xword ins;
+
+    assert(slot == 1);
+    ins = obj_ia64_ins_extract_from_bundle(bundle, slot);
+    ins &= 0xffffffee000101ff;
+    ins |= ((v & 0x8000000000000000) >> 28) | ((v & 0x0000000000200000)) |
+           ((v & 0x00000000001f0000) <<  6) | ((v & 0x000000000000ff80) << 20) |
+           ((v & 0x000000000000007f) << 13);
+    obj_ia64_ins_insert_in_bundle(bundle, slot, ins);
+    obj_ia64_ins_insert_in_bundle(bundle, ++slot, ((v & 0x7fffffffffc00000) >> 22));
+    return obj_reloc_ok;
+}
+
+/*
+ * create a plt entry
+ */
+enum obj_reloc
+obj_ia64_generate_plt(Elf64_Addr v,
+                       Elf64_Addr gp,
+                       ia64_file_t *ifile,
+                       ia64_symbol_t *isym,
+                       ia64_plt_t *pltent)
+{
+    *(Elf64_Addr *)(ifile->pltd->contents + pltent->data_offset) = v;
+    if (isym->root.secidx <= SHN_HIRESERVE)
+    {
+        /* local entry */
+        *(Elf64_Addr *)(ifile->pltd->contents + pltent->data_offset + 8) = gp;
+        memcpy((Elf64_Addr *)(ifile->pltt->contents + pltent->text_offset),
+            ia64_plt_local, sizeof(ia64_plt_local));
+    }
+    else
+    {
+        /* external entry */
+        memcpy((Elf64_Addr *)(ifile->pltt->contents + pltent->text_offset),
+            ia64_plt_extern, sizeof(ia64_plt_extern));
+    }
+    return obj_ia64_ins_imm22(
+        (ifile->pltd->header.sh_addr + pltent->data_offset - gp),
+        (Elf64_Addr *)(ifile->pltt->contents + pltent->text_offset), 0);
+}
+
+struct obj_section *
+obj_ia64_create_alloced_section (struct obj_file *f, const char *name,
+    unsigned long align, unsigned long size, unsigned long sh_flags)
+{
+    int newidx = f->header.e_shnum++;
+    struct obj_section *sec;
+
+    f->sections = xrealloc(f->sections, (newidx+1) * sizeof(sec));
+    f->sections[newidx] = sec = arch_new_section();
+
+    memset(sec, 0, sizeof(*sec));
+    sec->header.sh_type = SHT_PROGBITS;
+    sec->header.sh_flags = sh_flags;
+    sec->header.sh_size = size;
+    sec->header.sh_addralign = align;
+    sec->name = name;
+    sec->idx = newidx;
+    if (size)
+        sec->contents = xmalloc(size);
+
+    obj_insert_section_load_order(f, sec);
+
+    return sec;
+}
+
+/*======================================================================*/
+
+struct obj_file *
+arch_new_file (void)
+{
+    ia64_file_t *f;
+    f = xmalloc(sizeof(*f));
+    f->got = NULL;
+    f->opd = NULL;
+    f->pltt = NULL;
+    f->pltd = NULL;
+    return &f->root;
+}
+
+struct obj_section *
+arch_new_section (void)
+{
+    return xmalloc(sizeof(struct obj_section));
+}
+
+struct obj_symbol *
+arch_new_symbol (void)
+{
+    ia64_symbol_t *sym;
+    sym = xmalloc(sizeof(*sym));
+    sym->gotent = NULL;
+    sym->opdent = NULL;
+    sym->pltent = NULL;
+    return &sym->root;
+}
+
+int
+arch_load_proc_section(struct obj_section *sec, FILE *fp)
+{
+    switch (sec->header.sh_type)
+    {
+    case SHT_IA_64_EXT :
+        sec->contents = NULL;
+        break;
+
+    case SHT_IA_64_UNWIND :
+        if (sec->header.sh_size > 0)
+        {
+            sec->contents = xmalloc(sec->header.sh_size);
+            fseek(fp, sec->header.sh_offset, SEEK_SET);
+            if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1)
+            {
+                error("error reading ELF section data: %m");
+                return -1;
+            }
+        }
+        else
+            sec->contents = NULL;
+        break;
+
+    default:
+      error("Unknown section header type: %08x", sec->header.sh_type);
+      return -1;
+    }
+    return 0;
+}
+
+int
+arch_create_got(struct obj_file *f)
+{
+    ia64_file_t *ifile = (ia64_file_t *)f;
+    int i;
+    int n;
+    int got_offset = 0;
+    int opd_offset = 32;
+    int plt_text_offset = 0;
+    int plt_data_offset = 0;
+
+    n = ifile->root.header.e_shnum;
+    for (i = 0; i < n; ++i)
+    {
+        struct obj_section *relsec, *symsec, *strsec;
+        Elf64_Rela *rel, *relend;
+        Elf64_Sym *symtab;
+        const char *strtab;
+
+        relsec = ifile->root.sections[i];
+        if (relsec->header.sh_type != SHT_RELA)
+            continue;
+
+        symsec = ifile->root.sections[relsec->header.sh_link];
+        strsec = ifile->root.sections[symsec->header.sh_link];
+
+        rel = (Elf64_Rela *)relsec->contents;
+        relend = rel + (relsec->header.sh_size / sizeof(Elf64_Rela));
+        symtab = (Elf64_Sym *)symsec->contents;
+        strtab = (const char *)strsec->contents;
+
+        for (; rel < relend; ++rel)
+        {
+            int need_got = FALSE;
+            int need_opd = FALSE;
+            int need_plt = FALSE;
+
+            switch (ELF64_R_TYPE(rel->r_info))
+            {
+            default:
+                continue;
+
+            case R_IA64_FPTR64I :       /* @fptr(sym + add), mov imm64 */
+            case R_IA64_FPTR32LSB :     /* @fptr(sym + add), data4 LSB */
+            case R_IA64_FPTR64LSB :     /* @fptr(sym + add), data8 LSB */
+                need_opd = TRUE;
+                break;
+
+            case R_IA64_LTOFF22 :       /* @ltoff(sym + add), add imm22 */
+            case R_IA64_LTOFF22X :
+            case R_IA64_LTOFF64I :      /* @ltoff(sym + add), mov imm64 */
+                need_got = TRUE;
+                break;
+
+            case R_IA64_LTOFF_FPTR22 :  /* @ltoff(@fptr(s+a)), imm22 */
+            case R_IA64_LTOFF_FPTR64I : /* @ltoff(@fptr(s+a)), imm64 */
+            case R_IA64_LTOFF_FPTR32LSB :
+            case R_IA64_LTOFF_FPTR64LSB :
+                need_got = TRUE;
+                need_opd = TRUE;
+                break;
+
+            case R_IA64_PLTOFF22 :      /* @pltoff(sym + add), add imm22 */
+            case R_IA64_PLTOFF64I :     /* @pltoff(sym + add), mov imm64 */
+            case R_IA64_PLTOFF64LSB :   /* @pltoff(sym + add), data8 LSB */
+
+            case R_IA64_PCREL21B :      /* @pcrel(sym + add), ptb, call */
+            case R_IA64_PCREL21M :      /* @pcrel(sym + add), chk.s */
+            case R_IA64_PCREL21F :      /* @pcrel(sym + add), fchkf */
+                need_plt = TRUE;
+                break;
+            }
+
+            if (need_got || need_opd || need_plt)
+            {
+                Elf64_Sym     *extsym;
+                ia64_symbol_t *isym;
+                const char    *name;
+                int            local;
+                unsigned long  symndx;
+
+                symndx = ELF64_R_SYM(rel->r_info);
+                extsym = &symtab[symndx];
+                if (ELF64_ST_BIND(extsym->st_info) == STB_LOCAL)
+                {
+                    isym = (ia64_symbol_t *) f->local_symtab[symndx];
+                }
+                else
+                {
+                    if (extsym->st_name)
+                        name = strtab + extsym->st_name;
+                    else
+                        name = f->sections[extsym->st_shndx]->name;
+                    isym = (ia64_symbol_t *)obj_find_symbol(f, name);
+                }
+                local = isym->root.secidx <= SHN_HIRESERVE;
+
+                if (need_plt)
+                {
+                    ia64_plt_t *plt;
+
+                    for (plt = isym->pltent; plt != NULL; plt = plt->next)
+                        if (plt->addend == rel->r_addend)
+                            break;
+                    if (plt == NULL)
+                    {
+                        plt = (ia64_plt_t *) xmalloc(sizeof(ia64_plt_t));
+                        plt->next = isym->pltent;
+                        plt->addend = rel->r_addend;
+                        plt->text_offset = plt_text_offset;
+                        plt->data_offset = plt_data_offset;
+                        plt->reloc_done = FALSE;
+                        isym->pltent = plt;
+                        if (local)
+                        {
+                            plt_text_offset += sizeof(ia64_plt_local);
+                            plt_data_offset += 16;
+                        }
+                        else
+                        {
+                            plt_text_offset += sizeof(ia64_plt_extern);
+                            plt_data_offset += 8;
+                        }
+                        need_plt = FALSE;
+                    }
+                }
+                if (need_got)
+                {
+                    ia64_got_t *got;
+
+                    for (got = isym->gotent; got != NULL; got = got->next)
+                        if (got->addend == rel->r_addend)
+                            break;
+                    if (got == NULL)
+                    {
+                        got = (ia64_got_t *) xmalloc(sizeof(ia64_got_t));
+                        got->next = isym->gotent;
+                        got->addend = rel->r_addend;
+                        got->offset = got_offset;
+                        got->reloc_done = FALSE;
+                        isym->gotent = got;
+                        got_offset += 8;
+                        need_got = FALSE;
+                    }
+                }
+                if (need_opd && local)
+                {
+                    ia64_opd_t *opd;
+
+                    if (isym->opdent == NULL)
+                    {
+                        opd = (ia64_opd_t *) xmalloc(sizeof(ia64_opd_t));
+                        opd->offset = opd_offset;
+                        opd->reloc_done = FALSE;
+                        isym->opdent = opd;
+                        opd_offset += 16;
+                        need_opd = FALSE;
+                    }
+                }
+            }
+        }
+    }
+
+    ifile->got = obj_ia64_create_alloced_section(f, ".got", 8, got_offset,
+        (SHF_ALLOC | SHF_WRITE | SHF_IA_64_SHORT));
+    assert(ifile->got != NULL);
+
+    ifile->opd = obj_ia64_create_alloced_section(f, ".opd", 16, opd_offset,
+        (SHF_ALLOC | SHF_WRITE | SHF_IA_64_SHORT));
+    assert(ifile->opd != NULL);
+
+    if (plt_text_offset > 0)
+    {
+        ifile->pltt = obj_ia64_create_alloced_section(f, ".plt", 16,
+            plt_text_offset, (SHF_ALLOC | SHF_EXECINSTR | SHF_IA_64_SHORT));
+        ifile->pltd = obj_ia64_create_alloced_section(f, ".IA_64.pltoff",
+            16, plt_data_offset, (SHF_ALLOC | SHF_WRITE | SHF_IA_64_SHORT));
+        assert(ifile->pltt != NULL);
+        assert(ifile->pltd != NULL);
+    }
+
+    return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf64_Addr base)
+{
+    ia64_file_t *ifile = (ia64_file_t *)f;
+    Elf64_Addr min_addr = (Elf64_Addr) -1;
+    Elf64_Addr max_addr = 0;
+    Elf64_Addr min_short_addr = (Elf64_Addr) -1;
+    Elf64_Addr max_short_addr = 0;
+    Elf64_Addr gp;
+    Elf64_Addr text = (Elf64_Addr) -1;
+    Elf64_Addr data = (Elf64_Addr) -1;
+    Elf64_Addr bss = (Elf64_Addr) -1;
+    int        n = f->header.e_shnum;
+    int        i;
+
+    /*
+     * Finalize the addresses of the sections, find the min and max
+     * address of all sections marked short, and collect min and max
+     * address of any type, for use in selecting a nice gp.
+     *
+     * The algorithm used for selecting set the GP value was taken from
+     * the ld/bfd code contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+     */
+    f->baseaddr = base;
+    for (i = 0; i < n; ++i)
+    {
+        Elf64_Shdr *header = &f->sections[i]->header;
+        Elf64_Addr lo;
+        Elf64_Addr hi;
+
+        header->sh_addr += base;
+        if (header->sh_flags & SHF_ALLOC)
+        {
+            lo = header->sh_addr;
+            hi = header->sh_addr + header->sh_size;
+            if (hi < lo)
+                hi = (Elf64_Addr) -1;
+
+            if (min_addr > lo)
+                min_addr = lo;
+            if (max_addr < hi)
+                max_addr = hi;
+            if (header->sh_flags & SHF_IA_64_SHORT)
+            {
+                if (min_short_addr > lo)
+                    min_short_addr = lo;
+                if (max_short_addr < hi)
+                    max_short_addr = hi;
+            }
+            if ((header->sh_type & SHT_NOBITS) && (lo < bss))
+                bss = lo;
+            else if ((header->sh_flags & SHF_EXECINSTR) && (lo < text))
+                text = lo;
+            else if (lo < data)
+                data = lo;
+        }
+    }
+    /* Pick a sensible value for gp */
+
+    /* Start with just the address of the .got */
+    gp = ifile->got->header.sh_addr;
+
+    /*
+     * If it is possible to address the entire image, but we
+     * don't with the choice above, adjust.
+     */
+    if ((max_addr - min_addr < 0x400000) && (max_addr - gp <= 0x200000) &&
+        (gp - min_addr > 0x200000))
+    {
+        gp = min_addr + 0x200000;
+    }
+    else if (max_short_addr != 0)
+    {
+        /* If we don't cover all the short data, adjust */
+        if (max_short_addr - gp >= 0x200000)
+            gp = min_short_addr + 0x200000;
+
+        /* If we're addressing stuff past the end, adjust back */
+        if (gp > max_addr)
+            gp = max_addr - 0x200000 + 8;
+    }
+
+    /*
+     * Validate whether all SHF_IA_64_SHORT sections are within
+     * range of the chosen GP.
+     */
+    if (max_short_addr != 0)
+    {
+        if (max_short_addr - min_short_addr >= 0x400000)
+        {
+            error("short data segment overflowed (0x%lx >= 0x400000)",
+                (unsigned long)(max_short_addr - min_short_addr));
+            return 0;
+        }
+        else if (((gp > min_short_addr) && (gp - min_short_addr > 0x200000)) ||
+            ((gp < max_short_addr) && (max_short_addr - gp >= 0x200000)))
+        {
+            error("GP does not cover short data segment");
+            return 0;
+        }
+    }
+    ifile->gp = gp;
+    ifile->text = text;
+    ifile->data = data;
+    ifile->bss = bss;
+    return 1;
+}
+
+enum obj_reloc
+arch_apply_relocation(struct obj_file *f,
+                       struct obj_section *targsec,
+                       struct obj_section *symsec,
+                       struct obj_symbol *sym,
+                       Elf64_Rela *rel,
+                       Elf64_Addr v)
+{
+    ia64_file_t *ifile = (ia64_file_t *) f;
+    ia64_symbol_t *isym  = (ia64_symbol_t *) sym;
+
+    Elf64_Addr *loc = (Elf64_Addr *)(targsec->contents + rel->r_offset);
+    Elf64_Addr  dot = (targsec->header.sh_addr + rel->r_offset) & ~0x03;
+
+    Elf64_Addr  got = ifile->got->header.sh_addr;
+    Elf64_Addr  gp = ifile->gp;
+
+    Elf64_Addr *bundle = (Elf64_Addr *)((Elf64_Xword)(loc) & ~0x03);
+    Elf64_Xword slot = (Elf64_Xword)(loc) & 0x03;
+
+    Elf64_Xword r_info = ELF64_R_TYPE(rel->r_info);
+
+    enum obj_reloc ret = obj_reloc_ok;
+
+    switch (r_info)
+    {
+    case R_IA64_NONE :          /* none */
+    case R_IA64_LDXMOV :        /* Use of LTOFF22X.  */
+        break;
+
+    case R_IA64_IMM14 :         /* symbol + addend, add imm14 */
+        ret = obj_ia64_ins_imm14(v, bundle, slot);
+        break;
+
+    case R_IA64_IMM22 :         /* symbol + addend, add imm22 */
+        ret = obj_ia64_ins_imm22(v, bundle, slot);
+        break;
+
+    case R_IA64_IMM64 :         /* symbol + addend, movl imm64 */
+        ret = obj_ia64_ins_imm64(v, bundle, slot);
+        break;
+
+    case R_IA64_DIR32LSB :      /* symbol + addend, data4 LSB */
+        *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+        if (((Elf64_Sxword) v > 4294967295) ||
+            ((Elf64_Sxword) v < -4294967296))
+            ret = obj_reloc_overflow;
+        break;
+
+    case R_IA64_DIR64LSB :      /* symbol + addend, data8 LSB */
+        *loc = v;
+        break;
+
+    case R_IA64_GPREL22 :       /* @gprel(sym + add), add imm22 */
+        v -= gp;
+        ret = obj_ia64_ins_imm22(v, bundle, slot);
+        break;
+
+    case R_IA64_GPREL64I :      /* @gprel(sym + add), mov imm64 */
+        v -= gp;
+        ret = obj_ia64_ins_imm64(v, bundle, slot);
+        break;
+
+    case R_IA64_GPREL32LSB :    /* @gprel(sym + add), data4 LSB */
+        v -= gp;
+        *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+        if (((Elf64_Sxword) v > 4294967295) ||
+            ((Elf64_Sxword) v < -4294967296))
+            ret = obj_reloc_overflow;
+        break;
+
+    case R_IA64_GPREL64LSB :    /* @gprel(sym + add), data8 LSB */
+        *loc = v - gp;
+        break;
+
+    case R_IA64_LTOFF22 :       /* @ltoff(sym + add), add imm22 */
+    case R_IA64_LTOFF22X :      /* LTOFF22, relaxable.  */
+    case R_IA64_LTOFF64I :      /* @ltoff(sym + add), mov imm64 */
+        {
+            ia64_got_t *ge;
+
+            assert(isym != NULL);
+            for (ge = isym->gotent; ge != NULL && ge->addend != rel->r_addend; )
+                ge = ge->next;
+            assert(ge != NULL);
+            if (!ge->reloc_done)
+            {
+                ge->reloc_done = TRUE;
+                *(Elf64_Addr *)(ifile->got->contents + ge->offset) = v;
+            }
+            v = got + ge->offset - gp;
+            if (r_info == R_IA64_LTOFF64I)
+                ret = obj_ia64_ins_imm64(v, bundle, slot);
+            else
+                ret = obj_ia64_ins_imm22(v, bundle, slot);
+        }
+        break;
+
+    case R_IA64_PLTOFF22 :      /* @pltoff(sym + add), add imm22 */
+    case R_IA64_PLTOFF64I :     /* @pltoff(sym + add), mov imm64 */
+    case R_IA64_PLTOFF64LSB :   /* @pltoff(sym + add), data8 LSB */
+        {
+            ia64_plt_t *pe;
+
+            assert(isym != NULL);
+            for (pe = isym->pltent; pe != NULL && pe->addend != rel->r_addend; )
+                pe = pe->next;
+            assert(pe != NULL);
+            if (!pe->reloc_done)
+            {
+                pe->reloc_done = TRUE;
+                ret = obj_ia64_generate_plt(v, gp, ifile, isym, pe);
+            }
+            v = ifile->pltt->header.sh_addr + pe->text_offset - gp;
+            switch (r_info)
+            {
+            case R_IA64_PLTOFF22 :
+                ret = obj_ia64_ins_imm22(v, bundle, slot);
+                break;
+
+            case R_IA64_PLTOFF64I :
+                ret = obj_ia64_ins_imm64(v, bundle, slot);
+                break;
+
+            case R_IA64_PLTOFF64LSB :
+                *loc = v;
+                break;
+            }
+        }
+        break;
+
+    case R_IA64_FPTR64I :       /* @fptr(sym + add), mov imm64 */
+    case R_IA64_FPTR32LSB :     /* @fptr(sym + add), data4 LSB */
+    case R_IA64_FPTR64LSB :     /* @fptr(sym + add), data8 LSB */
+        assert(isym != NULL);
+        if (isym->root.secidx <= SHN_HIRESERVE)
+        {
+            assert(isym->opdent != NULL);
+            if (!isym->opdent->reloc_done)
+            {
+                isym->opdent->reloc_done = TRUE;
+                *(Elf64_Addr *)(ifile->opd->contents + isym->opdent->offset) = v;
+                *(Elf64_Addr *)(ifile->opd->contents + isym->opdent->offset + 8) = gp;
+            }
+            v = ifile->opd->header.sh_addr + isym->opdent->offset;
+        }
+        switch (r_info)
+        {
+        case R_IA64_FPTR64I :
+            ret = obj_ia64_ins_imm64(v, bundle, slot);
+            break;
+
+        case R_IA64_FPTR32LSB :
+            *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+            if (((Elf64_Sxword) v > 4294967295) ||
+                ((Elf64_Sxword) v < -4294967296))
+                ret = obj_reloc_overflow;
+            break;
+
+        case R_IA64_FPTR64LSB :     /* @fptr(sym + add), data8 LSB */
+            *loc = v;
+            break;
+        }
+        break;
+
+    case R_IA64_PCREL21B :      /* @pcrel(sym + add), ptb, call */
+    case R_IA64_PCREL21M :      /* @pcrel(sym + add), chk.s */
+    case R_IA64_PCREL21F :      /* @pcrel(sym + add), fchkf */
+        assert(isym != NULL);
+        if ((isym->root.secidx > SHN_HIRESERVE) || 
+           ((Elf64_Sxword) (v - dot) > 16777215) ||
+           ((Elf64_Sxword) (v - dot) < -16777216))
+        {
+            ia64_plt_t *pe;
+
+            for (pe = isym->pltent; pe != NULL && pe->addend != rel->r_addend; )
+                pe = pe->next;
+            assert(pe != NULL);
+            if (!pe->reloc_done)
+            {
+                pe->reloc_done = TRUE;
+                ret = obj_ia64_generate_plt(v, gp, ifile, isym, pe);
+            }
+            v = ifile->pltt->header.sh_addr + pe->text_offset;
+        }
+        v -= dot;
+        switch (r_info)
+        {
+        case R_IA64_PCREL21B :
+            ret = obj_ia64_ins_pcrel21b(v, bundle, slot);
+            break;
+
+        case R_IA64_PCREL21M :
+            ret = obj_ia64_ins_pcrel21m(v, bundle, slot);
+            break;
+
+        case R_IA64_PCREL21F :
+            ret = obj_ia64_ins_pcrel21f(v, bundle, slot);
+            break;
+        }
+        break;
+
+    case R_IA64_PCREL32LSB :    /* @pcrel(sym + add), data4 LSB */
+        *((Elf32_Addr *) loc) = (Elf32_Xword) (v - dot);
+        if (((Elf64_Sxword) (v - dot) > 4294967295) ||
+            ((Elf64_Sxword) (v - dot) < -4294967296))
+            ret = obj_reloc_overflow;
+        break;
+
+    case R_IA64_PCREL64LSB :    /* @pcrel(sym + add), data8 LSB */
+        *loc = (v - dot);
+        break;
+
+    case R_IA64_LTOFF_FPTR22 :  /* @ltoff(@fptr(s+a)), imm22 */
+    case R_IA64_LTOFF_FPTR64I : /* @ltoff(@fptr(s+a)), imm64 */
+    case R_IA64_LTOFF_FPTR32LSB : /* @ltoff(@fptr(s+a)), data4 */
+    case R_IA64_LTOFF_FPTR64LSB : /* @ltoff(@fptr(s+a)), data8 */
+        {
+            ia64_got_t *ge;
+
+            assert(isym != NULL);
+            if (isym->root.secidx <= SHN_HIRESERVE)
+            {
+                assert(isym->opdent != NULL);
+                if (!isym->opdent->reloc_done)
+                {
+                    isym->opdent->reloc_done = TRUE;
+                    *(Elf64_Addr *)(ifile->opd->contents + isym->opdent->offset) = v;
+                    *(Elf64_Addr *)(ifile->opd->contents + isym->opdent->offset + 8) = gp;
+                }
+                v = ifile->opd->header.sh_addr + isym->opdent->offset;
+            }
+            for (ge = isym->gotent; ge != NULL && ge->addend != rel->r_addend; )
+                ge = ge->next;
+            assert(ge != NULL);
+            if (!ge->reloc_done)
+            {
+                ge->reloc_done = TRUE;
+                *(Elf64_Addr *)(ifile->got->contents + ge->offset) =  v;
+            }
+            v = got + ge->offset - gp;
+            switch (r_info)
+            {
+            case R_IA64_LTOFF_FPTR22 :
+                ret = obj_ia64_ins_imm22(v, bundle, slot);
+                break;
+    
+            case R_IA64_LTOFF_FPTR64I :
+                ret = obj_ia64_ins_imm64(v, bundle, slot);
+                break;
+    
+            case R_IA64_LTOFF_FPTR32LSB :
+                *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+                if (((Elf64_Sxword) v > 4294967295) ||
+                    ((Elf64_Sxword) v < -4294967296))
+                    ret = obj_reloc_overflow;
+                break;
+    
+            case R_IA64_LTOFF_FPTR64LSB :
+                *loc = v;
+                break;
+            }
+        }
+        break;
+
+    case R_IA64_SEGREL32LSB :   /* @segrel(sym + add), data4 LSB */
+    case R_IA64_SEGREL64LSB :   /* @segrel(sym + add), data8 LSB */
+        if (targsec->header.sh_type & SHT_NOBITS)
+            v = ifile->bss - v;
+        else if (targsec->header.sh_flags & SHF_EXECINSTR)
+            v = ifile->text - v;
+        else
+            v = ifile->data - v;
+        if (r_info == R_IA64_SEGREL32LSB)
+        {
+            *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+            if (((Elf64_Sxword) v > 4294967295) ||
+                ((Elf64_Sxword) v < -4294967296))
+                ret = obj_reloc_overflow;
+        }
+        else
+            *loc = v;
+        break;
+
+    case R_IA64_SECREL32LSB :   /* @secrel(sym + add), data4 LSB */
+        v = targsec->header.sh_addr - v;
+        *((Elf32_Addr *) loc) = (Elf32_Xword) v;
+        if (((Elf64_Sxword) v > 4294967295) ||
+            ((Elf64_Sxword) v < -4294967296))
+            ret = obj_reloc_overflow;
+        break;
+
+    case R_IA64_SECREL64LSB :   /* @secrel(sym + add), data8 LSB */
+        v = targsec->header.sh_addr - v;
+        *loc = v;
+        break;
+
+    /*
+     * We don't handle the big-endian relocates
+     *
+     * R_IA64_DIR32MSB        symbol + addend, data4 MSB
+     * R_IA64_DIR64MSB        symbol + addend, data8 MSB
+     * R_IA64_GPREL32MSB      @gprel(sym + add), data4 MSB
+     * R_IA64_GPREL64MSB      @gprel(sym + add), data8 MSB
+     * R_IA64_PLTOFF64MSB     @pltoff(sym + add), data8 MSB
+     * R_IA64_FPTR32MSB       @fptr(sym + add), data4 MSB
+     * R_IA64_FPTR64MSB       @fptr(sym + add), data8 MSB
+     * R_IA64_PCREL32MSB      @pcrel(sym + add), data4 MSB
+     * R_IA64_PCREL64MSB      @pcrel(sym + add), data8 MSB
+     * R_IA64_SEGREL32MSB     @segrel(sym + add), data4 MSB
+     * R_IA64_SEGREL64MSB     @segrel(sym + add), data8 MSB
+     * R_IA64_SECREL32MSB     @secrel(sym + add), data4 MSB
+     * R_IA64_SECREL64MSB     @secrel(sym + add), data8 MSB
+     * R_IA64_REL32MSB        data 4 + REL
+     * R_IA64_REL64MSB        data 8 + REL
+     * R_IA64_LTV32MSB        symbol + addend, data4 MSB
+     * R_IA64_LTV64MSB        symbol + addend, data8 MSB
+     * R_IA64_IPLTMSB         dynamic reloc, imported PLT, MSB
+     */
+    default:
+    case R_IA64_REL32LSB :      /* data 4 + REL */
+    case R_IA64_REL64LSB :      /* data 8 + REL */
+    case R_IA64_LTV32LSB :      /* symbol + addend, data4 LSB */
+    case R_IA64_LTV64LSB :      /* symbol + addend, data8 LSB */
+    case R_IA64_IPLTLSB :       /* dynamic reloc, imported PLT, LSB */
+        ret = obj_reloc_unhandled;
+        break;
+    }
+    return ret;
+}
+
+int
+arch_init_module (struct obj_file *f, struct module *mod)
+{
+    ia64_file_t *ifile = (ia64_file_t *)f;
+    Elf64_Addr *opd = (Elf64_Addr *)(ifile->opd->contents);
+
+    *opd++ = mod->init;
+    *opd++ = ifile->gp;
+    mod->init = ifile->opd->header.sh_addr;
+
+    *opd++ = mod->cleanup;
+    *opd++ = ifile->gp;
+    mod->cleanup = ifile->opd->header.sh_addr + 16;
+
+    return 1;
+}
+
diff -Nur modutils-2.3.11/obj/obj_load.c modutils-2.3.12/obj/obj_load.c
--- modutils-2.3.11/obj/obj_load.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/obj/obj_load.c	Sun Jul  9 14:19:11 2000
@@ -21,11 +21,12 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_load.c 1.4 Thu, 20 Apr 2000 14:31:49 +1000 kaos $"
+#ident "$Id: obj_load.c 1.6 Sun, 09 Jul 2000 14:19:11 +1000 kaos $"
 
 #include <alloca.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "obj.h"
 #include "util.h"
@@ -33,7 +34,7 @@
 /*======================================================================*/
 
 struct obj_file *
-obj_load (FILE *fp, Elf32_Half e_type)
+obj_load (int fp, Elf32_Half e_type, const char *filename)
 {
   struct obj_file *f;
   ElfW(Shdr) *section_headers;
@@ -48,8 +49,8 @@
   f->symbol_hash = obj_elf_hash;
   f->load_order_search_start = &f->load_order;
 
-  fseek(fp, 0, SEEK_SET);
-  if (fread(&f->header, sizeof(f->header), 1, fp) != 1)
+  gzf_lseek(fp, 0, SEEK_SET);
+  if (gzf_read(fp, &f->header, sizeof(f->header)) != sizeof(f->header))
     {
       error("error reading ELF header: %m");
       return NULL;
@@ -103,8 +104,8 @@
   memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
 
   section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
-  fseek(fp, f->header.e_shoff, SEEK_SET);
-  if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum)
+  gzf_lseek(fp, f->header.e_shoff, SEEK_SET);
+  if (gzf_read(fp, section_headers, sizeof(ElfW(Shdr))*shnum) != sizeof(ElfW(Shdr))*shnum)
     {
       error("error reading ELF section headers: %m");
       return NULL;
@@ -137,8 +138,8 @@
 	  if (sec->header.sh_size > 0)
 	    {
 	      sec->contents = xmalloc(sec->header.sh_size);
-	      fseek(fp, sec->header.sh_offset, SEEK_SET);
-	      if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1)
+	      gzf_lseek(fp, sec->header.sh_offset, SEEK_SET);
+	      if (gzf_read(fp, sec->contents, sec->header.sh_size) != sec->header.sh_size)
 		{
 		  error("error reading ELF section data: %m");
 		  return NULL;
@@ -242,6 +243,8 @@
 	}
     }
 
+  f->filename = xstrdup(filename);
+
   return f;
 }
 
@@ -274,6 +277,9 @@
 
 	if (f->local_symtab)
 		free(f->local_symtab);
+
+	if (f->filename)
+		free((char *)(f->filename));
 
 	free(f);
 }
diff -Nur modutils-2.3.11/obj/obj_m68k.c modutils-2.3.12/obj/obj_m68k.c
--- modutils-2.3.11/obj/obj_m68k.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/obj/obj_m68k.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_m68k.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj_m68k.c 1.3 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <stddef.h>
 #include <module.h>
@@ -48,7 +48,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -126,5 +126,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_mips.c modutils-2.3.12/obj/obj_mips.c
--- modutils-2.3.11/obj/obj_mips.c	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/obj/obj_mips.c	Sun Jul  9 14:46:03 2000
@@ -18,7 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_mips.c 1.2 Thu, 13 Apr 2000 18:17:59 +1000 kaos $"
+#ident "$Id: obj_mips.c 1.4 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <stdlib.h>
@@ -70,7 +70,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
   switch (sec->header.sh_type)
     {
@@ -217,5 +217,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_ppc.c modutils-2.3.12/obj/obj_ppc.c
--- modutils-2.3.11/obj/obj_ppc.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/obj/obj_ppc.c	Sun Jul  9 14:46:03 2000
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_ppc.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj_ppc.c 1.3 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <stddef.h>
 #include <module.h>
@@ -90,7 +90,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -234,5 +234,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_reloc.c modutils-2.3.12/obj/obj_reloc.c
--- modutils-2.3.11/obj/obj_reloc.c	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/obj/obj_reloc.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_reloc.c 1.5 Thu, 13 Apr 2000 18:17:59 +1000 kaos $"
+#ident "$Id: obj_reloc.c 1.6 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <string.h>
 #include <assert.h>
@@ -258,9 +258,7 @@
 
   /* Finalize the addresses of the sections.  */
 
-  f->baseaddr = base;
-  for (i = 0; i < n; ++i)
-    f->sections[i]->header.sh_addr += base;
+  arch_finalize_section_address(f, base);
 
   /* And iterate over all of the relocations.  */
 
diff -Nur modutils-2.3.11/obj/obj_s390.c modutils-2.3.12/obj/obj_s390.c
--- modutils-2.3.11/obj/obj_s390.c	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/obj/obj_s390.c	Sun Jul  9 14:20:59 2000
@@ -0,0 +1,228 @@
+/* S/390 specific support for Elf loading and relocation.
+   Copyright 1996, 1997 Linux International.
+
+   Contributed by Richard Henderson <rth@tamu.edu>
+
+   This file is part of the Linux modutils.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2 of the License, or (at your
+   option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ident "$Id: obj_s390.c 1.1 Sun, 09 Jul 2000 14:20:59 +1000 kaos $"
+
+#include <string.h>
+#include <assert.h>
+
+#include <module.h>
+#include <obj.h>
+#include <util.h>
+
+
+/*======================================================================*/
+
+struct s390_got_entry
+{
+  int offset;
+  unsigned offset_done : 1;
+  unsigned reloc_done : 1;
+};
+
+struct s390_file
+{
+  struct obj_file root;
+  struct obj_section *got;
+};
+
+struct s390_symbol
+{
+  struct obj_symbol root;
+  struct s390_got_entry gotent;
+};
+
+
+/*======================================================================*/
+
+struct obj_file *
+arch_new_file (void)
+{
+  struct s390_file *f;
+  f = xmalloc(sizeof(*f));
+  f->got = NULL;
+  return &f->root;
+}
+
+struct obj_section *
+arch_new_section (void)
+{
+  return xmalloc(sizeof(struct obj_section));
+}
+
+struct obj_symbol *
+arch_new_symbol (void)
+{
+  struct s390_symbol *sym;
+  sym = xmalloc(sizeof(*sym));
+  memset(&sym->gotent, 0, sizeof(sym->gotent));
+  return &sym->root;
+}
+
+int
+arch_load_proc_section(struct obj_section *sec, FILE *fp)
+{
+    /* Assume it's just a debugging section that we can safely
+       ignore ...  */
+    sec->contents = NULL;
+
+    return 0;
+}
+
+enum obj_reloc
+arch_apply_relocation (struct obj_file *f,
+		       struct obj_section *targsec,
+		       struct obj_section *symsec,
+		       struct obj_symbol *sym,
+		       Elf32_Rela *rel,
+		       Elf32_Addr v)
+{
+  struct s390_file *ifile = (struct s390_file *)f;
+  struct s390_symbol *isym  = (struct s390_symbol *)sym;
+
+  Elf32_Addr *loc = (Elf32_Addr *)(targsec->contents + rel->r_offset);
+  Elf32_Addr dot = targsec->header.sh_addr + rel->r_offset;
+  Elf32_Addr got = ifile->got ? ifile->got->header.sh_addr : 0;
+
+  enum obj_reloc ret = obj_reloc_ok;
+
+  switch (ELF32_R_TYPE(rel->r_info))
+    {
+    case R_390_NONE:
+      break;
+
+    case R_390_32:
+      *loc += v;
+      break;
+
+    case R_390_PLT32:
+    case R_390_PC32:
+      *loc += v - dot;
+      break;
+
+    case R_390_GLOB_DAT:
+    case R_390_JMP_SLOT:
+      *loc = v;
+      break;
+
+    case R_390_RELATIVE:
+      *loc += f->baseaddr;
+      break;
+
+    case R_390_GOTPC:
+      assert(got != 0);
+      *loc += got - dot;
+      break;
+
+    case R_390_GOT32:
+      assert(isym != NULL);
+      if (!isym->gotent.reloc_done)
+	{
+	  isym->gotent.reloc_done = 1;
+	  *(Elf32_Addr *)(ifile->got->contents + isym->gotent.offset) = v;
+	}
+      *loc += isym->gotent.offset;
+      break;
+
+    case R_390_GOTOFF:
+      assert(got != 0);
+      *loc += v - got;
+      break;
+
+    default:
+      ret = obj_reloc_unhandled;
+      break;
+    }
+
+  return ret;
+}
+
+int
+arch_create_got (struct obj_file *f)
+{
+  struct s390_file *ifile = (struct s390_file *)f;
+  int i, n, offset = 0, gotneeded = 0;
+
+  n = ifile->root.header.e_shnum;
+  for (i = 0; i < n; ++i)
+    {
+      struct obj_section *relsec, *symsec, *strsec;
+      Elf32_Rel *rel, *relend;
+      Elf32_Sym *symtab;
+      const char *strtab;
+
+      relsec = ifile->root.sections[i];
+      if (relsec->header.sh_type != SHT_REL)
+	continue;
+
+      symsec = ifile->root.sections[relsec->header.sh_link];
+      strsec = ifile->root.sections[symsec->header.sh_link];
+
+      rel = (Elf32_Rel *)relsec->contents;
+      relend = rel + (relsec->header.sh_size / sizeof(Elf32_Rel));
+      symtab = (Elf32_Sym *)symsec->contents;
+      strtab = (const char *)strsec->contents;
+
+      for (; rel < relend; ++rel)
+	{
+	  Elf32_Sym *extsym;
+	  struct s390_symbol *intsym;
+	  const char *name;
+
+	  switch (ELF32_R_TYPE(rel->r_info))
+	    {
+	    case R_390_GOTPC:
+	    case R_390_GOTOFF:
+	      gotneeded = 1;
+	    default:
+	      continue;
+
+	    case R_390_GOT32:
+	      break;
+	    }
+
+	  extsym = &symtab[ELF32_R_SYM(rel->r_info)];
+	  if (extsym->st_name)
+	    name = strtab + extsym->st_name;
+	  else
+	    name = f->sections[extsym->st_shndx]->name;
+	  intsym = (struct s390_symbol *)obj_find_symbol(&ifile->root, name);
+
+	  if (!intsym->gotent.offset_done)
+	    {
+	      intsym->gotent.offset_done = 1;
+	      intsym->gotent.offset = offset;
+	      offset += 4;
+	    }
+	}
+    }
+
+  if (offset > 0 || gotneeded)
+    ifile->got = obj_create_alloced_section(&ifile->root, ".got", 4, offset);
+
+  return 1;
+}
+
+int
+arch_init_module (struct obj_file *f, struct module *m)
+{
+  return 1;
+}
diff -Nur modutils-2.3.11/obj/obj_sparc.c modutils-2.3.12/obj/obj_sparc.c
--- modutils-2.3.11/obj/obj_sparc.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/obj/obj_sparc.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_sparc.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj_sparc.c 1.3 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <stddef.h>
 #include <module.h>
@@ -48,7 +48,7 @@
 }
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -205,5 +205,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf32_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/obj/obj_sparc64.c modutils-2.3.12/obj/obj_sparc64.c
--- modutils-2.3.11/obj/obj_sparc64.c	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/obj/obj_sparc64.c	Sun Jul  9 14:46:03 2000
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_sparc64.c 1.2 Thu, 13 Apr 2000 18:17:59 +1000 kaos $"
+#ident "$Id: obj_sparc64.c 1.4 Sun, 09 Jul 2000 14:46:03 +1000 kaos $"
 
 #include <stddef.h>
 #include <module.h>
@@ -107,7 +107,7 @@
 #endif
 
 int
-arch_load_proc_section(struct obj_section *sec, FILE *fp)
+arch_load_proc_section(struct obj_section *sec, int fp)
 {
     /* Assume it's just a debugging section that we can safely
        ignore ...  */
@@ -296,5 +296,16 @@
 int
 arch_init_module (struct obj_file *f, struct module *mod)
 {
+  return 1;
+}
+
+int
+arch_finalize_section_address(struct obj_file *f, Elf64_Addr base)
+{
+  int  i, n = f->header.e_shnum;
+
+  f->baseaddr = base;
+  for (i = 0; i < n; ++i)
+    f->sections[i]->header.sh_addr += base;
   return 1;
 }
diff -Nur modutils-2.3.11/util/Makefile.in modutils-2.3.12/util/Makefile.in
--- modutils-2.3.11/util/Makefile.in	Sun Dec 26 20:47:58 1999
+++ modutils-2.3.12/util/Makefile.in	Sun Jul  9 15:44:35 2000
@@ -1,22 +1,8 @@
-# $Id: Makefile.in 1.9 Sun, 26 Dec 1999 20:47:58 +1100 keith $
+# $Id: Makefile.in 1.12 Sun, 09 Jul 2000 15:44:35 +1000 kaos $
 
-srcdir=@srcdir@
-VPATH=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-mandir=@mandir@
-
-ARCH		= @ARCH@
-CC		= @CC@
-CFLAGS		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-HOSTCC		= @HOSTCC@
-HOSTCFLAGS	= @HOSTCFLAGS@
-AR		= @AR@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL_LOCAL@
-STRIP		= @STRIP@
+VPATH	= @srcdir@
+srcdir	= @srcdir@
+include	../Makefile.common
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)
@@ -28,9 +14,11 @@
 
 all: .depend libutil.a
 
-OBJS = sys_cm.o sys_dm.o sys_gks.o sys_nim.o sys_oim.o sys_qm.o \
-	xmalloc.o xrealloc.o xstrdup.o logger.o \
-	modstat.o meta_expand.o config.o snap_shot.o arch64.o
+OBJS = xmalloc.o xrealloc.o xstrdup.o logger.o modstat.o \
+	meta_expand.o config.o snap_shot.o arch64.o gzfiles.o sys_nim.o
+ifneq ($(USE_SYSCALL),n)
+OBJS += sys_cm.o sys_dm.o sys_gks.o sys_oim.o sys_qm.o
+endif
 
 meta_expand.o: meta_expand.c
 	$(CC) $(CFLAGS) $(DEFS) @HAVE_WORDEXP@ @HAVE_GLOB@ -c $<
diff -Nur modutils-2.3.11/util/alias.h modutils-2.3.12/util/alias.h
--- modutils-2.3.11/util/alias.h	Thu Apr 13 18:17:59 2000
+++ modutils-2.3.12/util/alias.h	Sun Jul  9 14:22:32 2000
@@ -33,6 +33,7 @@
 	"usb",
 	"ide",
 	"ieee1394",
+	"kernel",
 	NULL			/* marks the end of the list! */
 };
 
@@ -81,7 +82,7 @@
 	"char-major-9 st",
 	"char-major-10 off",		/* was: mouse, was: misc */
 	"char-major-10-0 busmouse",	/* /dev/logibm Logitech bus mouse */
-	"char-major-10-1 psaux",	/* /dev/psaux PS/2-style mouse port */
+	"char-major-10-1 off",		/* /dev/psaux PS/2-style mouse port */
 	"char-major-10-2 msbusmouse",	/* /dev/inportbm Microsoft Inport bus mouse */
 	"char-major-10-3 atixlmouse",	/* /dev/atibm ATI XL bus mouse */
 					/* /dev/jbm J-mouse */
@@ -98,6 +99,8 @@
 	"char-major-10-139 openprom",	/* /dev/openprom Linux/Sparc interface */
 	"char-major-10-144 nvram", /* from Tigran Aivazian <tigran@sco.COM> */
 
+	"char-major-10-175 agpgart",    /* /dev/agpgart GART AGP mapping access */
+
 	"char-major-14 soundcore",
 	"char-major-19 cyclades",
 	"char-major-20 cyclades",
@@ -124,6 +127,9 @@
 	"iso9660 isofs",
 	"md-personality-1 linear",
 	"md-personality-2 raid0",
+        "md-personality-3 raid1",
+        "md-personality-4 raid5",
+
 	"net-pf-1 unix",	/* PF_UNIX	1  Unix domain sockets */
 	"net-pf-2 ipv4",	/* PF_INET	2  Internet IP Protocol */
 	"net-pf-3 off",		/* PF_AX25	3  Amateur Radio AX.25 */
@@ -153,7 +159,11 @@
 	"ppp-compress-24 ppp_deflate",
 	"ppp-compress-26 ppp_deflate",
 
+#ifndef __sparc__
 	"parport_lowlevel parport_pc",
+#else
+        "parport_lowlevel parport_ax",
+#endif
 
 	NULL			/* marks the end of the list! */
 };
diff -Nur modutils-2.3.11/util/config.c modutils-2.3.12/util/config.c
--- modutils-2.3.11/util/config.c	Thu Apr 20 14:31:49 2000
+++ modutils-2.3.12/util/config.c	Sun Jul  9 14:19:11 2000
@@ -343,7 +343,7 @@
  *	Return -1 if any error.
  *	Error messages generated.
  */
-static int do_read(int all, char *force_ver, char *base_dir, char *conf_file)
+static int do_read(int all, char *force_ver, char *base_dir, char *conf_file, int depth)
 {
 	#define MAX_LEVEL 20
 	FILE *fin;
@@ -504,116 +504,125 @@
 
 	depfile_tmp[0] = '\0';
 
-	maxpath = 100;
-	modpath = (struct PATH_TYPE *)xmalloc(maxpath * sizeof(struct PATH_TYPE));
-	nmodpath = 0;
-
-	maxexecs = 10;
-	execs = (struct EXEC_TYPE *)xmalloc(maxexecs * sizeof(struct EXEC_TYPE));
-	nexecs = 0;
+	/* Only read the default entries on the first file */
+	if (depth == 0) {
+		maxpath = 100;
+		modpath = (struct PATH_TYPE *)xmalloc(maxpath * sizeof(struct PATH_TYPE));
+		nmodpath = 0;
 
-	/*
-	 * Build predef options
-	 */
-	if (all && optlist[0])
-		n_opt_list = build_list(optlist, &opt_list, version);
-
-	/*
-	 * Build predef above
-	 */
-	if (all && above[0])
-		n_abovelist = build_list(above, &abovelist, version);
+		maxexecs = 10;
+		execs = (struct EXEC_TYPE *)xmalloc(maxexecs * sizeof(struct EXEC_TYPE));
+		nexecs = 0;
 
-	/*
-	 * Build predef below
-	 */
-	if (all && below[0])
-		n_belowlist = build_list(below, &belowlist, version);
+		/*
+		 * Build predef options
+		 */
+		if (all && optlist[0])
+			n_opt_list = build_list(optlist, &opt_list, version);
 
-	/*
-	 * Build predef aliases
-	 */
-	if (all && aliaslist[0])
-		n_aliases = build_list(aliaslist, &aliases, version);
+		/*
+		 * Build predef above
+		 */
+		if (all && above[0])
+			n_abovelist = build_list(above, &abovelist, version);
 
-	/*FIXME?: order and priority is now: predefs, MODPATH, modules.conf */
-	if ((envpath = getenv("MODPATH")) != NULL) {
-		size_t len;
-		char *p;
-		char *path;
-
-		/* Make a copy so's we can mung it with strtok.  */
-		len = strlen(envpath) + 1;
-		p = alloca(len);
-		memcpy(p, envpath, len);
-		path = alloca(PATH_MAX);
-
-		for (p = strtok(p, ":"); p != NULL; p = strtok(NULL, ":")) {
-			len = snprintf(path, PATH_MAX, p, version);
-			modpath[nmodpath].path = xstrdup(path);
-			if ((type = strrchr(path, '/')) != NULL)
-				type += 1;
-			else
-				type = "misc";
-			modpath[nmodpath].type = xstrdup(type);
-			if (++nmodpath >= maxpath) {
-				maxpath += 100;
-				modpath = (struct PATH_TYPE *)xrealloc(modpath,
-					maxpath * sizeof(struct PATH_TYPE));
-			}
+		/*
+		 * Build predef below
+		 */
+		if (all && below[0])
+			n_belowlist = build_list(below, &belowlist, version);
 
-		}
-	} else {
 		/*
-		 * Build the default "path[type]" configuration
+		 * Build predef aliases
 		 */
-		int n;
-		char *k;
+		if (all && aliaslist[0])
+			n_aliases = build_list(aliaslist, &aliases, version);
 
-		/* `uname -r` */
-		sprintf(tmpline, "/lib/modules/%s", version);
-		tbpath[0] = xstrdup(tmpline);
-
-		/* `kernelversion` */
-		for (n = 0, k = version; *k; ++k) {
-			if (*k == '.' && ++n == 2)
-				break;
-		}
-		sprintf(tmpline, "/lib/modules/%.*s",
-			(/* typecast for Alpha */ int)(k - version), version);
-		tbpath[1] = xstrdup(tmpline);
-
-		/* The first entry in the path list */
-		modpath[0].type = xstrdup("boot");
-		sprintf(tmpline, "%s/lib/modules/boot", (base_dir?base_dir:""));
-		modpath[0].path = xstrdup(tmpline);
-		nmodpath = 1;
-
-		/* The rest of the entries in the path list */
-		for (pathp = tbpath; *pathp; ++pathp) {
-			char **type;
-
-			for (type = tbtype; *type; ++type) {
-				char path[100];
-
-				sprintf(path, "%s%s/%s",
-					(base_dir ? base_dir : ""),
-					*pathp, *type);
-				if (meta_expand(path, &g, NULL, version))
-					return -1;
-
-				for (glb = g.pathv; glb && *glb; ++glb) {
-					modpath[nmodpath].type = xstrdup(*type);
-					modpath[nmodpath].path = *glb;
-					if (++nmodpath >= maxpath) {
-						maxpath += 100;
-						modpath = (struct PATH_TYPE *)xrealloc(modpath,
-							maxpath * sizeof(struct PATH_TYPE));
+		/* Order and priority is now: (MODPATH + modules.conf) || (predefs + modules.conf) */
+		if ((envpath = getenv("MODPATH")) != NULL) {
+			size_t len;
+			char *p;
+			char *path;
+
+			/* Make a copy so's we can mung it with strtok.  */
+			len = strlen(envpath) + 1;
+			p = alloca(len);
+			memcpy(p, envpath, len);
+			path = alloca(PATH_MAX);
+
+			for (p = strtok(p, ":"); p != NULL; p = strtok(NULL, ":")) {
+				len = snprintf(path, PATH_MAX, p, version);
+				modpath[nmodpath].path = xstrdup(path);
+				if ((type = strrchr(path, '/')) != NULL)
+					type += 1;
+				else
+					type = "misc";
+				modpath[nmodpath].type = xstrdup(type);
+				if (++nmodpath >= maxpath) {
+					maxpath += 100;
+					modpath = (struct PATH_TYPE *)xrealloc(modpath,
+						maxpath * sizeof(struct PATH_TYPE));
+				}
+
+			}
+		} else {
+			/*
+			 * Build the default "path[type]" configuration
+			 */
+			int n;
+			char *k;
+
+			/* `uname -r` */
+			sprintf(tmpline, "/lib/modules/%s", version);
+			tbpath[0] = xstrdup(tmpline);
+
+			/* `kernelversion` */
+			for (n = 0, k = version; *k; ++k) {
+				if (*k == '.' && ++n == 2)
+					break;
+			}
+			sprintf(tmpline, "/lib/modules/%.*s",
+				(/* typecast for Alpha */ int)(k - version), version);
+			tbpath[1] = xstrdup(tmpline);
+
+			/* The first entry in the path list */
+			modpath[0].type = xstrdup("boot");
+			sprintf(tmpline, "%s/lib/modules/boot", (base_dir?base_dir:""));
+			modpath[0].path = xstrdup(tmpline);
+			nmodpath = 1;
+
+			/* The rest of the entries in the path list */
+			for (pathp = tbpath; *pathp; ++pathp) {
+				char **type;
+
+				for (type = tbtype; *type; ++type) {
+					char path[100];
+
+					sprintf(path, "%s%s/%s",
+						(base_dir ? base_dir : ""),
+						*pathp, *type);
+					if (meta_expand(path, &g, NULL, version))
+						return -1;
+
+					for (glb = g.pathv; glb && *glb; ++glb) {
+						modpath[nmodpath].type = xstrdup(*type);
+						modpath[nmodpath].path = *glb;
+						if (++nmodpath >= maxpath) {
+							maxpath += 100;
+							modpath = (struct PATH_TYPE *)xrealloc(modpath,
+								maxpath * sizeof(struct PATH_TYPE));
+						}
 					}
 				}
 			}
 		}
-	}
+
+		/* DEPPATH is intended for testing only */
+		if ((envpath = getenv("DEPPATH")) != NULL) {
+			strncpy(depfile_tmp, envpath, sizeof(depfile_tmp));
+		}
+
+	}	/* End of depth == 0 */
 
 	if (conf_file ||
 	    ((conf_file = getenv("MODULECONFIG")) != NULL && *conf_file)) {
@@ -919,7 +928,7 @@
 		if (!assgn && strcmp(parm, "include") == 0) {
 			meta_expand(arg, &g, NULL, version);
 
-			if (!do_read(all, version, base_dir, g.pathc ? g.pathv[0] : arg))
+			if (!do_read(all, version, base_dir, g.pathc ? g.pathv[0] : arg, depth+1))
 				one_err = 0;
 			else
 				error("include %s failed\n", arg);
@@ -1226,7 +1235,7 @@
 		return -1;
 	}
 
-	r = do_read(all, force_ver, base_dir, conf_file);
+	r = do_read(all, force_ver, base_dir, conf_file, 0);
 
 	if (quick && !r && !need_update (force_ver, base_dir))
 		exit (0);
@@ -1243,7 +1252,7 @@
 static int one_only;
 static int dirs_only;
 char **list;
-char *looking_for;
+const char *looking_for;
 
 /*
  *	Add a file name if it exist
@@ -1347,7 +1356,7 @@
  * Return a pointer to the list of modules found (or NULL if error).
  * Update the counter (sent as parameter).
  */
-GLOB_LIST *config_lstmod(char *match, const char *type, int first_only)
+GLOB_LIST *config_lstmod(const char *match, const char *type, int first_only)
 {
 	/*
 	 * Note:
@@ -1432,7 +1441,7 @@
 }
 
 /* Given a bare module name, poke through the module path to find the file.  */
-char *search_module_path(char *base)
+char *search_module_path(const char *base)
 {
 	GLOB_LIST *g;
 
@@ -1445,6 +1454,12 @@
 
 		sprintf(base_o, "%s.o", base);
 		g = config_lstmod(base_o, NULL, 1);
+#ifdef CONFIG_USE_ZLIB
+		if (g == NULL || g->pathc == 0) {
+			sprintf(base_o, "%s.o.gz", base);
+			g = config_lstmod(base_o, NULL, 1);
+		}
+#endif
 	}
 	if (g == NULL || g->pathc == 0)
 		return NULL;
diff -Nur modutils-2.3.11/util/gzfiles.c modutils-2.3.12/util/gzfiles.c
--- modutils-2.3.11/util/gzfiles.c	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.12/util/gzfiles.c	Sun Jul  9 14:19:11 2000
@@ -0,0 +1,74 @@
+/*
+ * This simple library intends to make it transparent to read gzipped and/or
+ * standard files. This is simple enough to fit modutils' needs, but may be
+ * easily adapted to anyone's needs. It's completely free, do what you want
+ * with it .  - Willy Tarreau <willy@meta-x.org> - 2000/05/05 -
+ */
+
+#ifdef CONFIG_USE_ZLIB
+
+#include <stdio.h>
+#include <zlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+/* redefinition of gz_stream which isn't exported by zlib */
+typedef struct gz_stream {
+    z_stream stream;
+    int      z_err;   /* error code for last stream operation */
+    int      z_eof;   /* set if end of input file */
+    FILE     *file;   /* .gz file */
+    Byte     *inbuf;  /* input buffer */
+    Byte     *outbuf; /* output buffer */
+    uLong    crc;     /* crc32 of uncompressed data */
+    char     *msg;    /* error message */
+    char     *path;   /* path name for debugging only */
+    int      transparent; /* 1 if input file is not a .gz file */
+    char     mode;    /* 'w' or 'r' */
+    long     startpos; /* start of compressed data in file (header skipped) */
+} gz_stream;
+
+/* maximum number of simultaneous open files, also greater file descriptor number */
+#define MAXFD	64
+
+/* this static list is assumed to be filled with NULLs at runtime */
+static gzFile gzf_fds[MAXFD];
+
+/* returns the filedesc of the opened file. */
+int gzf_open(const char *name, int mode) {
+    int fd;
+    gzFile g;
+
+    if ((g=gzopen(name, "rb")) != NULL) {
+	fd=fileno(((gz_stream*)g)->file);
+	gzf_fds[fd]=g;
+    }
+    else if ((fd=open(name, mode)) != -1) {
+	gzf_fds[fd]=NULL; /* NULL means not GZ mode */
+    }
+    return fd;
+}
+
+off_t gzf_lseek(int fd, off_t offset, int whence) {
+    if (fd<0 || fd>=MAXFD || gzf_fds[fd]==NULL)
+	return lseek(fd, offset, whence);
+    else
+	return gzseek(gzf_fds[fd], offset, whence);
+}
+
+int gzf_read(int fd, void *buf, size_t count) {
+    if (fd<0 || fd>=MAXFD || gzf_fds[fd]==NULL)
+	return read(fd, buf, count);
+    else
+	return gzread(gzf_fds[fd], buf, count);
+}
+
+void gzf_close(int fd) {
+    if (fd<0 || fd>=MAXFD || gzf_fds[fd]==NULL)
+	close(fd);
+    else
+	gzclose(gzf_fds[fd]);
+}
+#endif
+
diff -Nur modutils-2.3.11/util/sys_nim.c modutils-2.3.12/util/sys_nim.c
--- modutils-2.3.11/util/sys_nim.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.12/util/sys_nim.c	Sun Jul  9 15:44:35 2000
@@ -18,7 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: sys_nim.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: sys_nim.c 1.3 Sun, 09 Jul 2000 15:44:35 +1000 kaos $"
 
 #include <stdlib.h>
 #include <errno.h>
@@ -34,6 +34,20 @@
 
 /*======================================================================*/
 
+#ifndef CONFIG_USE_SYSCALL
+
+extern int init_module(const char *name, const struct module *info);
+
+int 
+sys_init_module(const char *name, const struct module *info)
+{
+  return init_module(name, info);
+}
+
+#else
+
 #define __NR_sys_init_module  __NR_init_module
 _syscall2(int, sys_init_module, const char *, name,
 	  const struct module *, info)
+
+#endif