From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Fri, 1 Oct 2010 23:40:36 +0000 (-0400)
Subject: sh: Add "extern "C"" to __set_fpscr function
X-Git-Tag: glibc-2.13~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf7a1eb81d3eb37e3dc2523f8b0ecccfe0ba8713;p=thirdparty%2Fglibc.git

sh: Add "extern "C"" to __set_fpscr function
---

diff --git a/ChangeLog b/ChangeLog
index 62eb2ff130a..a49e12a0ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-28  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+	* sysdeps/sh/sh4/fpu/fpu_control.h: Add 'extern "C"' protection to
+	__set_fpscr.
+
 2010-09-30  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux_fsinfo.h (BTRFS_SUPER_MAGIC): Define.
diff --git a/sysdeps/sh/sh4/fpu/fpu_control.h b/sysdeps/sh/sh4/fpu/fpu_control.h
index d1be46d12fc..ae50070519a 100644
--- a/sysdeps/sh/sh4/fpu/fpu_control.h
+++ b/sysdeps/sh/sh4/fpu/fpu_control.h
@@ -1,5 +1,5 @@
 /* FPU control word definitions.  SH version.
-   Copyright (C) 1999, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,8 @@
 #ifndef _FPU_CONTROL_H
 #define _FPU_CONTROL_H
 
+#include <features.h>
+
 /* masking of interrupts */
 #define _FPU_MASK_VM	0x0800	/* Invalid operation */
 #define _FPU_MASK_ZM	0x0400	/* Division by zero  */
@@ -45,6 +47,8 @@ typedef unsigned int fpu_control_t;
 #define _FPU_GETCW(cw) __asm__ ("sts fpscr,%0" : "=r" (cw))
 
 #if defined __GNUC__
+__BEGIN_DECLS
+
 /* GCC provides this function.  */
 extern void __set_fpscr (unsigned long);
 #define _FPU_SETCW(cw) __set_fpscr ((cw))
@@ -55,4 +59,5 @@ extern void __set_fpscr (unsigned long);
 /* Default control word set at startup.	 */
 extern fpu_control_t __fpu_control;
 
+__END_DECLS
 #endif /* _FPU_CONTROL_H */