Integrate with Sarathy.

p4raw-id: //depot/cfgperl@6053

2 files changed, 15 insertions, 5 deletions

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 9d9852d049..8be23ac65f 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -77,9 +77,19 @@ esac
 case "$cc" in
 *"cc -n32"*)
 
-	libscheck='case "`/usr/bin/file $xxx`" in
-*N32*) ;;
-*) xxx=/no/n32$xxx ;;
+	# If a library is requested to link against, make sure the
+	# objects in the library are of the same ABI we are compiling
+	# against. Albert Chin-A-Young <china@thewrittenword.com>
+	libscheck='case "$xxx" in
+*.a) /bin/ar p $xxx `/bin/ar t $xxx | /usr/bsd/head -1` >$$.o;
+  case "`/usr/bin/file $$.o`" in
+  *N32*) rm -f $$.o ;;
+  *) rm -f $$.o; xxx=/no/n32$xxx ;;
+  esac ;;
+*) case "`/usr/bin/file $xxx`" in
+  *N32*) ;;
+  *) xxx=/no/n32$xxx ;;
+  esac ;;
 esac'
 
 	# NOTE: -L/usr/lib32 -L/lib32 are automatically selected by the linker
diff --git a/pod/perlop.pod b/pod/perlop.pod
index c1ac387067..b4caed9155 100644
--- a/pod/perlop.pod
+++ b/pod/perlop.pod
@@ -788,8 +788,8 @@ If "'" is the delimiter, no interpolation is performed on the PATTERN.
 
 PATTERN may contain variables, which will be interpolated (and the
 pattern recompiled) every time the pattern search is evaluated, except
-for when the delimiter is a single quote.  (Note that C<$)> and C<$|>
-might not be interpolated because they look like end-of-string tests.)
+for when the delimiter is a single quote.  (Note that C<$(>, C<$)>, and
+C<$|> are not interpolated because they look like end-of-string tests.)
 If you want such a pattern to be compiled only once, add a C</o> after
 the trailing delimiter.  This avoids expensive run-time recompilations,
 and is useful when the value you are interpolating won't change over