From 55a81e3b0ac440ea21b9c83f10e188a58e7c14ac Mon Sep 17 00:00:00 2001
From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Mon, 24 Mar 2014 18:22:32 -0700
Subject: [PATCH] Address post-commit patch comments.

2014-03-24  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* elf/tst-dlopen-aout.c: Adjust comments. Use test-skeleton.c
---
 ChangeLog             |  5 ++++-
 elf/tst-dlopen-aout.c | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a21154d7a1..69622e4851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-24  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* elf/tst-dlopen-aout.c: Adjust comments. Use test-skeleton.c
+
 2014-03-24  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/ieee754/dbl-64/e_exp.c: Include <math.h>.
@@ -7,7 +11,6 @@
 2014-03-24  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	[BZ #16634]
-
 	* elf/dl-load.c (open_verify): Add mode parameter.
         Error early when ET_EXEC and mode does not have __RTLD_OPENEXEC.
         (open_path): Change from boolean 'secure' to complete flag 'mode'
diff --git a/elf/tst-dlopen-aout.c b/elf/tst-dlopen-aout.c
index d3534250e0..2462a9ff55 100644
--- a/elf/tst-dlopen-aout.c
+++ b/elf/tst-dlopen-aout.c
@@ -1,5 +1,8 @@
 /* Test case for BZ #16634.
 
+   Verify that incorrectly dlopen()ing an executable without
+   __RTLD_OPENEXEC does not cause assertion in ld.so.
+
    Copyright (C) 2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -33,8 +36,8 @@ fn (void *p)
   return p;
 }
 
-int
-main (int argc, char *argv[])
+static int
+do_test (int argc, char *argv[])
 {
   int j;
 
@@ -59,3 +62,6 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+#define TEST_FUNCTION do_test (argc, argv)
+#include "../test-skeleton.c"