Fix problems encountered after recent egcs->devo marge

From-SVN: r24027

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee4b9ff74cb7aecd5fb939b37773cce49f3a4f6c..cd8ba2ba78d81457149ba586c6aae158c2919938 100644 (file)
--- 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 bb0a3d50723be2c1b297d060a7615385deb76c8d..8071259c722a01be89013c0ee034e2984cd6c0dc 100644 (file)
--- 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 d23ba6f7f9a1e8f23f4e983b5241f15aeb9c3dd8..5d173cfd9ff5f07d8503ca83827f905272867259 100644 (file)
--- 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"