Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-02 05:42:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed build warning with -DLIBOMP_USE_HWLOC=1

Browse Source 
Made type of depth of hwloc object to correapond with
change from unsigned in hwloc 1,x to int in hwloc 2.x.
This eliminates the warning on signed-unsigned comparison.

Differential Revision: https://reviews.llvm.org/D62332

llvm-svn: 362401
This commit is contained in:
Andrey Churbanov 2019-06-03 14:21:59 +00:00
parent 9111f35f02
commit 3f786dab0e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmp/runtime/src/kmp.h
View File

@ -96,6 +96,12 @@ class kmp_stats_list;
#ifndef HWLOC_OBJ_PACKAGE #ifndef HWLOC_OBJ_PACKAGE
#define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET #define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
#endif #endif
#if HWLOC_API_VERSION >= 0x00020000
// hwloc 2.0 changed type of depth of object from unsigned to int
typedef int kmp_hwloc_depth_t;
#else
typedef unsigned int kmp_hwloc_depth_t;
#endif
#endif #endif
#if KMP_ARCH_X86 || KMP_ARCH_X86_64 #if KMP_ARCH_X86 || KMP_ARCH_X86_64

3
openmp/runtime/src/kmp_affinity.cpp
View File

@ -457,7 +457,8 @@ static int __kmp_hwloc_get_nobjs_under_obj(hwloc_obj_t obj,
} }
static int __kmp_hwloc_count_children_by_depth(hwloc_topology_t t, static int __kmp_hwloc_count_children_by_depth(hwloc_topology_t t,
hwloc_obj_t o, unsigned depth, hwloc_obj_t o,
kmp_hwloc_depth_t depth,
hwloc_obj_t *f) { hwloc_obj_t *f) {
if (o->depth == depth) { if (o->depth == depth) {
if (*f == NULL) if (*f == NULL)