Index: Makefile
===================================================================
--- Makefile	(revision 34468)
+++ Makefile	(working copy)
@@ -965,7 +965,7 @@
 	-rm -rf DOCS/tech/doxygen DOCS/HTML
 	-rm -f DOCS/xml/html-chunk.xsl DOCS/xml/html-single.xsl
 	-rm -f $(call ADD_ALL_DIRS,/*.d)
-	-rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags
+	-rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags mapfile
 	-rm -f $(VIDIX_PCI_FILES)
 	-rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)
 
Index: configure
===================================================================
--- configure	(revision 34468)
+++ configure	(working copy)
@@ -7605,6 +7605,20 @@
   ld_dl_dynamic='-rdynamic'
 fi
 
+# The hardware capabilities inserted into the ELF header by the Solaris linker
+# may keep the run-time loader from allowing the binary to run on some x86
+# platforms.
+if sunos ; then
+  echo "hwcap_1 = OVERRIDE;" > mapfile
+  if cflag_check "-Wl,-M,mapfile" ; then
+    extra_ldflags="$extra_ldflags -Wl,-M,mapfile"
+  elif cflag_check "-Mmapfile" ; then
+    extra_ldflags="$extra_ldflags -Mmapfile"
+  else
+    rm -f mapfile
+  fi
+fi
+
 extra_ldflags="$extra_ldflags $ld_pthread $ld_dl $ld_dl_dynamic"
 bsdos && extra_ldflags="$extra_ldflags -ldvd"
 (netbsd || openbsd) && x86_32 && extra_ldflags="$extra_ldflags -li386"
