You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/11/26 21:42:29 UTC
[incubator-nuttx] 03/05: libs/libc/machine/arm: Rename armv8 to
armv8-m
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 74ab69af62e001ca60a7786ecd399336a927eb36
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Nov 26 20:06:21 2020 +0800
libs/libc/machine/arm: Rename armv8 to armv8-m
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
libs/libc/machine/arm/Kconfig | 2 +-
libs/libc/machine/arm/Make.defs | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/Kconfig | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/Make.defs | 10 +++++-----
libs/libc/machine/arm/{armv8 => armv8-m}/arch_ceil.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_ceilf.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_floor.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_floorf.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_nearbyint.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_nearbyintf.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_rint.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_rintf.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_round.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_roundf.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_trunc.c | 2 +-
libs/libc/machine/arm/{armv8 => armv8-m}/arch_truncf.c | 2 +-
16 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/libs/libc/machine/arm/Kconfig b/libs/libc/machine/arm/Kconfig
index a56ac57..6adc22c 100644
--- a/libs/libc/machine/arm/Kconfig
+++ b/libs/libc/machine/arm/Kconfig
@@ -25,5 +25,5 @@ source libs/libc/machine/arm/armv7-m/Kconfig
endif
if ARCH_ARMV8M
-source libs/libc/machine/arm/armv8/Kconfig
+source libs/libc/machine/arm/armv8-m/Kconfig
endif
diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
index 89e008e..dfdaee6 100644
--- a/libs/libc/machine/arm/Make.defs
+++ b/libs/libc/machine/arm/Make.defs
@@ -54,7 +54,7 @@ include $(TOPDIR)/libs/libc/machine/arm/armv6-m/Make.defs
else ifeq ($(CONFIG_ARCH_ARMV7M),y) # All ARMv7-M
include $(TOPDIR)/libs/libc/machine/arm/armv7-m/Make.defs
else ifeq ($(CONFIG_ARCH_ARMV8M),y) # All ARMv8-M
-include $(TOPDIR)/libs/libc/machine/arm/armv8/Make.defs
+include $(TOPDIR)/libs/libc/machine/arm/armv8-m/Make.defs
endif
ifeq ($(CONFIG_CXX_EXCEPTION),y)
diff --git a/libs/libc/machine/arm/armv8/Kconfig b/libs/libc/machine/arm/armv8-m/Kconfig
similarity index 97%
rename from libs/libc/machine/arm/armv8/Kconfig
rename to libs/libc/machine/arm/armv8-m/Kconfig
index dab8132..825ee73 100644
--- a/libs/libc/machine/arm/armv8/Kconfig
+++ b/libs/libc/machine/arm/armv8-m/Kconfig
@@ -5,7 +5,7 @@
if ARCH_ARMV8M
-config ARMV8_LIBM
+config ARMV8M_LIBM
bool "Architecture specific optimizations"
default n
select LIBM_ARCH_CEIL if CONFIG_ARCH_DPFPU
diff --git a/libs/libc/machine/arm/armv8/Make.defs b/libs/libc/machine/arm/armv8-m/Make.defs
similarity index 93%
rename from libs/libc/machine/arm/armv8/Make.defs
rename to libs/libc/machine/arm/armv8-m/Make.defs
index 8e306f5..f2bdda5 100644
--- a/libs/libc/machine/arm/armv8/Make.defs
+++ b/libs/libc/machine/arm/armv8-m/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# libs/libc/machine/arm/armv8/Make.defs
+# libs/libc/machine/arm/armv8-m/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
@@ -33,7 +33,7 @@
#
############################################################################
-ifeq ($(CONFIG_ARMV8_LIBM),y)
+ifeq ($(CONFIG_ARMV8M_LIBM),y)
ifeq ($(LIBM_ARCH_CEIL),y)
CSRCS += arch_ceil.c
@@ -83,7 +83,7 @@ ifeq ($(LIBM_ARCH_TRUNC),y)
CSRCS += arch_trunc.c
endif
-DEPPATH += --dep-path machine/arm/armv8
-VPATH += :machine/arm/armv8
+DEPPATH += --dep-path machine/arm/armv8-m
+VPATH += :machine/arm/armv8-m
-endif # CONFIG_ARMV8_LIBM
+endif # CONFIG_ARMV8M_LIBM
diff --git a/libs/libc/machine/arm/armv8/arch_ceil.c b/libs/libc/machine/arm/armv8-m/arch_ceil.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_ceil.c
rename to libs/libc/machine/arm/armv8-m/arch_ceil.c
index bca708e..9394fde 100644
--- a/libs/libc/machine/arm/armv8/arch_ceil.c
+++ b/libs/libc/machine/arm/armv8-m/arch_ceil.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_ceil.c
+ * libs/libc/machine/arm/armv8-m/arch_ceil.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_ceilf.c b/libs/libc/machine/arm/armv8-m/arch_ceilf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_ceilf.c
rename to libs/libc/machine/arm/armv8-m/arch_ceilf.c
index c5cff28..490c4ca 100644
--- a/libs/libc/machine/arm/armv8/arch_ceilf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_ceilf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_ceilf.c
+ * libs/libc/machine/arm/armv8-m/arch_ceilf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_floor.c b/libs/libc/machine/arm/armv8-m/arch_floor.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_floor.c
rename to libs/libc/machine/arm/armv8-m/arch_floor.c
index e401226..f9a0b9c 100644
--- a/libs/libc/machine/arm/armv8/arch_floor.c
+++ b/libs/libc/machine/arm/armv8-m/arch_floor.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_floor.c
+ * libs/libc/machine/arm/armv8-m/arch_floor.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_floorf.c b/libs/libc/machine/arm/armv8-m/arch_floorf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_floorf.c
rename to libs/libc/machine/arm/armv8-m/arch_floorf.c
index b9dc9c2..6adb678 100644
--- a/libs/libc/machine/arm/armv8/arch_floorf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_floorf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_floorf.c
+ * libs/libc/machine/arm/armv8-m/arch_floorf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_nearbyint.c b/libs/libc/machine/arm/armv8-m/arch_nearbyint.c
similarity index 97%
rename from libs/libc/machine/arm/armv8/arch_nearbyint.c
rename to libs/libc/machine/arm/armv8-m/arch_nearbyint.c
index a4fae9b..701e787 100644
--- a/libs/libc/machine/arm/armv8/arch_nearbyint.c
+++ b/libs/libc/machine/arm/armv8-m/arch_nearbyint.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_nearbyint.c
+ * libs/libc/machine/arm/armv8-m/arch_nearbyint.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_nearbyintf.c b/libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
similarity index 97%
rename from libs/libc/machine/arm/armv8/arch_nearbyintf.c
rename to libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
index c00c848..6769066 100644
--- a/libs/libc/machine/arm/armv8/arch_nearbyintf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_nearbyintf.c
+ * libs/libc/machine/arm/armv8-m/arch_nearbyintf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_rint.c b/libs/libc/machine/arm/armv8-m/arch_rint.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_rint.c
rename to libs/libc/machine/arm/armv8-m/arch_rint.c
index 8e90941..b3b9d31 100644
--- a/libs/libc/machine/arm/armv8/arch_rint.c
+++ b/libs/libc/machine/arm/armv8-m/arch_rint.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_rint.c
+ * libs/libc/machine/arm/armv8-m/arch_rint.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_rintf.c b/libs/libc/machine/arm/armv8-m/arch_rintf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_rintf.c
rename to libs/libc/machine/arm/armv8-m/arch_rintf.c
index 76ae43d..7c57f92 100644
--- a/libs/libc/machine/arm/armv8/arch_rintf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_rintf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_rintf.c
+ * libs/libc/machine/arm/armv8-m/arch_rintf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_round.c b/libs/libc/machine/arm/armv8-m/arch_round.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_round.c
rename to libs/libc/machine/arm/armv8-m/arch_round.c
index fd890cd..969a859 100644
--- a/libs/libc/machine/arm/armv8/arch_round.c
+++ b/libs/libc/machine/arm/armv8-m/arch_round.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_round.c
+ * libs/libc/machine/arm/armv8-m/arch_round.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_roundf.c b/libs/libc/machine/arm/armv8-m/arch_roundf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_roundf.c
rename to libs/libc/machine/arm/armv8-m/arch_roundf.c
index b791d32..6e9a85c 100644
--- a/libs/libc/machine/arm/armv8/arch_roundf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_roundf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_roundf.c
+ * libs/libc/machine/arm/armv8-m/arch_roundf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_trunc.c b/libs/libc/machine/arm/armv8-m/arch_trunc.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_trunc.c
rename to libs/libc/machine/arm/armv8-m/arch_trunc.c
index a8845ba..2929b6d 100644
--- a/libs/libc/machine/arm/armv8/arch_trunc.c
+++ b/libs/libc/machine/arm/armv8-m/arch_trunc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_trunc.c
+ * libs/libc/machine/arm/armv8-m/arch_trunc.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*
diff --git a/libs/libc/machine/arm/armv8/arch_truncf.c b/libs/libc/machine/arm/armv8-m/arch_truncf.c
similarity index 98%
rename from libs/libc/machine/arm/armv8/arch_truncf.c
rename to libs/libc/machine/arm/armv8-m/arch_truncf.c
index 470ece3..5d51344 100644
--- a/libs/libc/machine/arm/armv8/arch_truncf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_truncf.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8/arch_truncf.c
+ * libs/libc/machine/arm/armv8-m/arch_truncf.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
*