--- src/tools/port/shell_unix/shlibinfo.sh	2008-06-18 11:40:13.000000000 -0400
+++ src/tools/port/shell_unix/shlibinfo.sh	2009-07-27 14:52:23.000000000 -0400
@@ -440,8 +440,8 @@
 # platforms for various reasons: ugly compiler warnings (AIX), cannot specify
 # SHLIB_PATH on hp/ux ...
 
-eval `egrep "VERS[ 	]*=|SLSFX[ 	]*=|MWSLSFX[	 ]*=" $DEFHDR | \
-  sed -e 's/ //g' -e 's/
/ ; /'`
+eval `egrep "VERS[ 	]*=|SLSFX[ 	]*=|MWSLSFX[	 ]*=|XERCVERS[    ]*=" \
+  $DEFHDR | sed -e 's/ //g' -e 's/
/ ; /'`
 [ "$SLSFX" ] || SLSFX=so ; export SLSFX
 [ "$MWSLSFX" ] || MWSLSFX=so ; export MWSLSFX
 
@@ -610,7 +610,7 @@
 	shlink_cmd="ld -shared "
 	shlinkHB_cmd="ld -melf_i386 -shared "
 	shlink_opts=" -lm -lc -lpthread -ldl -lcrypt "
-	shlinkHB_opts=" -lm -lc -lpthread -ldl -lcrypt -lgcc_s"
+	shlinkHB_opts=" -lm -lc -lpthread -ldl -lcrypt "
 	krblink_cmd="ld -shared"
 	krblinkHB_cmd="ld -melf_i386 -shared"
 	krblink_opts=""