Skip to content

Commit

Permalink
Bug 769772 - Print compiler version being used and drop checks for ll…
Browse files Browse the repository at this point in the history
…vm-gcc and old versions of clang. r=khuey.
  • Loading branch information
cixtor committed Jul 3, 2012
1 parent 7cff997 commit 010708a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 41 deletions.
1 change: 0 additions & 1 deletion config/autoconf.mk.in
Expand Up @@ -131,7 +131,6 @@ MOZ_WAVE = @MOZ_WAVE@
MOZ_MEDIA = @MOZ_MEDIA@
MOZ_VORBIS = @MOZ_VORBIS@
MOZ_TREMOR = @MOZ_TREMOR@
MOZ_NO_THEORA_ASM = @MOZ_NO_THEORA_ASM@
MOZ_OPUS = @MOZ_OPUS@
MOZ_WEBM = @MOZ_WEBM@
MOZ_MEDIA_PLUGINS = @MOZ_MEDIA_PLUGINS@
Expand Down
40 changes: 4 additions & 36 deletions configure.in
Expand Up @@ -1026,42 +1026,10 @@ fi

fi # COMPILE_ENVIRONMENT

dnl clang prior to 2.9 (including Xcode 4) does not support all the
dnl constructs required by the libtheora inline asm. This is used to
dnl detect and disable it
AC_MSG_CHECKING([whether the C compiler is clang older than version 2.9])
AC_LANG_SAVE
AC_LANG_C
AC_TRY_COMPILE([
#if defined(__clang__)
# if __clang_major__<2 || (__clang_major__==2 && __clang_minor__<9)
# error "clang older than 2.9 detected"
# endif
#endif
],
[],
result="no",
result="yes")
AC_LANG_RESTORE
AC_MSG_RESULT([$result])
if test "$result" = "yes"; then
MOZ_NO_THEORA_ASM=1
fi
dnl XCode 4.2 also shipped an llvm-gcc which couldn't compile
dnl the libtheora inline asm.
AC_MSG_CHECKING([bad gcc versions])
if `$CC --version | grep -q "Apple Inc. build 5658"`; then
AC_MSG_RESULT([Apple build 5658])
MOZ_NO_THEORA_ASM=1
else
AC_MSG_RESULT([we're ok])
fi

AC_SUBST(MOZ_NO_THEORA_ASM)

if test "x$MOZ_NO_THEORA_ASM" = x1; then
AC_MSG_WARN([Disabling libtheora inline assembly])
fi
AC_MSG_CHECKING([compiler version])
# Just print it so it shows up in the logs.
cc_version=$($CC --version)
AC_MSG_RESULT([$cc_version])

if test -n "$MAKE"; then
if test `echo $MAKE | grep -c make.py` != 1; then
Expand Down
4 changes: 0 additions & 4 deletions media/libtheora/lib/Makefile.in
Expand Up @@ -21,15 +21,13 @@ DEFINES += -DTHEORA_DISABLE_ENCODE
ifeq ($(findstring 86,$(OS_TEST)), 86)
ifneq ($(OS_ARCH),SunOS)
ifneq ($(OS_ARCH)$(OS_TEST),WINNTx86_64)
ifndef MOZ_NO_THEORA_ASM
DEFINES += -DOC_X86_ASM
ifeq (64,$(findstring 64,$(OS_TEST)))
DEFINES += -DOC_X86_64_ASM
endif
endif
endif
endif
endif

VPATH := $(srcdir)

Expand Down Expand Up @@ -63,7 +61,6 @@ CSRCS += \
$(NULL)
endif
else
ifndef MOZ_NO_THEORA_ASM
VPATH += $(srcdir)/x86

CSRCS += \
Expand All @@ -76,7 +73,6 @@ CSRCS += \
$(NULL)
endif
endif
endif

ifdef GNU_AS
ifeq ($(findstring arm,$(OS_TEST)), arm)
Expand Down

0 comments on commit 010708a

Please sign in to comment.