From 6c0f63cd6853c0d184a5abbf2e19c1626d2854ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 7 Aug 2015 20:55:03 +0300 Subject: [PATCH] Remove unused support for .asm files --- configure.ac | 18 ------------------ modules/common.am | 5 +---- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index a3dc3e1d64..6b98617c89 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,6 @@ AM_PROG_AS AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files]) AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :) -AC_PATH_PROG(YASM, yasm) AC_ARG_VAR([BUILDCC], [Build system C11 or C99 compiler command]) AC_PATH_PROGS(BUILDCC, [c11-gcc c11 c99-gcc c99], [false]) AS_IF([test "$BUILDCC" = "false"], [ @@ -102,17 +101,6 @@ HAVE_WIN64="0" HAVE_IOS="0" HAVE_OSX="0" -YASMFLAGS="" -case "${host}" in - i?86*) - YASMFLAGS="-f elf32" - ;; - x86_64*) - YASMFLAGS="-f elf64" - ;; -esac - - case "${host_os}" in "") SYS=unknown @@ -148,7 +136,6 @@ case "${host_os}" in case "${host}" in i?86*) ARCH_flag="-arch i386" - YASMFLAGS="-f macho32" ;; ppc64*) ARCH_flag="-arch ppc64" @@ -158,7 +145,6 @@ case "${host_os}" in ;; x86_64*) ARCH_flag="-arch x86_64" - YASMFLAGS="-f macho64" ;; arm*) ac_cv_c_bigendian="no" @@ -269,12 +255,10 @@ case "${host_os}" in HAVE_WIN64="1" WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" - YASMFLAGS="-f win64" ;; *) WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" - YASMFLAGS="-f win32" ;; esac AC_SUBST(WINDOWS_ARCH) @@ -308,8 +292,6 @@ AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1") AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1") -AC_SUBST(YASMFLAGS) - dnl dnl Sadly autoconf does not think about testing foo.exe when ask to test dnl for program foo on win32 diff --git a/modules/common.am b/modules/common.am index 65c962afe6..90e3c735a0 100644 --- a/modules/common.am +++ b/modules/common.am @@ -37,7 +37,4 @@ AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \ -Wc,--static -Wc,-static-libgcc endif -SUFFIXES = .asm - -.asm.lo: - $(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@ +SUFFIXES =