diff options
| author | Balaji V. Iyer <balaji.v.iyer@intel.com> | 2013-07-23 14:17:46 -0400 |
|---|---|---|
| committer | Balaji V. Iyer <balaji.v.iyer@intel.com> | 2013-07-23 14:17:46 -0400 |
| commit | fdcb8a9d9469e85c19dc10126253c30d5f39e43f (patch) | |
| tree | 2f271af696af2895e14b36df7b75944bddd1754c | |
| parent | 66dd16e9421231fb55956d4fd8c1bdd2460fc145 (diff) | |
| download | gcc-bviyer/cilkplus-multilib-test.tar.gz | |
Committed all H. J. Changes and Patch.bviyer/cilkplus-multilib-test
| -rw-r--r-- | Makefile.def | 5 | ||||
| -rw-r--r-- | libcilkrts/Makefile.am | 44 |
2 files changed, 47 insertions, 2 deletions
diff --git a/Makefile.def b/Makefile.def index 90d9653d530..d8e4c796b95 100644 --- a/Makefile.def +++ b/Makefile.def @@ -123,6 +123,8 @@ target_modules = { module= libsanitizer; bootstrap=true; lib_path=.libs; raw_cxx=true; }; +target_modules = { module= libcilkrts; + lib_path=.libs; }; target_modules = { module= libssp; lib_path=.libs; }; target_modules = { module= newlib; }; target_modules = { module= libgcc; bootstrap=true; no_check=true; }; @@ -489,6 +491,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; }; // on libgcc and newlib/libgloss. lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=libitm; cxx=true; }; +lang_env_dependencies = { module=libcilkrts; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; }; lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; }; @@ -526,6 +529,8 @@ dependencies = { module=install-target-libgfortran; on=install-target-libquadmat dependencies = { module=install-target-libgfortran; on=install-target-libgcc; }; dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; }; dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; }; +dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v3; }; +dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; }; dependencies = { module=install-target-libjava; on=install-target-libgcc; }; dependencies = { module=install-target-libitm; on=install-target-libgcc; }; dependencies = { module=install-target-libobjc; on=install-target-libgcc; }; diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am index ac934982163..37797dbabb5 100644 --- a/libcilkrts/Makefile.am +++ b/libcilkrts/Makefile.am @@ -26,7 +26,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config # Compiler and linker flags. GENERAL_FLAGS = -I$(top_srcdir)/include -DIN_CILK_RUNTIME=1 -GENERAL_FLAGS += -fpic -O3 -fcilkplus +GENERAL_FLAGS += -fcilkplus GENERAL_FLAGS += -DBUILD_USER=\"$(USER)\" GENERAL_FLAGS += -DBUILD_HOST=\"`hostname`\" AM_CFLAGS = $(GENERAL_FLAGS) -std=c99 @@ -34,7 +34,7 @@ AM_CPPFLAGS = $(GENERAL_FLAGS) AM_LDFLAGS = -lpthread -ldl # Target list. -lib_LTLIBRARIES = libcilkrts.la +toolexeclib_LTLIBRARIES = libcilkrts.la libcilkrts_la_SOURCES = runtime/cilk-abi.c runtime/cilk_api.c \ runtime/cilk_malloc.c runtime/c_reducers.c \ @@ -75,3 +75,43 @@ cilkinclude_HEADERS = \ include/cilk/reducer_opxor.h \ include/cilk/reducer_ostream.h \ include/cilk/reducer_string.h + +# Work around what appears to be a GNU make bug handling MAKEFLAGS +# values defined in terms of make variables, as is the case for CC and +# friends when we are called from the top level Makefile. +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "JC1FLAGS=$(JC1FLAGS)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "includedir=$(includedir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" + +MAKEOVERRIDES= |