* pa/elf.h (ASM_DECLARE_FUNCTION_NAME,

	ASM_OUTPUT_EXTERNAL_LIBCALL): Undef before defining.
	* config.gcc (hppa1.1-*-rtems*): Remove duplicate clause.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06881f4..9a04b10 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2001-11-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+       * pa/elf.h (ASM_DECLARE_FUNCTION_NAME,
+       ASM_OUTPUT_EXTERNAL_LIBCALL): Undef before defining.
+       * config.gcc (hppa1.1-*-rtems*): Remove duplicate clause.
+
        * clipper.h (ASM_OUTPUT_REG_POP): Fix typo.
 
        * tlink.c (recompile_files): Copy strings passed to `putenv'.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 81d3c76..2d9f0f2 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -741,13 +741,6 @@ hppa*-*-openbsd*)
        target_cpu_default="MASK_PA_11"
        tmake_file=pa/t-openbsd
        ;;
-hppa1.1-*-rtems*)
-       tm_file="pa/pa-pro.h ${tm_file} pa/pa-pro-end.h libgloss.h pa/rtems.h"
-       tmake_file="pa/t-pro t-rtems"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
-       ;;
 hppa1.1-*-pro*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"

diff --git a/gcc/config/pa/elf.h b/gcc/config/pa/elf.h
index 1fda8ad..76e8dac 100644 (file)
--- a/gcc/config/pa/elf.h
+++ b/gcc/config/pa/elf.h
@@ -40,6 +40,7 @@ do {  \
        output_file_directive ((FILE), main_input_filename); \
    } while (0)
 
+#undef ASM_DECLARE_FUNCTION_NAME
 #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \
 do {  \
   if (TREE_PUBLIC (DECL)) \
@@ -81,6 +82,7 @@ do {  \
    (__main for example).  To make sure all libcall names have section
    info recorded in them, we do it here.  */
 
+#undef ASM_OUTPUT_EXTERNAL_LIBCALL
 #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, RTL) \
   do { fputs ("\t.IMPORT ", FILE);                                     \
        if (!function_label_operand (RTL, VOIDmode))                    \