* config/xtensa/elf.h (SIZE_TYPE, PTRDIFF_TYPE, USER_LABEL_PREFIX):

	Remove redundant macros.
	(WCHAR_TYPE, WCHAR_TYPE_SIZE): Change to "short unsigned int".
	(LOCAL_LABEL_PREFIX): Define unconditionally.
	(NO_DOT_IN_LABEL): Clarify comment.
	* config/xtensa/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Add explicit
	definition to "long int".

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66242 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c44265..c22b671 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-29  Bob Wilson  <bob.wilson@acm.org>
+
+       * config/xtensa/elf.h (SIZE_TYPE, PTRDIFF_TYPE, USER_LABEL_PREFIX):
+       Remove redundant macros.
+       (WCHAR_TYPE, WCHAR_TYPE_SIZE): Change to "short unsigned int".
+       (LOCAL_LABEL_PREFIX): Define unconditionally.
+       (NO_DOT_IN_LABEL): Clarify comment.
+       * config/xtensa/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Add explicit
+       definition to "long int".
+
 2003-04-29  Alexander Kabaev  <kan@FreeBSD.ORG>
 
        bootstrap/10452

diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
index 5620e95..4bc4f7f 100644 (file)
--- a/gcc/config/xtensa/elf.h
+++ b/gcc/config/xtensa/elf.h
@@ -1,6 +1,6 @@
 /* Xtensa/Elf configuration.
    Derived from the configuration for GCC for Intel i386 running Linux.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001,2003 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -41,17 +41,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #undef TARGET_VERSION
 #define TARGET_VERSION fputs (" (Xtensa/ELF)", stderr);
 
-#undef SIZE_TYPE
-#define SIZE_TYPE "unsigned int"
-
-#undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE "int"
-
 #undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
+#define WCHAR_TYPE "short unsigned int"
 
 #undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE BITS_PER_WORD
+#define WCHAR_TYPE_SIZE 16
 
 #undef ASM_SPEC
 #define ASM_SPEC "%{v} %{mno-density:--no-density} \
@@ -81,29 +75,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
       %{rdynamic:-export-dynamic} \
     %{static:-static}}}"
 
-/* Local compiler-generated symbols must have a prefix that the assembler
-   understands.   By default, this is $, although some targets (e.g.,
-   NetBSD-ELF) need to override this. */
-
-#ifndef LOCAL_LABEL_PREFIX
+#undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX     "."
-#endif
-
-/* By default, external symbols do not have an underscore prepended. */
 
-#ifndef USER_LABEL_PREFIX
-#define USER_LABEL_PREFIX      ""
-#endif
-
-/* Define this macro if the assembler does not accept the character
-   "." in label names.  By default constructors and destructors in G++
-   have names that use ".".  If this macro is defined, these names
-   are rewritten to avoid ".". */
-#define NO_DOT_IN_LABEL
-
-/* Define NO_DOLLAR_IN_LABEL in your favorite tm file if your assembler
-   doesn't allow $ in symbol names.  */
+/* Avoid dots for compatibility with VxWorks.  */
 #undef NO_DOLLAR_IN_LABEL
+#define NO_DOT_IN_LABEL
 
 /* Do not force "-fpic" for this target.  */
 #define XTENSA_ALWAYS_PIC 0

diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
index 1930bac..b364ed9 100644 (file)
--- a/gcc/config/xtensa/linux.h
+++ b/gcc/config/xtensa/linux.h
@@ -34,6 +34,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #undef TARGET_VERSION
 #define TARGET_VERSION fputs (" (Xtensa GNU/Linux with ELF)", stderr);
 
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
 #undef ASM_SPEC
 #define ASM_SPEC "%{v} %{mno-density:--no-density} \
                   %{mtext-section-literals:--text-section-literals} \