This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-81-g3129cfc
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Jul 2012 11:29:25 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-81-g3129cfc
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 3129cfc6ec7be65a0bdc1f82432ee421c1c65a77 (commit)
from b1b2aaf8eb9eed301ea8f65b96844568ca017f8b (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=3129cfc6ec7be65a0bdc1f82432ee421c1c65a77
commit 3129cfc6ec7be65a0bdc1f82432ee421c1c65a77
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu Jul 26 11:29:07 2012 +0000
Move testsuite audit definitions to sysdeps tst-audit.h files.
diff --git a/ChangeLog b/ChangeLog
index 6be197e..36a9053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+2012-07-26 Joseph Myers <joseph@codesourcery.com>
+
+ * elf/tst-auditmod1.c (pltenter): Remove all definitions of macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ Update #error for removed macros to refer only to definitions in
+ tst-audit.h.
+ * elf/tst-auditmod3b.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * elf/tst-auditmod4b.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * elf/tst-auditmod5b.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * elf/tst-auditmod6b.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * elf/tst-auditmod6c.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * elf/tst-auditmod7b.c (pltenter): Remove all definitions of
+ macro.
+ (pltexit): Likewise.
+ (La_regs): Likewise.
+ (La_retval): Likewise.
+ (int_retval): Likewise.
+ * sysdeps/generic/tst-audit.h: Update comment to refer only to
+ macro definitions in tst-audit.h.
+ * sysdeps/i386/tst-audit.h: New file.
+ * sysdeps/powerpc/powerpc32/tst-audit.h: Likewise.
+ * sysdeps/powerpc/powerpc64/tst-audit.h: Likewise.
+ * sysdeps/s390/s390-32/tst-audit.h: Likewise.
+ * sysdeps/s390/s390-64/tst-audit.h: Likewise.
+ * sysdeps/sh/tst-audit.h: Likewise.
+ * sysdeps/sparc/sparc32/tst-audit.h: Likewise.
+ * sysdeps/sparc/sparc64/tst-audit.h: Likewise.
+ * sysdeps/x86_64/tst-audit.h: Likewise.
+
2012-07-26 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Add __THROW for
diff --git a/elf/tst-auditmod1.c b/elf/tst-auditmod1.c
index 108d6de..227a3b6 100644
--- a/elf/tst-auditmod1.c
+++ b/elf/tst-auditmod1.c
@@ -102,79 +102,10 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifdef __i386__
-# define pltenter la_i86_gnu_pltenter
-# define pltexit la_i86_gnu_pltexit
-# define La_regs La_i86_regs
-# define La_retval La_i86_retval
-# define int_retval lrv_eax
-#elif defined __x86_64__
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-# else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-# endif
-# define int_retval lrv_rax
-#elif defined __powerpc__ && __WORDSIZE == 32
-# define pltenter la_ppc32_gnu_pltenter
-# define pltexit la_ppc32_gnu_pltexit
-# define La_regs La_ppc32_regs
-# define La_retval La_ppc32_retval
-# define int_retval lrv_r3
-#elif defined __powerpc__ && __WORDSIZE == 64
-# define pltenter la_ppc64_gnu_pltenter
-# define pltexit la_ppc64_gnu_pltexit
-# define La_regs La_ppc64_regs
-# define La_retval La_ppc64_retval
-# define int_retval lrv_r3
-#elif defined __sh__
-# define pltenter la_sh_gnu_pltenter
-# define pltexit la_sh_gnu_pltexit
-# define La_regs La_sh_regs
-# define La_retval La_sh_retval
-# define int_retval lrv_r0
-#elif defined __alpha__
-# define pltenter la_alpha_gnu_pltenter
-# define pltexit la_alpha_gnu_pltexit
-# define La_regs La_alpha_regs
-# define La_retval La_alpha_retval
-# define int_retval lrv_r0
-#elif defined __s390__ && __WORDSIZE == 32
-# define pltenter la_s390_32_gnu_pltenter
-# define pltexit la_s390_32_gnu_pltexit
-# define La_regs La_s390_32_regs
-# define La_retval La_s390_32_retval
-# define int_retval lrv_r2
-#elif defined __s390__ && __WORDSIZE == 64
-# define pltenter la_s390_64_gnu_pltenter
-# define pltexit la_s390_64_gnu_pltexit
-# define La_regs La_s390_64_regs
-# define La_retval La_s390_64_retval
-# define int_retval lrv_r2
-#elif defined __sparc__ && __WORDSIZE == 32
-# define pltenter la_sparc32_gnu_pltenter
-# define pltexit la_sparc32_gnu_pltexit
-# define La_regs La_sparc32_regs
-# define La_retval La_sparc32_retval
-# define int_retval lrv_reg[0]
-#elif defined __sparc__ && __WORDSIZE == 64
-# define pltenter la_sparc64_gnu_pltenter
-# define pltexit la_sparc64_gnu_pltexit
-# define La_regs La_sparc64_regs
-# define La_retval La_sparc64_retval
-# define int_retval lrv_reg[0]
-#endif
-
#include <tst-audit.h>
#if (!defined (pltenter) || !defined (pltexit) || !defined (La_regs) \
|| !defined (La_retval) || !defined (int_retval))
-# error "architecture specific code needed in sysdeps/CPU/tst-audit.h or here"
+# error "architecture specific code needed in sysdeps/CPU/tst-audit.h"
#endif
diff --git a/elf/tst-auditmod3b.c b/elf/tst-auditmod3b.c
index a9bb0e2..1a41ca8 100644
--- a/elf/tst-auditmod3b.c
+++ b/elf/tst-auditmod3b.c
@@ -105,19 +105,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
ElfW(Addr)
diff --git a/elf/tst-auditmod4b.c b/elf/tst-auditmod4b.c
index 7778d6a..80aaedc 100644
--- a/elf/tst-auditmod4b.c
+++ b/elf/tst-auditmod4b.c
@@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
#ifdef __AVX__
diff --git a/elf/tst-auditmod5b.c b/elf/tst-auditmod5b.c
index 3a42215..576183d 100644
--- a/elf/tst-auditmod5b.c
+++ b/elf/tst-auditmod5b.c
@@ -95,19 +95,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
ElfW(Addr)
diff --git a/elf/tst-auditmod6b.c b/elf/tst-auditmod6b.c
index a9fe5dc..b1c155a 100644
--- a/elf/tst-auditmod6b.c
+++ b/elf/tst-auditmod6b.c
@@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
#ifdef __AVX__
diff --git a/elf/tst-auditmod6c.c b/elf/tst-auditmod6c.c
index 9b1063b..88adb21 100644
--- a/elf/tst-auditmod6c.c
+++ b/elf/tst-auditmod6c.c
@@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-# ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
#ifdef __AVX__
diff --git a/elf/tst-auditmod7b.c b/elf/tst-auditmod7b.c
index 1ae9e72..68052ef 100644
--- a/elf/tst-auditmod7b.c
+++ b/elf/tst-auditmod7b.c
@@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return sym->st_value;
}
-#ifndef __ILP32__
-# define pltenter la_x86_64_gnu_pltenter
-# define pltexit la_x86_64_gnu_pltexit
-# define La_regs La_x86_64_regs
-# define La_retval La_x86_64_retval
-#else
-# define pltenter la_x32_gnu_pltenter
-# define pltexit la_x32_gnu_pltexit
-# define La_regs La_x32_regs
-# define La_retval La_x32_retval
-#endif
-#define int_retval lrv_rax
-
#include <tst-audit.h>
#ifdef __AVX__
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 65536e5..3094fcd 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,7 @@
+2012-07-26 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/alpha/tst-audit.h (int_retval): Define.
+
2012-07-26 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (siginfo_t): Add
diff --git a/ports/sysdeps/alpha/tst-audit.h b/ports/sysdeps/alpha/tst-audit.h
index 7e3022a..44e0db4 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/ports/sysdeps/alpha/tst-audit.h
@@ -21,3 +21,4 @@
#define pltexit la_alpha_gnu_pltexit
#define La_regs La_alpha_regs
#define La_retval La_alpha_retval
+#define int_retval lrv_r0
diff --git a/sysdeps/generic/tst-audit.h b/sysdeps/generic/tst-audit.h
index 402e7c0..45bc603 100644
--- a/sysdeps/generic/tst-audit.h
+++ b/sysdeps/generic/tst-audit.h
@@ -1,5 +1,5 @@
-/* Some machines have these macros defined in elf/tst-auditmod1.c directly.
- New machines can supply a tst-audit.h to define these macros used there.
+/* Machines can supply a tst-audit.h to define these macros used in
+ elf/tst-auditmod1.c.
# define pltenter la_CPU_gnu_pltenter
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/i386/tst-audit.h
similarity index 77%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/i386/tst-audit.h
index 7e3022a..082c559 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/i386/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. i386 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_i86_gnu_pltenter
+#define pltexit la_i86_gnu_pltexit
+#define La_regs La_i86_regs
+#define La_retval La_i86_retval
+#define int_retval lrv_eax
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/powerpc/powerpc32/tst-audit.h
similarity index 76%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/powerpc/powerpc32/tst-audit.h
index 7e3022a..3faac8d 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/powerpc/powerpc32/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. PowerPC32 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_ppc32_gnu_pltenter
+#define pltexit la_ppc32_gnu_pltexit
+#define La_regs La_ppc32_regs
+#define La_retval La_ppc32_retval
+#define int_retval lrv_r3
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/powerpc/powerpc64/tst-audit.h
similarity index 76%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/powerpc/powerpc64/tst-audit.h
index 7e3022a..cee3f5b 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/powerpc/powerpc64/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. PowerPC64 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_ppc64_gnu_pltenter
+#define pltexit la_ppc64_gnu_pltexit
+#define La_regs La_ppc64_regs
+#define La_retval La_ppc64_retval
+#define int_retval lrv_r3
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/s390/s390-32/tst-audit.h
similarity index 75%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/s390/s390-32/tst-audit.h
index 7e3022a..051e5ab 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/s390/s390-32/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. S/390 32-bit version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_s390_32_gnu_pltenter
+#define pltexit la_s390_32_gnu_pltexit
+#define La_regs La_s390_32_regs
+#define La_retval La_s390_32_retval
+#define int_retval lrv_r2
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/s390/s390-64/tst-audit.h
similarity index 75%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/s390/s390-64/tst-audit.h
index 7e3022a..3b4fac4 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/s390/s390-64/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. S/390 64-bit version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_s390_64_gnu_pltenter
+#define pltexit la_s390_64_gnu_pltexit
+#define La_regs La_s390_64_regs
+#define La_retval La_s390_64_retval
+#define int_retval lrv_r2
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/sh/tst-audit.h
similarity index 78%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/sh/tst-audit.h
index 7e3022a..bb8db98 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/sh/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. SH version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_sh_gnu_pltenter
+#define pltexit la_sh_gnu_pltexit
+#define La_regs La_sh_regs
+#define La_retval La_sh_retval
+#define int_retval lrv_r0
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/sparc/sparc32/tst-audit.h
similarity index 75%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/sparc/sparc32/tst-audit.h
index 7e3022a..f3aaf13 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/sparc/sparc32/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. SPARC32 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_sparc32_gnu_pltenter
+#define pltexit la_sparc32_gnu_pltexit
+#define La_regs La_sparc32_regs
+#define La_retval La_sparc32_retval
+#define int_retval lrv_reg[0]
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/sparc/sparc64/tst-audit.h
similarity index 75%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/sparc/sparc64/tst-audit.h
index 7e3022a..7dd4701 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/sparc/sparc64/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. SPARC64 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#define pltenter la_sparc64_gnu_pltenter
+#define pltexit la_sparc64_gnu_pltexit
+#define La_regs La_sparc64_regs
+#define La_retval La_sparc64_retval
+#define int_retval lrv_reg[0]
diff --git a/ports/sysdeps/alpha/tst-audit.h b/sysdeps/x86_64/tst-audit.h
similarity index 65%
copy from ports/sysdeps/alpha/tst-audit.h
copy to sysdeps/x86_64/tst-audit.h
index 7e3022a..00cd369 100644
--- a/ports/sysdeps/alpha/tst-audit.h
+++ b/sysdeps/x86_64/tst-audit.h
@@ -1,4 +1,5 @@
-/* Definitions for testing PLT entry/exit auditing. Alpha version.
+/* Definitions for testing PLT entry/exit auditing. x86_64 version.
+
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,7 +18,15 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#define pltenter la_alpha_gnu_pltenter
-#define pltexit la_alpha_gnu_pltexit
-#define La_regs La_alpha_regs
-#define La_retval La_alpha_retval
+#ifndef __ILP32__
+# define pltenter la_x86_64_gnu_pltenter
+# define pltexit la_x86_64_gnu_pltexit
+# define La_regs La_x86_64_regs
+# define La_retval La_x86_64_retval
+#else
+# define pltenter la_x32_gnu_pltenter
+# define pltexit la_x32_gnu_pltexit
+# define La_regs La_x32_regs
+# define La_retval La_x32_retval
+#endif
+#define int_retval lrv_rax
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 57 ++++++++++++++++++++++++++
elf/tst-auditmod1.c | 71 +--------------------------------
elf/tst-auditmod3b.c | 13 ------
elf/tst-auditmod4b.c | 13 ------
elf/tst-auditmod5b.c | 13 ------
elf/tst-auditmod6b.c | 13 ------
elf/tst-auditmod6c.c | 13 ------
elf/tst-auditmod7b.c | 13 ------
ports/ChangeLog.alpha | 4 ++
ports/sysdeps/alpha/tst-audit.h | 1 +
sysdeps/generic/tst-audit.h | 4 +-
sysdeps/i386/tst-audit.h | 25 +++++++++++
sysdeps/powerpc/powerpc32/tst-audit.h | 25 +++++++++++
sysdeps/powerpc/powerpc64/tst-audit.h | 25 +++++++++++
sysdeps/s390/s390-32/tst-audit.h | 25 +++++++++++
sysdeps/s390/s390-64/tst-audit.h | 25 +++++++++++
sysdeps/sh/tst-audit.h | 25 +++++++++++
sysdeps/sparc/sparc32/tst-audit.h | 25 +++++++++++
sysdeps/sparc/sparc64/tst-audit.h | 25 +++++++++++
sysdeps/x86_64/tst-audit.h | 32 +++++++++++++++
20 files changed, 297 insertions(+), 150 deletions(-)
create mode 100644 sysdeps/i386/tst-audit.h
create mode 100644 sysdeps/powerpc/powerpc32/tst-audit.h
create mode 100644 sysdeps/powerpc/powerpc64/tst-audit.h
create mode 100644 sysdeps/s390/s390-32/tst-audit.h
create mode 100644 sysdeps/s390/s390-64/tst-audit.h
create mode 100644 sysdeps/sh/tst-audit.h
create mode 100644 sysdeps/sparc/sparc32/tst-audit.h
create mode 100644 sysdeps/sparc/sparc64/tst-audit.h
create mode 100644 sysdeps/x86_64/tst-audit.h
hooks/post-receive
--
GNU C Library master sources