From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 718EE3938380; Thu, 13 May 2021 16:20:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 718EE3938380 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] [WIP] OpenMP 5.0: requires directive: workaround to fix libgomp IntelMIC plugin build X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 9228d5a2ce3d0f5c19f2068b1ad42dd4ba4936c7 X-Git-Newrev: 6da4ffd4a790f5f0abf290147217ca46a36f981e Message-Id: <20210513162017.718EE3938380@sourceware.org> Date: Thu, 13 May 2021 16:20:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 16:20:17 -0000 https://gcc.gnu.org/g:6da4ffd4a790f5f0abf290147217ca46a36f981e commit 6da4ffd4a790f5f0abf290147217ca46a36f981e Author: Thomas Schwinge Date: Wed Mar 3 22:37:58 2021 +0100 [WIP] OpenMP 5.0: requires directive: workaround to fix libgomp IntelMIC plugin build Fix-up for og10 commit c2e4a17adc0989f216c7fc3f93f150c66adba23a "OpenMP 5.0: requires directive". The GCC offloading target configurations don't build/use 'crtoffloadbegin.o'/'crtoffloadtable.o'/'crtoffloadend.o' ('libgcc/offloadstuff.c'), but the libgomp IntelMIC plugin still does link against libgomp, and the latter unconditionally refers to '__requires_mask_table', '__requires_mask_table_end': make[3]: Entering directory '[...]/build-gcc-offload-x86_64-intelmicemul-linux-gnu/x86_64-intelmicemul-linux-gnu/liboffloadmic/plugin' [...]/build-gcc-offload-x86_64-intelmicemul-linux-gnu/./gcc/xg++ [...] -loffloadmic_target -lcoi_device -lgomp -rdynamic ../ofldbegin.o offload_target_main.o ../ofldend.o -o offload_target_main ./../../libgomp/.libs/libgomp.so: undefined reference to `__requires_mask_table_end' ./../../libgomp/.libs/libgomp.so: undefined reference to `__requires_mask_table' collect2: error: ld returned 1 exit status Makefile:806: recipe for target 'offload_target_main' failed make[3]: *** [offload_target_main] Error 1 I have not researched what a proper fix would look like. libgomp/ * target.c (__requires_mask_table, __requires_mask_table_end): Add '__attribute__((weak))'. Diff: --- libgomp/ChangeLog.omp | 5 +++++ libgomp/target.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 0519191a936..db1d2bdac3a 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-03-25 Thomas Schwinge + + * target.c (__requires_mask_table, __requires_mask_table_end): Add + '__attribute__((weak))'. + 2021-03-01 Kwok Cheung Yeung * testsuite/libgomp.c-c++-common/collapse-4.c: New. diff --git a/libgomp/target.c b/libgomp/target.c index af39d283608..2633ab1e43f 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -104,7 +104,9 @@ static unsigned int gomp_requires_mask; /* Start/end of .gnu.gomp.requires section of program, defined in crtoffloadbegin/end.o. */ +__attribute__((weak)) extern const unsigned int __requires_mask_table[]; +__attribute__((weak)) extern const unsigned int __requires_mask_table_end[]; /* Similar to gomp_realloc, but release register_lock before gomp_fatal. */