* config/cris/arit.c: Use __builtin_labs, not abs.

	* config/cris/cris.h (SET_STRIPPABLE_EXECUTABLE): Don't define.

	* config/cris/cris.c (cris_target_asm_function_epilogue): Move
	misplaced sprintf and fprintf argument.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a41fa48..ae5a21e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-12  Hans-Peter Nilsson  <hp@axis.com>
+
+       * config/cris/arit.c: Use __builtin_labs, not abs.
+
+       * config/cris/cris.h (SET_STRIPPABLE_EXECUTABLE): Don't define.
+
+       * config/cris/cris.c (cris_target_asm_function_epilogue): Move
+       misplaced sprintf and fprintf argument.
+
 2001-10-12  Zack Weinberg  <zack@codesourcery.com>
 
        * ABOUT-NLS, aclocal.m4: Update i18n framework from gettext 0.10.40.

diff --git a/gcc/config/cris/arit.c b/gcc/config/cris/arit.c
index 91f4e05..057ce81 100644 (file)
--- a/gcc/config/cris/arit.c
+++ b/gcc/config/cris/arit.c
@@ -223,7 +223,7 @@ __Div (long a, long b)
      which is still 32 bits.  */
 
   sign = a ^ b;
-  result = __Udiv (abs (a), abs (b));
+  result = __Udiv (__builtin_labs (a), __builtin_labs (b));
 
   return  (sign < 0) ? -result : result;
 }
@@ -286,7 +286,7 @@ __Mod (long a, long b)
 {
   long result;
 
-  result = __Umod (abs (a), abs (b));
+  result = __Umod (__builtin_labs (a), __builtin_labs (b));
 
   return (a < 0) ? -result : result;
 }

diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index b87a2ac..668811e 100644 (file)
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -1058,7 +1058,7 @@ cris_target_asm_function_epilogue (file, size)
        /* Flush previous non-movem:ed registers.  */
        if (*save_last && file)
          fprintf (file, save_last);
-       sprintf (save_last, "\tPop $%s\n");
+       sprintf (save_last, "\tPop $%s\n", reg_names[regno]);
       }
 
   if (last_movem_reg != -1)
@@ -1140,7 +1140,7 @@ cris_target_asm_function_epilogue (file, size)
            {
              /* The installed EH-return address is in *this* frame, so we
                 need to pop it before we return.  */
-             fprintf (file, "\tpop $srp\n", reg_names[CRIS_STACKADJ_REG]);
+             fprintf (file, "\tpop $srp\n");
              fprintf (file, "\tret\n");
              fprintf (file, "\tadd.d $%s,$sp\n", reg_names[CRIS_STACKADJ_REG]);
            }

diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index ccba9ae..8e62c41 100644 (file)
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -1714,31 +1714,7 @@ struct cum_args {int regs;};
 /* (no definitions) */
 
 /* Node: Macros for Initialization */
-
-/* We don't want to use "strip" for anything linked with "-melinux"
-   "-shlib", seen by the linker as "-Ur -d -Bdynamic" in combination.  */
-#define SET_STRIPPABLE_EXECUTABLE(DS, ARGC, ARGV)              \
-  do                                                           \
-    {                                                          \
-      int i;                                                   \
-      int flags = 0;                                           \
-      for (i = (ARGC) - 1; i > 0; i--)                         \
-       {                                                       \
-         if (strcmp ((ARGV)[i], "-Ur") == 0)                   \
-           flags |= 1;                                         \
-         else if (strcmp ((ARGV)[i], "-d") == 0)               \
-           flags |= 2;                                         \
-         else if (strcmp ((ARGV)[i], "-Bdynamic") == 0)        \
-           flags |= 4;                                         \
-                                                               \
-         if (flags == 7)                                       \
-           break;                                              \
-       }                                                       \
-                                                               \
-      (DS) = (flags != 7);                                     \
-    }                                                          \
-  while (0)
-
+/* (no definitions) */
 
 /* Node: Instruction Output */