[commits] r12407 - in /fsf/trunk/ports: ChangeLog.m68k sysdeps/m68k/stackinfo.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Dec 27 00:04:45 2010
New Revision: 12407

Log:
Import glibc-ports-mainline for 2010-12-27

Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/sysdeps/m68k/stackinfo.h

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Mon Dec 27 00:04:45 2010
@@ -1,3 +1,7 @@
+2010-12-26  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/m68k/stackinfo.h (DEFAULT_STACK_PERMS): Define.
+
 2010-11-05  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/fchownat.c: Include

Modified: fsf/trunk/ports/sysdeps/m68k/stackinfo.h
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/stackinfo.h (original)
+++ fsf/trunk/ports/sysdeps/m68k/stackinfo.h Mon Dec 27 00:04:45 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 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
@@ -22,7 +22,13 @@
 #ifndef _STACKINFO_H
 #define _STACKINFO_H	1
 
+#include <elf.h>
+
 /* On m68k the stack grows down.  */
 #define _STACK_GROWS_DOWN	1
 
+/* Default to an executable stack.  PF_X can be overridden if PT_GNU_STACK
+   is present, but it is presumed absent.  */
+#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X)
+
 #endif	/* stackinfo.h */