| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 5b0125a792842ae02df507bc55555661cb10f9a3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 8 Mar 2015 03:41:39 +0000 |
| 4 | Subject: [PATCH 35/46] Dont link the plugins with libgomp explicitly |
| 5 | |
| 6 | They are dlopened by libgomp anyway. This fixes |
| 7 | the libtool relink issue which causes issues during |
| 8 | cross compilation |
| 9 | |
| 10 | libtool: install: /usr/bin/install -c .libs/libgomp.lai |
| 11 | /home/ubuntu/work/bleeding/build-qemux86-64mc/tmp/work/core2-64-rdk-linux/gcc-runtime/5.0-r0/image/usr/lib/../lib/libgomp.la |
| 12 | libtool: install: error: cannot install `libgomp-plugin-host_nonshm.la' |
| 13 | to a directory not ending in /usr/lib |
| 14 | Makefile:517: recipe for target 'install-toolexeclibLTLIBRARIES' failed |
| 15 | make[2]: *** [install-toolexeclibLTLIBRARIES] Error 1 |
| 16 | |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | --- |
| 19 | libgomp/Makefile.in | 7 +++---- |
| 20 | libgomp/plugin/Makefrag.am | 3 +-- |
| 21 | 2 files changed, 4 insertions(+), 6 deletions(-) |
| 22 | |
| 23 | diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in |
| 24 | index b61b108..71b2627 100644 |
| 25 | --- a/libgomp/Makefile.in |
| 26 | +++ b/libgomp/Makefile.in |
| 27 | @@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" \ |
| 28 | "$(DESTDIR)$(fincludedir)" "$(DESTDIR)$(libsubincludedir)" \ |
| 29 | "$(DESTDIR)$(toolexeclibdir)" |
| 30 | LTLIBRARIES = $(toolexeclib_LTLIBRARIES) |
| 31 | -libgomp_plugin_host_nonshm_la_DEPENDENCIES = libgomp.la |
| 32 | +libgomp_plugin_host_nonshm_la_LIBADD = |
| 33 | am_libgomp_plugin_host_nonshm_la_OBJECTS = \ |
| 34 | libgomp_plugin_host_nonshm_la-plugin-host.lo |
| 35 | libgomp_plugin_host_nonshm_la_OBJECTS = \ |
| 36 | @@ -133,7 +133,7 @@ libgomp_plugin_host_nonshm_la_LINK = $(LIBTOOL) --tag=CC \ |
| 37 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
| 38 | $(libgomp_plugin_host_nonshm_la_LDFLAGS) $(LDFLAGS) -o $@ |
| 39 | am__DEPENDENCIES_1 = |
| 40 | -@PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_DEPENDENCIES = libgomp.la \ |
| 41 | +@PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_DEPENDENCIES = \ |
| 42 | @PLUGIN_NVPTX_TRUE@ $(am__DEPENDENCIES_1) |
| 43 | @PLUGIN_NVPTX_TRUE@am_libgomp_plugin_nvptx_la_OBJECTS = \ |
| 44 | @PLUGIN_NVPTX_TRUE@ libgomp_plugin_nvptx_la-plugin-nvptx.lo |
| 45 | @@ -407,7 +407,7 @@ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ |
| 46 | @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LDFLAGS = \ |
| 47 | @PLUGIN_NVPTX_TRUE@ $(libgomp_plugin_nvptx_version_info) \ |
| 48 | @PLUGIN_NVPTX_TRUE@ $(lt_host_flags) $(PLUGIN_NVPTX_LDFLAGS) |
| 49 | -@PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LIBADD = libgomp.la $(PLUGIN_NVPTX_LIBS) |
| 50 | +@PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LIBADD = $(PLUGIN_NVPTX_LIBS) |
| 51 | @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LIBTOOLFLAGS = --tag=disable-static |
| 52 | libgomp_plugin_host_nonshm_version_info = -version-info $(libtool_VERSION) |
| 53 | libgomp_plugin_host_nonshm_la_SOURCES = plugin/plugin-host.c |
| 54 | @@ -415,7 +415,6 @@ libgomp_plugin_host_nonshm_la_CPPFLAGS = $(AM_CPPFLAGS) -DHOST_NONSHM_PLUGIN |
| 55 | libgomp_plugin_host_nonshm_la_LDFLAGS = \ |
| 56 | $(libgomp_plugin_host_nonshm_version_info) $(lt_host_flags) |
| 57 | |
| 58 | -libgomp_plugin_host_nonshm_la_LIBADD = libgomp.la |
| 59 | libgomp_plugin_host_nonshm_la_LIBTOOLFLAGS = --tag=disable-static |
| 60 | nodist_noinst_HEADERS = libgomp_f.h |
| 61 | nodist_libsubinclude_HEADERS = omp.h openacc.h |
| 62 | diff --git a/libgomp/plugin/Makefrag.am b/libgomp/plugin/Makefrag.am |
| 63 | index 167485f..d2c5428 100644 |
| 64 | --- a/libgomp/plugin/Makefrag.am |
| 65 | +++ b/libgomp/plugin/Makefrag.am |
| 66 | @@ -35,7 +35,7 @@ libgomp_plugin_nvptx_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_NVPTX_CPPFLAGS) |
| 67 | libgomp_plugin_nvptx_la_LDFLAGS = $(libgomp_plugin_nvptx_version_info) \ |
| 68 | $(lt_host_flags) |
| 69 | libgomp_plugin_nvptx_la_LDFLAGS += $(PLUGIN_NVPTX_LDFLAGS) |
| 70 | -libgomp_plugin_nvptx_la_LIBADD = libgomp.la $(PLUGIN_NVPTX_LIBS) |
| 71 | +libgomp_plugin_nvptx_la_LIBADD = $(PLUGIN_NVPTX_LIBS) |
| 72 | libgomp_plugin_nvptx_la_LIBTOOLFLAGS = --tag=disable-static |
| 73 | endif |
| 74 | |
| 75 | @@ -45,5 +45,4 @@ libgomp_plugin_host_nonshm_la_SOURCES = plugin/plugin-host.c |
| 76 | libgomp_plugin_host_nonshm_la_CPPFLAGS = $(AM_CPPFLAGS) -DHOST_NONSHM_PLUGIN |
| 77 | libgomp_plugin_host_nonshm_la_LDFLAGS = \ |
| 78 | $(libgomp_plugin_host_nonshm_version_info) $(lt_host_flags) |
| 79 | -libgomp_plugin_host_nonshm_la_LIBADD = libgomp.la |
| 80 | libgomp_plugin_host_nonshm_la_LIBTOOLFLAGS = --tag=disable-static |
| 81 | -- |
| 82 | 2.6.3 |
| 83 | |