[gcc r13-4548] libgcc: xtensa: remove stray symbols from X*HAL macro definitions

[gcc r13-4548] libgcc: xtensa: remove stray symbols from X*HAL macro definitions

[Max Filippov]

https://gcc.gnu.org/g:ab9fc70149d217a4631822d3db956f45b7c43ecb

commit r13-4548-gab9fc70149d217a4631822d3db956f45b7c43ecb
Author: Max Filippov <jcmvbkbc@gmail.com>
Date:   Thu Dec 8 01:11:40 2022 -0800

    libgcc: xtensa: remove stray symbols from X*HAL macro definitions
    
    libgcc/
            * config/xtensa/xtensa-config-builtin.h (XCHAL_NUM_AREGS)
            (XCHAL_ICACHE_SIZE, XCHAL_DCACHE_SIZE, XCHAL_ICACHE_LINESIZE)
            (XCHAL_DCACHE_LINESIZE, XCHAL_MMU_MIN_PTE_PAGE_SIZE)
            (XSHAL_ABI): Remove stray symbols from macro definitions.

Diff:
---
 libgcc/config/xtensa/xtensa-config-builtin.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libgcc/config/xtensa/xtensa-config-builtin.h b/libgcc/config/xtensa/xtensa-config-builtin.h
index 36d4d9db330..47782a06452 100644
--- a/libgcc/config/xtensa/xtensa-config-builtin.h
+++ b/libgcc/config/xtensa/xtensa-config-builtin.h
@@ -130,7 +130,7 @@
 #define XCHAL_HAVE_WINDOWED		__XCHAL_HAVE_WINDOWED
 
 #undef XCHAL_NUM_AREGS
-#define XCHAL_NUM_AREGS			__XCHAL_NUM_AREGS2
+#define XCHAL_NUM_AREGS			__XCHAL_NUM_AREGS
 
 #undef XCHAL_HAVE_WIDE_BRANCHES
 #define XCHAL_HAVE_WIDE_BRANCHES	__XCHAL_HAVE_WIDE_BRANCHES
@@ -140,16 +140,16 @@
 
 
 #undef XCHAL_ICACHE_SIZE
-#define XCHAL_ICACHE_SIZE		__XCHAL_ICACHE_SIZE6384
+#define XCHAL_ICACHE_SIZE		__XCHAL_ICACHE_SIZE
 
 #undef XCHAL_DCACHE_SIZE
-#define XCHAL_DCACHE_SIZE		__XCHAL_DCACHE_SIZE6384
+#define XCHAL_DCACHE_SIZE		__XCHAL_DCACHE_SIZE
 
 #undef XCHAL_ICACHE_LINESIZE
-#define XCHAL_ICACHE_LINESIZE		__XCHAL_ICACHE_LINESIZE2
+#define XCHAL_ICACHE_LINESIZE		__XCHAL_ICACHE_LINESIZE
 
 #undef XCHAL_DCACHE_LINESIZE
-#define XCHAL_DCACHE_LINESIZE		__XCHAL_DCACHE_LINESIZE2
+#define XCHAL_DCACHE_LINESIZE		__XCHAL_DCACHE_LINESIZE
 
 #undef XCHAL_ICACHE_LINEWIDTH
 #define XCHAL_ICACHE_LINEWIDTH		__XCHAL_ICACHE_LINEWIDTH
@@ -165,7 +165,7 @@
 #define XCHAL_HAVE_MMU			__XCHAL_HAVE_MMU
 
 #undef XCHAL_MMU_MIN_PTE_PAGE_SIZE
-#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	__XCHAL_MMU_MIN_PTE_PAGE_SIZE2
+#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	__XCHAL_MMU_MIN_PTE_PAGE_SIZE
 
 
 #undef XCHAL_HAVE_DEBUG
@@ -191,7 +191,7 @@
 #undef XSHAL_ABI
 #undef XTHAL_ABI_WINDOWED
 #undef XTHAL_ABI_CALL0
-#define XSHAL_ABI			__XSHAL_ABITHAL_ABI_WINDOWED
+#define XSHAL_ABI			__XSHAL_ABI
 #define XTHAL_ABI_WINDOWED		__XTHAL_ABI_WINDOWED
 #define XTHAL_ABI_CALL0			__XTHAL_ABI_CALL0