Merge pull request #36 from abergmeier/emscripten_fix
authorAnthony Green <green@moxielogic.com>
Tue, 2 Jul 2013 19:12:34 +0000 (12:12 -0700)
committerAnthony Green <green@moxielogic.com>
Tue, 2 Jul 2013 19:12:34 +0000 (12:12 -0700)
Fixes for building with Emscripten

1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
@@@ -115,69 -121,66 +122,69 @@@ additionalSOURCES += src/debug.
  endif
  
  if MIPS
nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
additionalSOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
  endif
  if BFIN
nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
additionalSOURCES += src/bfin/ffi.c src/bfin/sysv.S
  endif
  if X86
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
additionalSOURCES += src/x86/ffi.c src/x86/sysv.S
  endif
  if X86_FREEBSD
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/freebsd.S
additionalSOURCES += src/x86/ffi.c src/x86/freebsd.S
  endif
  if X86_WIN32
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S
additionalSOURCES += src/x86/ffi.c src/x86/win32.S
  endif
  if X86_WIN64
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win64.S
additionalSOURCES += src/x86/ffi.c src/x86/win64.S
  endif
  if X86_DARWIN
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
additionalSOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
  endif
  if SPARC
nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
additionalSOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
  endif
  if ALPHA
nodist_libffi_la_SOURCES += src/alpha/ffi.c src/alpha/osf.S
additionalSOURCES += src/alpha/ffi.c src/alpha/osf.S
  endif
  if IA64
nodist_libffi_la_SOURCES += src/ia64/ffi.c src/ia64/unix.S
additionalSOURCES += src/ia64/ffi.c src/ia64/unix.S
  endif
  if M32R
nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
additionalSOURCES += src/m32r/sysv.S src/m32r/ffi.c
  endif
  if M68K
nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
additionalSOURCES += src/m68k/ffi.c src/m68k/sysv.S
  endif
  if MOXIE
nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S
additionalSOURCES += src/moxie/ffi.c src/moxie/eabi.S
  endif
  if MICROBLAZE
nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
additionalSOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
  endif
  if POWERPC
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
additionalSOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
  endif
  if POWERPC_AIX
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
additionalSOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
  endif
  if POWERPC_DARWIN
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
additionalSOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
  endif
  if POWERPC_FREEBSD
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
additionalSOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
  endif
  if AARCH64
nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
additionalSOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
  endif
 +if ARC
 +nodist_libffi_la_SOURCES += src/arc/sysv.S src/arc/ffi.c
 +endif
  if ARM
nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
additionalSOURCES += src/arm/sysv.S src/arm/ffi.c
  if FFI_EXEC_TRAMPOLINE_TABLE
nodist_libffi_la_SOURCES += src/arm/trampoline.S
additionalSOURCES += src/arm/trampoline.S
  endif
  endif
  if AVR32
diff --cc configure.ac
Simple merge