From 44a4ca5e4fd004949da533324aed10247b2ea3e5 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Fri, 12 Oct 2001 19:44:38 +0000
Subject: [PATCH] arit.c: Use __builtin_labs, not abs.

	* 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.

From-SVN: r46234
---
 gcc/ChangeLog          |  9 +++++++++
 gcc/config/cris/arit.c |  4 ++--
 gcc/config/cris/cris.c |  4 ++--
 gcc/config/cris/cris.h | 26 +-------------------------
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a41fa48cf84..ae5a21ef194 100644
--- 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 91f4e0560e9..057ce81d0ad 100644
--- 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 b87a2ac4e83..668811ee010 100644
--- 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 ccba9ae9427..8e62c4119fe 100644
--- 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 */