From 2de1cf8c4ba5a043ea3d0a3998cd789cc3d8b9f5 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 25 Apr 2016 11:13:35 +0000
Subject: [PATCH] cmpd.c (__mspabi_cmpf): Add prototype.

	* config/msp430/cmpd.c (__mspabi_cmpf): Add prototype.
	(__mspabi_cmpd): Likewise.
	* config/msp430/floathidf.c (__floathidf): Likewise.
	* config/msp430/floathisf.c (__floathisf): Likewise
	* config/msp430/floatunhidf.c (__floatunssidf): Likewise.
	* config/msp430/floatunhisf.c (__floatunshisf): Likewise.
	* config/msp430/lib2shift.c (__ashlsi3): Take a signed char as the
	second parameter.
	(__ashrsi3): Likewise.

From-SVN: r235409
---
 libgcc/ChangeLog                   | 12 ++++++++++++
 libgcc/config/msp430/cmpd.c        |  6 ++++++
 libgcc/config/msp430/floathidf.c   |  2 ++
 libgcc/config/msp430/floathisf.c   |  2 ++
 libgcc/config/msp430/floatunhidf.c |  2 ++
 libgcc/config/msp430/floatunhisf.c |  2 ++
 libgcc/config/msp430/lib2shift.c   | 12 ++++++------
 7 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 684c6811f00..b671a56692e 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,15 @@
+2016-04-25  Nick Clifton  <nickc@redhat.com>
+
+	* config/msp430/cmpd.c (__mspabi_cmpf): Add prototype.
+	(__mspabi_cmpd): Likewise.
+	* config/msp430/floathidf.c (__floathidf): Likewise.
+	* config/msp430/floathisf.c (__floathisf): Likewise
+	* config/msp430/floatunhidf.c (__floatunssidf): Likewise.
+	* config/msp430/floatunhisf.c (__floatunshisf): Likewise.
+	* config/msp430/lib2shift.c (__ashlsi3): Take a signed char as the
+	second parameter.
+	(__ashrsi3): Likewise.
+
 2016-04-21  Waldemar Brodkorb  <wbx@openadk.org>
 
 	* config/m68k/linux-atomic.c: Do not include unistd.h
diff --git a/libgcc/config/msp430/cmpd.c b/libgcc/config/msp430/cmpd.c
index 03e690dff53..c65c466c7ba 100644
--- a/libgcc/config/msp430/cmpd.c
+++ b/libgcc/config/msp430/cmpd.c
@@ -1,4 +1,7 @@
 /* Public domain.  */
+
+int __mspabi_cmpf (float, float);
+
 int
 __mspabi_cmpf (float x, float y)
 {
@@ -8,6 +11,9 @@ __mspabi_cmpf (float x, float y)
     return 1;
   return 0;
 }
+
+int __mspabi_cmpd (double, double);
+
 int
 __mspabi_cmpd (double x, double y)
 {
diff --git a/libgcc/config/msp430/floathidf.c b/libgcc/config/msp430/floathidf.c
index 304731d518b..a1144223c6a 100644
--- a/libgcc/config/msp430/floathidf.c
+++ b/libgcc/config/msp430/floathidf.c
@@ -1,6 +1,8 @@
 /* Public domain.  */
 extern double __floatsidf (long);
 
+double __floathidf (int);
+
 double
 __floathidf (int u)
 {
diff --git a/libgcc/config/msp430/floathisf.c b/libgcc/config/msp430/floathisf.c
index 64e5d805d21..4b4c16c81ad 100644
--- a/libgcc/config/msp430/floathisf.c
+++ b/libgcc/config/msp430/floathisf.c
@@ -4,6 +4,8 @@ typedef float SFtype __attribute__ ((mode (SF)));
 
 extern SFtype __floatsisf (unsigned long);
 
+SFtype __floathisf (HItype);
+
 SFtype
 __floathisf (HItype u)
 {
diff --git a/libgcc/config/msp430/floatunhidf.c b/libgcc/config/msp430/floatunhidf.c
index f13b5507692..a02a953d54f 100644
--- a/libgcc/config/msp430/floatunhidf.c
+++ b/libgcc/config/msp430/floatunhidf.c
@@ -5,6 +5,8 @@ typedef float DFtype __attribute__ ((mode (DF)));
 
 extern DFtype __floatunsidf (unsigned long);
 
+DFtype __floatunhidf (UHItype);
+
 DFtype
 __floatunhidf (UHItype u)
 {
diff --git a/libgcc/config/msp430/floatunhisf.c b/libgcc/config/msp430/floatunhisf.c
index ea920bd853a..423627ab1cd 100644
--- a/libgcc/config/msp430/floatunhisf.c
+++ b/libgcc/config/msp430/floatunhisf.c
@@ -5,6 +5,8 @@ typedef float SFtype __attribute__ ((mode (SF)));
 
 extern SFtype __floatunsisf (unsigned long);
 
+SFtype __floatunhisf (UHItype);
+
 SFtype
 __floatunhisf (UHItype u)
 {
diff --git a/libgcc/config/msp430/lib2shift.c b/libgcc/config/msp430/lib2shift.c
index d7e4d24096a..57e70df1fb3 100644
--- a/libgcc/config/msp430/lib2shift.c
+++ b/libgcc/config/msp430/lib2shift.c
@@ -28,10 +28,10 @@ typedef unsigned int  uint32_type   __attribute__ ((mode (SI)));
 typedef          int  sint16_type   __attribute__ ((mode (HI)));
 typedef unsigned int  uint16_type   __attribute__ ((mode (HI)));
 
-uint32_type __ashlsi3 (uint32_type in, char bit);
-sint32_type __ashrsi3 (sint32_type in, char bit);
-int __clrsbhi2 (sint16_type x);
-extern int __clrsbsi2 (sint32_type x);
+uint32_type __ashlsi3 (uint32_type, signed char);
+sint32_type __ashrsi3 (sint32_type, signed char);
+int         __clrsbhi2 (sint16_type);
+extern int  __clrsbsi2 (sint32_type);
 
 typedef struct
 {
@@ -43,7 +43,7 @@ typedef struct
 } dd;
 
 uint32_type
-__ashlsi3 (uint32_type in, char bit)
+__ashlsi3 (uint32_type in, signed char bit)
 {
   uint16_type h, l;
   dd d;
@@ -77,7 +77,7 @@ __ashlsi3 (uint32_type in, char bit)
 }
 
 sint32_type
-__ashrsi3 (sint32_type in, char bit)
+__ashrsi3 (sint32_type in, signed char bit)
 {
   sint16_type h;
   uint16_type l;