aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean McGovern <gseanmcg@gmail.com>2011-09-17 00:36:37 -0400
committerJanne Grunau <janne-libav@jannau.net>2011-09-24 14:47:49 +0200
commit87a74f478f1c9ff21c2c0101a498506ce6b1d631 (patch)
tree6f9a292d86f7a89f996e42a45c6dcad36b8b719c
parent8671488799e7f03d7bc985099b73e18ea519ab39 (diff)
downloadffmpeg-87a74f478f1c9ff21c2c0101a498506ce6b1d631.tar.gz
configure: disable hardware capabilities ELF section with suncc on Solaris x86
When using suncc to build, the Solaris linker will mark an executable with each instruction set encountered by the Solaris assembler. As our libraries contain their own guards for processor-specific code, instead suppress generation of the HWCAPS ELF section on Solaris x86 only. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index e01d9fda86..8440cab5d0 100755
--- a/configure
+++ b/configure
@@ -2370,6 +2370,12 @@ case $target_os in
enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
network_extralibs="-lsocket -lnsl"
add_cppflags -D__EXTENSIONS__
+ # When using suncc to build, the Solaris linker will mark
+ # an executable with each instruction set encountered by
+ # the Solaris assembler. As our libraries contain their own
+ # guards for processor-specific code, instead suppress
+ # generation of the HWCAPS ELF section on Solaris x86 only.
+ enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile
nm_opts='-P -g'
;;
netbsd)