From: Zoltan Varga <vargaz@gmail.com>
Date: Tue, 28 Oct 2014 05:08:37 +0000 (-0400)
Subject: Merge pull request #1374 from directhex/master
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=039ffcafcafde737e62860325805148cb921b23d;hp=-c;p=mono.git

Merge pull request #1374 from directhex/master

Add missing header file to s390x_sources
---

039ffcafcafde737e62860325805148cb921b23d
diff --combined mono/mini/Makefile.am.in
index b4c85e1a4d3,c76d61848d9..d43605ce620
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@@ -83,6 -83,8 +83,6 @@@ libmonoldflags=$(monoldflags) -version-
  endif
  endif
  
 -if JIT_SUPPORTED
 -
  if SUPPORT_SGEN
  sgen_binaries = mono-sgen
  sgen_libraries = libmonosgen-2.0.la
@@@ -164,6 -166,8 +164,6 @@@ libmono_llvm_la_LIBADD += $(top_builddi
  endif
  endif
  
 -endif
 -
  mono_boehm_SOURCES = \
  	main.c
  
@@@ -192,7 -196,7 +192,7 @@@ endi
  	@echo "const char *build_date = \"`date`\";" > buildver-boehm.h
  mono_boehm-main.$(OBJEXT): buildver-boehm.h
  main.c: buildver-boehm.h
 -	
 +
  endif
  
  if DISABLE_EXECUTABLES
@@@ -344,6 -348,7 +344,7 @@@ sparc_sources = 
  s390x_sources = \
  	mini-s390x.c		\
  	mini-s390x.h		\
+ 	support-s390x.h		\
  	exceptions-s390x.c	\
  	tramp-s390x.c
  
@@@ -726,7 -731,11 +727,7 @@@ clean-local
  
  pkgconfigdir = $(libdir)/pkgconfig
  
 -if JIT_SUPPORTED
  BUILT_SOURCES = version.h $(arch_built)
 -else
 -BUILT_SOURCES = version.h
 -endif
  
  CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
  EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \