about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-03-01 13:42:16 -0800
committerH.J. Lu <hjl.tools@gmail.com>2012-03-01 14:07:57 -0800
commit270dc44e06b21f39c28af086ab7736462b65e7a2 (patch)
treed1afbf8aca2413eee70c8744dadd75588bf0b0c6
parenta43c8143e728159c31223da5c0d25dd94e6a3379 (diff)
downloadglibc-hjl/x32/release/2.12.tar.gz
glibc-hjl/x32/release/2.12.tar.xz
glibc-hjl/x32/release/2.12.zip
Restore uc_flags to unsigned long in ucontext hjl/x32/release/2.12
struct ucontext in <sys/ucontext.h> is used for user-level context
and is kernel indenpendent. It is separate from struct ucontext
defined in kernel header files.
-rw-r--r--ChangeLog.x325
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32
index 584c79ba21..805d7dd54b 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,3 +1,8 @@
+2012-03-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h (ucontext): Restore
+	unsigned long int on uc_flags.
+
 2012-02-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Remove
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h b/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
index 5bc8f0efdd..75e37c4994 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
@@ -133,7 +133,7 @@ typedef struct
 /* Userlevel context.  */
 typedef struct ucontext
   {
-    unsigned long long int uc_flags;
+    unsigned long int uc_flags;
     struct ucontext *uc_link;
     stack_t uc_stack;
     mcontext_t uc_mcontext;