Author: Fraser Cormack Date: 2025-04-24T11:24:24+01:00 New Revision: d664c42baaed7f47a80f73a3974afd6e2593e41a
URL: https://github.com/llvm/llvm-project/commit/d664c42baaed7f47a80f73a3974afd6e2593e41a DIFF: https://github.com/llvm/llvm-project/commit/d664c42baaed7f47a80f73a3974afd6e2593e41a.diff LOG: [libclc] Remove unnecessary clcmacros.h (#137149) The macros defined by this file (not to be confused with clcmacro.h) don't appear necessary for building libclc. The language version macros should be handled by clang, and there are no uses of NULL or kernel_exec in the source code. Added: Modified: libclc/generic/include/clc/clc.h Removed: libclc/generic/include/clc/clcmacros.h ################################################################################ diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h index b1e851184d7e1..f4c0dc7c0bee4 100644 --- a/libclc/generic/include/clc/clc.h +++ b/libclc/generic/include/clc/clc.h @@ -35,9 +35,6 @@ /* 6.2.4.2 Reinterpreting Types Using as_type() and as_typen() */ #include <clc/as_type.h> -/* 6.9 Preprocessor Directives and Macros */ -#include <clc/clcmacros.h> - /* 6.11.1 Work-Item Functions */ #include <clc/workitem/get_global_size.h> #include <clc/workitem/get_global_id.h> diff --git a/libclc/generic/include/clc/clcmacros.h b/libclc/generic/include/clc/clcmacros.h deleted file mode 100644 index dd96f459643f1..0000000000000 --- a/libclc/generic/include/clc/clcmacros.h +++ /dev/null @@ -1,31 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef __CLC_CLCMACROS_H__ -#define __CLC_CLCMACROS_H__ - -/* 6.9 Preprocessor Directives and Macros - * Some of these are handled by clang or passed by clover */ -#if __OPENCL_VERSION__ >= 110 -#define CLC_VERSION_1_0 100 -#define CLC_VERSION_1_1 110 -#endif - -#if __OPENCL_VERSION__ >= 120 -#define CLC_VERSION_1_2 120 -#endif - -#define NULL ((void *)0) - -#define __kernel_exec(X, typen) \ - __kernel __attribute__((work_group_size_hint(X, 1, 1))) \ - __attribute__((vec_type_hint(typen))) - -#define kernel_exec(X, typen) __kernel_exec(X, typen) - -#endif // __CLC_CLCMACROS_H__ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
