From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B676A3858D33; Thu, 16 Feb 2023 21:08:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B676A3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676581717; bh=l0JjT4I4M7Z1WFOtyZq1IgcZdRnuAtVn7ujJCLF6dx8=; h=From:To:Subject:Date:From; b=cw523Wor8SyotDiQV4OfhxwXjNzou9e1a12MJkNZWrAgMX/YLV3ME/+0PBdTjmbff ZpI5NvHoadBAH0h2ULBRngNOVG8a3fRAq9Jvz6C59toEk75G8SEPKh6zMrvda7rav5 b1HTvGzCiZQYCoVgtkljEm+i5dEEsPHrt8AAZEf8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Un-break nvptx libgomp build X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: b4d4603df3fed290ccf721899be6bc69f037fe2b X-Git-Newrev: 6cc0e7bebf1b3ad6aacf75419e7f06942409f90c Message-Id: <20230216210837.B676A3858D33@sourceware.org> Date: Thu, 16 Feb 2023 21:08:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6cc0e7bebf1b3ad6aacf75419e7f06942409f90c commit 6cc0e7bebf1b3ad6aacf75419e7f06942409f90c Author: Thomas Schwinge Date: Thu Feb 16 21:59:55 2023 +0100 Un-break nvptx libgomp build In file included from [...]/libgomp/config/nvptx/allocator.c:49: [...]/libgomp/config/nvptx/../../basic-allocator.c:52:2: error: invalid preprocessing directive #deine; did you mean #define? 52 | #deine BASIC_ALLOC_YIELD | ^~~~~ | define Yes, indeed. Fix-up for og12 commit 9583738a62a33a276b2aad980a27e77097f95924 "nvptx, libgomp: Move the low-latency allocator code". libgomp/ * basic-allocator.c (BASIC_ALLOC_YIELD): instead of '#deine', '#define' it. Diff: --- libgomp/ChangeLog.omp | 3 +++ libgomp/basic-allocator.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index ecc14b4f537..b667c72b8ca 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,8 @@ 2023-02-16 Thomas Schwinge + * basic-allocator.c (BASIC_ALLOC_YIELD): instead of '#deine', + '#define' it. + * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading compilation. * testsuite/libgomp.c/usm-2.c: Likewise. diff --git a/libgomp/basic-allocator.c b/libgomp/basic-allocator.c index 94b99a89e0b..b4b9e4ba13a 100644 --- a/libgomp/basic-allocator.c +++ b/libgomp/basic-allocator.c @@ -49,7 +49,7 @@ #endif #ifndef BASIC_ALLOC_YIELD -#deine BASIC_ALLOC_YIELD +#define BASIC_ALLOC_YIELD #endif #define ALIGN(VAR) (((VAR) + 7) & ~7) /* 8-byte granularity. */