From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 29 Jan 2012 15:23:28 +0000 (+0100)
Subject: m68k: remove __STDC__ conditionals
X-Git-Tag: glibc-2.16-ports-before-merge~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53bce1b5f9f7a78076798acbe11f438d063b5e04;p=thirdparty%2Fglibc.git

m68k: remove __STDC__ conditionals
---

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index a668b4e81de..4b0e7ba4818 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,9 @@
+2012-01-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/asm-syntax.h: Remove __STDC__ conditionals.
+	* sysdeps/m68k/m680x0/fpu/s_nextafterl.c: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise.
+
 2012-01-08  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/m68k/fpu/bits/fenv.h (FE_DFL_ENV, FE_NOMASK_ENV): Use
diff --git a/sysdeps/m68k/asm-syntax.h b/sysdeps/m68k/asm-syntax.h
index 4a5e14e6551..04b8e594b21 100644
--- a/sysdeps/m68k/asm-syntax.h
+++ b/sysdeps/m68k/asm-syntax.h
@@ -52,15 +52,10 @@
 #define MEM_DISP(base,displacement)(displacement,R(base))
 #define MEM_PREDEC(memory_base)-(R(memory_base))
 #define MEM_POSTINC(memory_base)(R(memory_base))+
-#ifdef __STDC__
 #define MEM_INDX_(base,idx,size_suffix)(R(base),R(idx##.##size_suffix))
 #define MEM_INDX(base,idx,size_suffix)MEM_INDX_(base,idx,size_suffix)
 #define MEM_INDX1_(base,idx,size_suffix,scale)(R(base),R(idx##.##size_suffix*scale))
 #define MEM_INDX1(base,idx,size_suffix,scale)MEM_INDX1_(base,idx,size_suffix,scale)
-#else
-#define MEM_INDX(base,idx,size_suffix)(R(base),R(idx).size_suffix)
-#define MEM_INDX1(base,idx,size_suffix,scale)(R(base),R(idx).size_suffix*scale)
-#endif
 #define TEXT .text
 #define ALIGN .align ALIGNARG(2)
 #define GLOBL .globl
diff --git a/sysdeps/m68k/m680x0/fpu/s_nextafterl.c b/sysdeps/m68k/m680x0/fpu/s_nextafterl.c
index 70ab5a47842..dcccdf17626 100644
--- a/sysdeps/m68k/m680x0/fpu/s_nextafterl.c
+++ b/sysdeps/m68k/m680x0/fpu/s_nextafterl.c
@@ -29,12 +29,7 @@ static char rcsid[] = "$NetBSD: $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	long double __nextafterl(long double x, long double y)
-#else
-	long double __nextafterl(x,y)
-	long double x,y;
-#endif
+long double __nextafterl(long double x, long double y)
 {
 	int32_t ix,iy,esx,esy;
 	u_int32_t hx,hy,lx,ly;
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 1e2755493ba..5523fa64f09 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -29,11 +29,7 @@
    of the kernel.  But these symbols do not follow the SYS_* syntax
    so we have to redefine the `SYS_ify' macro here.  */
 #undef SYS_ify
-#ifdef __STDC__
-# define SYS_ify(syscall_name)	__NR_##syscall_name
-#else
-# define SYS_ify(syscall_name)	__NR_/**/syscall_name
-#endif
+#define SYS_ify(syscall_name)	__NR_##syscall_name
 
 #ifdef __ASSEMBLER__