Commit 6c0f63cd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove unused support for .asm files

parent d713262c
...@@ -69,7 +69,6 @@ AM_PROG_AS ...@@ -69,7 +69,6 @@ AM_PROG_AS
AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files]) AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :) 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_ARG_VAR([BUILDCC], [Build system C11 or C99 compiler command])
AC_PATH_PROGS(BUILDCC, [c11-gcc c11 c99-gcc c99], [false]) AC_PATH_PROGS(BUILDCC, [c11-gcc c11 c99-gcc c99], [false])
AS_IF([test "$BUILDCC" = "false"], [ AS_IF([test "$BUILDCC" = "false"], [
...@@ -102,17 +101,6 @@ HAVE_WIN64="0" ...@@ -102,17 +101,6 @@ HAVE_WIN64="0"
HAVE_IOS="0" HAVE_IOS="0"
HAVE_OSX="0" HAVE_OSX="0"
YASMFLAGS=""
case "${host}" in
i?86*)
YASMFLAGS="-f elf32"
;;
x86_64*)
YASMFLAGS="-f elf64"
;;
esac
case "${host_os}" in case "${host_os}" in
"") "")
SYS=unknown SYS=unknown
...@@ -148,7 +136,6 @@ case "${host_os}" in ...@@ -148,7 +136,6 @@ case "${host_os}" in
case "${host}" in case "${host}" in
i?86*) i?86*)
ARCH_flag="-arch i386" ARCH_flag="-arch i386"
YASMFLAGS="-f macho32"
;; ;;
ppc64*) ppc64*)
ARCH_flag="-arch ppc64" ARCH_flag="-arch ppc64"
...@@ -158,7 +145,6 @@ case "${host_os}" in ...@@ -158,7 +145,6 @@ case "${host_os}" in
;; ;;
x86_64*) x86_64*)
ARCH_flag="-arch x86_64" ARCH_flag="-arch x86_64"
YASMFLAGS="-f macho64"
;; ;;
arm*) arm*)
ac_cv_c_bigendian="no" ac_cv_c_bigendian="no"
...@@ -269,12 +255,10 @@ case "${host_os}" in ...@@ -269,12 +255,10 @@ case "${host_os}" in
HAVE_WIN64="1" HAVE_WIN64="1"
WINDOWS_ARCH="x64" WINDOWS_ARCH="x64"
PROGRAMFILES="PROGRAMFILES64" PROGRAMFILES="PROGRAMFILES64"
YASMFLAGS="-f win64"
;; ;;
*) *)
WINDOWS_ARCH="x86" WINDOWS_ARCH="x86"
PROGRAMFILES="PROGRAMFILES" PROGRAMFILES="PROGRAMFILES"
YASMFLAGS="-f win32"
;; ;;
esac esac
AC_SUBST(WINDOWS_ARCH) AC_SUBST(WINDOWS_ARCH)
...@@ -308,8 +292,6 @@ AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") ...@@ -308,8 +292,6 @@ AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1") AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1")
AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1") AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
AC_SUBST(YASMFLAGS)
dnl dnl
dnl Sadly autoconf does not think about testing foo.exe when ask to test dnl Sadly autoconf does not think about testing foo.exe when ask to test
dnl for program foo on win32 dnl for program foo on win32
......
...@@ -37,7 +37,4 @@ AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \ ...@@ -37,7 +37,4 @@ AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \
-Wc,--static -Wc,-static-libgcc -Wc,--static -Wc,-static-libgcc
endif endif
SUFFIXES = .asm SUFFIXES =
.asm.lo:
$(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment