From: Nick Clifton <nickc@cygnus.com>
Date: Tue, 1 Dec 1998 10:28:32 +0000 (+0000)
Subject: Fix problems encountered after recent egcs->devo marge
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbc1b3f793d63bc581e27953718c61a072711323;p=gcc.git

Fix problems encountered after recent egcs->devo marge

From-SVN: r24027
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee4b9ff74cb..cd8ba2ba78d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+Tue Dec  1 10:23:16 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* config/arm/t-arm-elf (LIBGCC2_CFLAGS): Define inhibit_libc.
+
+Tue Dec  1 10:22:18 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* config/arm/unknown-elf.h (ASM_OUTPUT_DWARF2_ADDR_CONST): Remove
+	use of user-label_prefix.
+
 Tue Dec  1 17:58:26 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* local-alloc.c (function_invariant_p): New function.
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
index bb0a3d50723..8071259c722 100644
--- a/gcc/config/arm/t-arm-elf
+++ b/gcc/config/arm/t-arm-elf
@@ -29,3 +29,5 @@ MULTILIB_MATCHES  =
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
+
+LIBGCC2_CFLAGS = -Dinhibit_libc
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
index d23ba6f7f9a..5d173cfd9ff 100644
--- a/gcc/config/arm/unknown-elf.h
+++ b/gcc/config/arm/unknown-elf.h
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Run-time Target Specification.  */
-#define TARGET_VERSION	fputs (" (ARM non-Linux)", stderr);
+#define TARGET_VERSION	fputs (" (ARM/ELF non-Linux)", stderr);
 
 /* If you don't define HAVE_ATEXIT, and the object file format/OS/whatever 
    does not support constructors/destructors, then gcc implements destructors
@@ -96,7 +96,7 @@ func_ptr __DTOR_END__[1] = { (func_ptr) 0 };
 #define ASM_OUTPUT_SECTION_NAME(STREAM, DECL, NAME, RELOC) \
 do {								\
   if ((DECL) && TREE_CODE (DECL) == FUNCTION_DECL)		\
-    fprintf (STREAM, "\t.section %s,\"ax\",@progbits\n", (NAME));		\
+    fprintf (STREAM, "\t.section %s,\"ax\",@progbits\n", (NAME)); \
   else if ((DECL) && DECL_READONLY_SECTION (DECL, RELOC))	\
     fprintf (STREAM, "\t.section %s,\"a\"\n", (NAME));		\
   else								\
@@ -108,11 +108,7 @@ do {								\
 #define UNALIGNED_WORD_ASM_OP ".4byte"
 
 #define ASM_OUTPUT_DWARF2_ADDR_CONST(FILE,ADDR)                  \
-     if (((ADDR)[0] == '.') && ((ADDR)[1] == 'L'))              \
-       fprintf ((FILE), "\t%s\t%s", UNALIGNED_WORD_ASM_OP, (ADDR));	\
-     else                  					\
-       fprintf ((FILE), "\t%s\t%s%s", 				\
-             UNALIGNED_WORD_ASM_OP, USER_LABEL_PREFIX, (ADDR))
+     fprintf ((FILE), "\t%s\t%s", UNALIGNED_WORD_ASM_OP, ADDR)
 
 #define ASM_OUTPUT_DWARF_ADDR_CONST(FILE,RTX)                   \
 do {								\
@@ -131,7 +127,7 @@ do {								\
 #define UNIQUE_SECTION(DECL,RELOC)				\
 do {								\
   int len;							\
-  char *name, *string, *prefix;					\
+  char * name, * string, * prefix;				\
 								\
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (DECL));	\
 								\
@@ -161,6 +157,6 @@ do {								\
 
 #define CPP_APCS_PC_DEFAULT_SPEC	"-D__APCS_32__"
 #define SUBTARGET_CPU_DEFAULT 		TARGET_CPU_arm7tdmi
-     
+
 /* Now get the routine arm-elf definitions.  */
 #include "arm/elf.h"