Skip to content

Commit

Permalink
fix(cpuinfo): fix compat
Browse files Browse the repository at this point in the history
GitOrigin-RevId: c5781f7e6446c44da220d3dee598629e0a3aad9b
  • Loading branch information
megvii-mge committed Jan 13, 2023
1 parent 7eac8c9 commit 12494f2
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 4 deletions.
8 changes: 8 additions & 0 deletions pack2bazel.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
rm -fr cpuinfo cpuinfo.tar.gz
mkdir -p cpuinfo
cp -fr * cpuinfo
rm cpuinfo/BUILD.bazel
rm cpuinfo/deps/clog/BUILD.bazel
rm cpuinfo/WORKSPACE.bazel
tar -czf cpuinfo.tar.gz cpuinfo
1 change: 1 addition & 0 deletions src/arm/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <cpuinfo.h>
#include <cpuinfo/common.h>
#include <cpuinfo/fixsdk.h>

enum cpuinfo_arm_chipset_vendor {
cpuinfo_arm_chipset_vendor_unknown = 0,
Expand Down
11 changes: 7 additions & 4 deletions src/arm/linux/hwcap.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
#include <arm/linux/api.h>
#include <cpuinfo/log.h>

#if CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_ARM && !defined(__ANDROID__) && !defined(__UCLIBC__)
#if (CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_ARM && !defined(__ANDROID__)) && !defined(__UCLIBC__)

#include <sys/auxv.h>
#else
#define AT_HWCAP 16
#define AT_HWCAP2 26
#endif
#ifndef AT_HWCAP
#define AT_HWCAP 16
#endif
#ifndef AT_HWCAP2
#define AT_HWCAP2 26
#endif


Expand Down
3 changes: 3 additions & 0 deletions src/cpuinfo/fixsdk.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#ifndef CPUFAMILY_ARM_MONSOON_MISTRAL
#define CPUFAMILY_ARM_MONSOON_MISTRAL 0xe81e7ef6
#endif
1 change: 1 addition & 0 deletions src/cpuinfo/internal-api.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <cpuinfo.h>
#include <cpuinfo/common.h>
#include <cpuinfo/fixsdk.h>


enum cpuinfo_cache_level {
Expand Down
1 change: 1 addition & 0 deletions src/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <cpuinfo.h>
#include <cpuinfo/internal-api.h>
#include <cpuinfo/log.h>
#include <cpuinfo/fixsdk.h>

#ifdef __APPLE__
#include "TargetConditionals.h"
Expand Down

0 comments on commit 12494f2

Please sign in to comment.