From 01fe12f6fb039ef2841440b214d9fb905767a14d Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 19 Sep 2007 22:00:34 +0000
Subject: [PATCH]         * configure.ac: Add check for "etext".         *
 configure, config.in: Regenerate.         * maint.c (TEXTEND): Only define if
 either _etext or etext         are available.         Disable the profiling
 functionality if TEXTEND is not defined.

---
 gdb/ChangeLog    |  8 ++++++
 gdb/config.in    |  3 +++
 gdb/configure    | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 gdb/configure.ac | 10 ++++++++
 gdb/maint.c      |  6 ++---
 5 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd8491ba0d5..c8486c5d299 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-19  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.ac: Add check for "etext".
+	* configure, config.in: Regenerate.
+	* maint.c (TEXTEND): Only define if either _etext or etext
+	are available.
+	Disable the profiling functionality if TEXTEND is not defined.
+
 2007-09-19  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* mips-tdep.c (mips_stub_frame_cache): Correct the saved return
diff --git a/gdb/config.in b/gdb/config.in
index 1534afe8275..f58b70a6c14 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -113,6 +113,9 @@
 /* Define if ELF support should be included. */
 #undef HAVE_ELF
 
+/* Define to 1 if your system has the etext variable. */
+#undef HAVE_ETEXT
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
diff --git a/gdb/configure b/gdb/configure
index 7b90943a15f..1dd4fb466b3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -4277,6 +4277,69 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE__ETEXT 1
 _ACEOF
 
+fi
+echo "$as_me:$LINENO: checking for etext" >&5
+echo $ECHO_N "checking for etext... $ECHO_C" >&6
+if test "${ac_cv_var_etext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+extern char etext;
+
+int
+main ()
+{
+free (&etext);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_var_etext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_var_etext=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_var_etext" >&5
+echo "${ECHO_T}$ac_cv_var_etext" >&6
+if test $ac_cv_var_etext = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ETEXT 1
+_ACEOF
+
 fi
 if test "$enable_profiling" = yes ; then
   if test $ac_cv_func_monstartup = no || test $ac_cv_func__mcleanup = no; then
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 6a150aa534a..eea0bc29623 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -242,6 +242,16 @@ if test $ac_cv_var__etext = yes; then
   AC_DEFINE(HAVE__ETEXT, 1,
             [Define to 1 if your system has the _etext variable. ])
 fi
+AC_CACHE_CHECK([for etext], ac_cv_var_etext,
+[AC_TRY_LINK(
+[#include <stdlib.h>
+extern char etext;
+],
+[free (&etext);], ac_cv_var_etext=yes, ac_cv_var_etext=no)])
+if test $ac_cv_var_etext = yes; then
+  AC_DEFINE(HAVE_ETEXT, 1,
+            [Define to 1 if your system has the etext variable. ])
+fi
 if test "$enable_profiling" = yes ; then
   if test $ac_cv_func_monstartup = no || test $ac_cv_func__mcleanup = no; then
     AC_MSG_ERROR(--enable-profiling requires monstartup and _mcleanup)
diff --git a/gdb/maint.c b/gdb/maint.c
index 2f431fd405e..5f3338ef165 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -638,16 +638,16 @@ show_maintenance_profile_p (struct ui_file *file, int from_tty,
   fprintf_filtered (file, _("Internal profiling is %s.\n"), value);
 }
 
-#if defined (HAVE_MONSTARTUP) && defined (HAVE__MCLEANUP)
-
 #ifdef HAVE__ETEXT
 extern char _etext;
 #define TEXTEND &_etext
-#else
+#elif defined (HAVE_ETEXT)
 extern char etext;
 #define TEXTEND &etext
 #endif
 
+#if defined (HAVE_MONSTARTUP) && defined (HAVE__MCLEANUP) && defined (TEXTEND)
+
 static int profiling_state;
 
 static void
-- 
2.30.2