diff options
| author | Xuelei Zhang <zhangxuelei4@huawei.com> | 2019-12-27 11:58:19 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-12-27 11:59:51 -0300 |
| commit | 10df95cdaf049e77fa84a71359e210e74901057d (patch) | |
| tree | 2a3684a1e19c8584de2381de3c19223b65bf751e | |
| parent | 64297d49b37f637a82faedd16bf8860e0ab31606 (diff) | |
| download | glibc-10df95cdaf049e77fa84a71359e210e74901057d.zip glibc-10df95cdaf049e77fa84a71359e210e74901057d.tar.gz glibc-10df95cdaf049e77fa84a71359e210e74901057d.tar.bz2 | |
aarch64: ifunc rename for kunpeng
Rename ifunc for kunpeng to kunpeng920, and modify the corresponding
function files including IS_KUNPENG920 judgement.
Checked on aarch64-linux-gnu.
| -rw-r--r-- | sysdeps/aarch64/multiarch/memset.c | 2 | ||||
| -rw-r--r-- | sysdeps/aarch64/multiarch/strlen.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/cpu-features.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/cpu-features.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c index 4cc34b9..98fff64 100644 --- a/sysdeps/aarch64/multiarch/memset.c +++ b/sysdeps/aarch64/multiarch/memset.c @@ -34,7 +34,7 @@ extern __typeof (__redirect_memset) __memset_kunpeng attribute_hidden; extern __typeof (__redirect_memset) __memset_generic attribute_hidden; libc_ifunc (__libc_memset, - IS_KUNPENG (midr) + IS_KUNPENG920 (midr) ?__memset_kunpeng : ((IS_FALKOR (midr) || IS_PHECDA (midr)) && zva_size == 64 ? __memset_falkor diff --git a/sysdeps/aarch64/multiarch/strlen.c b/sysdeps/aarch64/multiarch/strlen.c index abf6513..c2ce5ee 100644 --- a/sysdeps/aarch64/multiarch/strlen.c +++ b/sysdeps/aarch64/multiarch/strlen.c @@ -34,7 +34,7 @@ extern __typeof (__redirect_strlen) __strlen_generic attribute_hidden; extern __typeof (__redirect_strlen) __strlen_asimd attribute_hidden; libc_ifunc (__strlen, - (USE_ASIMD_STRLEN () || IS_KUNPENG(midr) + (USE_ASIMD_STRLEN () || IS_KUNPENG920 (midr) ? __strlen_asimd :__strlen_generic)); diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c index d0e50d0..30dc208 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c @@ -38,7 +38,7 @@ static struct cpu_list cpu_list[] = { {"phecda", 0x680F0000}, {"ares", 0x411FD0C0}, {"emag", 0x503F0001}, - {"kunpeng", 0x481FD010}, + {"kunpeng920", 0x481FD010}, {"generic", 0x0} }; diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h index 87c4995..176c71c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h @@ -57,7 +57,7 @@ #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \ && MIDR_PARTNUM(midr) == 0x000) -#define IS_KUNPENG(midr) (MIDR_IMPLEMENTOR(midr) == 'H' \ +#define IS_KUNPENG920(midr) (MIDR_IMPLEMENTOR(midr) == 'H' \ && MIDR_PARTNUM(midr) == 0xd01) struct cpu_features |