This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch, master, updated. glibc-2.15-908-ga953889

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 15 May 2012 23:34:46 -0000
Subject: GNU C Library master sources branch, master, updated. glibc-2.15-908-ga953889
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  a9538892adfbb9f092e0bb14ff3a1703973968af (commit)
      from  93171016830e1ed4ec77c46cd4c32156d4624c1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a9538892adfbb9f092e0bb14ff3a1703973968af

commit a9538892adfbb9f092e0bb14ff3a1703973968af
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue May 15 23:34:30 2012 +0000

    Split up stackguard-macros.h into sysdeps directories.

diff --git a/ChangeLog b/ChangeLog
index 81854e2..167f869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2012-05-15  Joseph Myers  <joseph@codesourcery.com>
 
+	* elf/stackguard-macros.h: Remove file.
+	* sysdeps/generic/stackguard-macros.h: New file.
+	* sysdeps/i386/stackguard-macros.h: Likewise.
+	* sysdeps/powerpc/powerpc32/stackguard-macros.h: Likewise.
+	* sysdeps/powerpc/powerpc64/stackguard-macros.h: Likewise.
+	* sysdeps/s390/s390-32/stackguard-macros.h: Likewise.
+	* sysdeps/s390/s390-64/stackguard-macros.h: Likewise.
+	* sysdeps/sparc/sparc32/stackguard-macros.h: Likewise.
+	* sysdeps/sparc/sparc64/stackguard-macros.h: Likewise.
+	* sysdeps/x86_64/stackguard-macros.h: Likewise.
+	* nptl/tst-stackguard1.c: Include <stackguard-macros.h> not
+	<elf/stackguard-macros.h>.
+
 	[BZ #14109]
 	* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (elf_vrreg_t): Use
 	__aligned__ in attribute.
diff --git a/elf/stackguard-macros.h b/elf/stackguard-macros.h
deleted file mode 100644
index 0cad315..0000000
--- a/elf/stackguard-macros.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <stdint.h>
-
-#ifdef __i386__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
-#elif defined __x86_64__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x;						\
-     asm ("mov %%fs:%c1, %0" : "=r" (x)				\
-	  : "i" (offsetof (tcbhead_t, stack_guard))); x; })
-#elif defined __powerpc64__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
-#elif defined __powerpc__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
-#elif defined __sparc__ && defined __arch64__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
-#elif defined __sparc__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
-#elif defined __s390x__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
-#elif defined __s390__
-# define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
-#elif !defined STACK_CHK_GUARD
-extern uintptr_t __stack_chk_guard;
-# define STACK_CHK_GUARD __stack_chk_guard
-#endif
diff --git a/nptl/tst-stackguard1.c b/nptl/tst-stackguard1.c
index 4af16c9..c456046 100644
--- a/nptl/tst-stackguard1.c
+++ b/nptl/tst-stackguard1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
 
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <elf/stackguard-macros.h>
+#include <stackguard-macros.h>
 #include <unistd.h>
 
 static const char *command;
diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
new file mode 100644
index 0000000..ababf65
--- /dev/null
+++ b/sysdeps/generic/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+extern uintptr_t __stack_chk_guard;
+#define STACK_CHK_GUARD __stack_chk_guard
diff --git a/sysdeps/i386/stackguard-macros.h b/sysdeps/i386/stackguard-macros.h
new file mode 100644
index 0000000..8c31e19
--- /dev/null
+++ b/sysdeps/i386/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
diff --git a/sysdeps/powerpc/powerpc32/stackguard-macros.h b/sysdeps/powerpc/powerpc32/stackguard-macros.h
new file mode 100644
index 0000000..839f6a4
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
new file mode 100644
index 0000000..9da879c
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
diff --git a/sysdeps/s390/s390-32/stackguard-macros.h b/sysdeps/s390/s390-32/stackguard-macros.h
new file mode 100644
index 0000000..b74c579
--- /dev/null
+++ b/sysdeps/s390/s390-32/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
diff --git a/sysdeps/s390/s390-64/stackguard-macros.h b/sysdeps/s390/s390-64/stackguard-macros.h
new file mode 100644
index 0000000..0cebb5f
--- /dev/null
+++ b/sysdeps/s390/s390-64/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
diff --git a/sysdeps/sparc/sparc32/stackguard-macros.h b/sysdeps/sparc/sparc32/stackguard-macros.h
new file mode 100644
index 0000000..c0b02b0
--- /dev/null
+++ b/sysdeps/sparc/sparc32/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
diff --git a/sysdeps/sparc/sparc64/stackguard-macros.h b/sysdeps/sparc/sparc64/stackguard-macros.h
new file mode 100644
index 0000000..80f0635
--- /dev/null
+++ b/sysdeps/sparc/sparc64/stackguard-macros.h
@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
diff --git a/sysdeps/x86_64/stackguard-macros.h b/sysdeps/x86_64/stackguard-macros.h
new file mode 100644
index 0000000..d7fedb3
--- /dev/null
+++ b/sysdeps/x86_64/stackguard-macros.h
@@ -0,0 +1,6 @@
+#include <stdint.h>
+
+#define STACK_CHK_GUARD \
+  ({ uintptr_t x;						\
+     asm ("mov %%fs:%c1, %0" : "=r" (x)				\
+	  : "i" (offsetof (tcbhead_t, stack_guard))); x; })

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                     |   13 ++++++++++
 elf/stackguard-macros.h                       |   32 -------------------------
 nptl/tst-stackguard1.c                        |    4 +-
 sysdeps/generic/stackguard-macros.h           |    4 +++
 sysdeps/i386/stackguard-macros.h              |    4 +++
 sysdeps/powerpc/powerpc32/stackguard-macros.h |    4 +++
 sysdeps/powerpc/powerpc64/stackguard-macros.h |    4 +++
 sysdeps/s390/s390-32/stackguard-macros.h      |    4 +++
 sysdeps/s390/s390-64/stackguard-macros.h      |    4 +++
 sysdeps/sparc/sparc32/stackguard-macros.h     |    4 +++
 sysdeps/sparc/sparc64/stackguard-macros.h     |    4 +++
 sysdeps/x86_64/stackguard-macros.h            |    6 ++++
 12 files changed, 53 insertions(+), 34 deletions(-)
 delete mode 100644 elf/stackguard-macros.h
 create mode 100644 sysdeps/generic/stackguard-macros.h
 create mode 100644 sysdeps/i386/stackguard-macros.h
 create mode 100644 sysdeps/powerpc/powerpc32/stackguard-macros.h
 create mode 100644 sysdeps/powerpc/powerpc64/stackguard-macros.h
 create mode 100644 sysdeps/s390/s390-32/stackguard-macros.h
 create mode 100644 sysdeps/s390/s390-64/stackguard-macros.h
 create mode 100644 sysdeps/sparc/sparc32/stackguard-macros.h
 create mode 100644 sysdeps/sparc/sparc64/stackguard-macros.h
 create mode 100644 sysdeps/x86_64/stackguard-macros.h


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]