[Commits] r16896 - in /fsf/trunk/ports: ./ sysdeps/m68k/ sysdeps/m68k/m680x0/fpu/ sysdeps/unix/sysv/linux/m68k/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Jan 30 00:01:53 2012
New Revision: 16896

Log:
Import glibc-ports-mainline for 2012-01-30

Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/sysdeps/m68k/asm-syntax.h
    fsf/trunk/ports/sysdeps/m68k/m680x0/fpu/s_nextafterl.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Mon Jan 30 00:01:53 2012
@@ -1,3 +1,9 @@
+2012-01-29  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* 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@xxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/fpu/bits/fenv.h (FE_DFL_ENV, FE_NOMASK_ENV): Use

Modified: fsf/trunk/ports/sysdeps/m68k/asm-syntax.h
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/asm-syntax.h (original)
+++ fsf/trunk/ports/sysdeps/m68k/asm-syntax.h Mon Jan 30 00:01:53 2012
@@ -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

Modified: fsf/trunk/ports/sysdeps/m68k/m680x0/fpu/s_nextafterl.c
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/m680x0/fpu/s_nextafterl.c (original)
+++ fsf/trunk/ports/sysdeps/m68k/m680x0/fpu/s_nextafterl.c Mon Jan 30 00:01:53 2012
@@ -29,12 +29,7 @@
 #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;

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h Mon Jan 30 00:01:53 2012
@@ -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__
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits