diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-22 14:58:36 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-22 14:58:36 +0000 |
commit | cfea6514a4b6ced0930593ebb48d0037e9716d87 (patch) | |
tree | eeccf866e18463f7dc7ea882ea944247d4ed1010 /libcilkrts/Makefile.in | |
parent | 9456798d72d0e81a2a553287f436dcb05cff175a (diff) | |
download | gcc-cfea6514a4b6ced0930593ebb48d0037e9716d87.tar.gz |
[./]
2013-11-22 Basile Starynkevitch <basile@starynkevitch.net>
{{merge with trunk GCC 4.9 svn rev 205247 now in stage 3}}
[gcc/]
2013-11-22 Basile Starynkevitch <basile@starynkevitch.net>
{{merge with trunk GCC 4.9 svn rev 205247 now in stage 3}}
* Makefile.in (MELT_GCC_VERSION_NUM): New make variable.
(melt-run-md5.h, melt-run.h): Use it.
* melt-runtime.cc: With GCC 4.9 include print-tree.h,
gimple-iterator.h, gimple-walk.h.
(meltgc_start_all_new_modules, meltgc_start_flavored_module)
(meltgc_do_initial_mode, meltgc_set_user_options)
(meltgc_load_modules_and_do_mode): Improve debugprintf...
(melt_gt_ggc_mx_gimple_seq_d): Handle GCC 4.9 specifically.
* melt-runtime.h (gt_ggc_mx_gimple_statement_d): Temporarily
define this macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@205264 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcilkrts/Makefile.in')
-rw-r--r-- | libcilkrts/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index a35eb7b63bc..5066bef3dcc 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -312,6 +312,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_cv_dlopen_libs = @lt_cv_dlopen_libs@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ @@ -395,8 +396,9 @@ CILK_REVISION = 3902 #libcilkrts_la_LDFLAGS = -rpath '$(libdir)' # Hack for Cygwin -libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread -ldl \ - $(am__append_1) $(am__append_2) -no-undefined +libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread \ + @lt_cv_dlopen_libs@ $(am__append_1) $(am__append_2) \ + -no-undefined # C/C++ header files for Cilk. cilkincludedir = $(includedir)/cilk |