aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2020-10-31 08:30:59 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2020-10-31 08:30:59 -0400
commit5164c11714c92ba7690d4f93de6be6a90f460220 (patch)
tree2f616d6805b100c55f6090ddb2e834a763299c4c
parentb6fb30eda72b7fc3a6214ed2787f80971f66810d (diff)
downloadbinutils-5164c11714c92ba7690d4f93de6be6a90f460220.zip
binutils-5164c11714c92ba7690d4f93de6be6a90f460220.tar.gz
binutils-5164c11714c92ba7690d4f93de6be6a90f460220.tar.bz2
gdbsupport: replace AC_TRY_COMPILE in ptrace.m4
Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + AC_LANG_PROGRAM. All the changes in the generated configure files are insignificant whitespace changes. gdb/ChangeLog: * configure: Re-generate. gdbserver/ChangeLog: * configure: Re-generate. gdbsupport/ChangeLog: * configure: Re-generate. * ptrace.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + AC_LANG_PROGRAM. Change-Id: Ia782b5477fe49dad04e68c0f41c6d8ab3fde5bf0
Diffstat
-rw-r--r--gdb/ChangeLog4
-rwxr-xr-xgdb/configure7
-rw-r--r--gdbserver/ChangeLog4
-rwxr-xr-xgdbserver/configure7
-rw-r--r--gdbsupport/ChangeLog6
-rwxr-xr-xgdbsupport/configure7
-rw-r--r--gdbsupport/ptrace.m440
7 files changed, 57 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd46bb8..46e1302 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -4,6 +4,10 @@
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
+ * configure: Re-generate.
+
+2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
+
* acinclude.m4: Modernize.
* configure: Re-generate.
diff --git a/gdb/configure b/gdb/configure
index 4816b98..65904ba 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -15166,11 +15166,12 @@ if ${gdb_cv_func_ptrace_ret+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$gdb_ptrace_headers
+ $gdb_ptrace_headers
int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -15185,6 +15186,7 @@ int
main ()
{
extern int ptrace ();
+
;
return 0;
}
@@ -15223,6 +15225,7 @@ int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -15241,6 +15244,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4);
+
;
return 0;
}
@@ -15260,6 +15264,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5);
+
;
return 0;
}
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index bd4ddf7..8975cc9 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -4,6 +4,10 @@
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
+ * configure: Re-generate.
+
+2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
+
* configure.ac: Modernize.
* configure: Re-generate.
diff --git a/gdbserver/configure b/gdbserver/configure
index 9686421..3980ae7 100755
--- a/gdbserver/configure
+++ b/gdbserver/configure
@@ -9448,11 +9448,12 @@ if ${gdb_cv_func_ptrace_ret+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$gdb_ptrace_headers
+ $gdb_ptrace_headers
int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -9467,6 +9468,7 @@ int
main ()
{
extern int ptrace ();
+
;
return 0;
}
@@ -9505,6 +9507,7 @@ int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -9523,6 +9526,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4);
+
;
return 0;
}
@@ -9542,6 +9546,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5);
+
;
return 0;
}
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index dbdb2ca..634b7c7 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,6 +1,12 @@
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
* configure: Re-generate.
+ * ptrace.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE +
+ AC_LANG_PROGRAM.
+
+2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * configure: Re-generate.
* ptrace.m4: Re-indent.
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
diff --git a/gdbsupport/configure b/gdbsupport/configure
index e51c7b5..904403d 100755
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -10017,11 +10017,12 @@ if ${gdb_cv_func_ptrace_ret+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$gdb_ptrace_headers
+ $gdb_ptrace_headers
int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -10036,6 +10037,7 @@ int
main ()
{
extern int ptrace ();
+
;
return 0;
}
@@ -10074,6 +10076,7 @@ int
main ()
{
extern long ptrace (enum __ptrace_request, ...);
+
;
return 0;
}
@@ -10092,6 +10095,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4);
+
;
return 0;
}
@@ -10111,6 +10115,7 @@ int
main ()
{
extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5);
+
;
return 0;
}
diff --git a/gdbsupport/ptrace.m4 b/gdbsupport/ptrace.m4
index 57ed802..9f49cf6 100644
--- a/gdbsupport/ptrace.m4
+++ b/gdbsupport/ptrace.m4
@@ -37,13 +37,17 @@ gdb_ptrace_headers='
AC_CACHE_CHECK(
[return type of ptrace],
[gdb_cv_func_ptrace_ret],
- [AC_TRY_COMPILE(
- [$gdb_ptrace_headers],
- [extern long ptrace (enum __ptrace_request, ...);],
- [gdb_cv_func_ptrace_ret='long'],
- [AC_TRY_COMPILE(
+ [AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
[$gdb_ptrace_headers],
- [extern int ptrace ();],
+ [extern long ptrace (enum __ptrace_request, ...);]
+ )],
+ [gdb_cv_func_ptrace_ret='long'],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [$gdb_ptrace_headers],
+ [extern int ptrace ();]
+ )],
[gdb_cv_func_ptrace_ret='int'],
[gdb_cv_func_ptrace_ret='long']
)]
@@ -60,25 +64,31 @@ AC_DEFINE_UNQUOTED(
AC_CACHE_CHECK(
[types of arguments for ptrace],
[gdb_cv_func_ptrace_args],
- [AC_TRY_COMPILE(
- [$gdb_ptrace_headers],
- [extern long ptrace (enum __ptrace_request, ...);],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [$gdb_ptrace_headers],
+ [extern long ptrace (enum __ptrace_request, ...);]
+ )],
[gdb_cv_func_ptrace_args='enum __ptrace_request,int,long,long'],
[for gdb_arg1 in 'int' 'long'; do
for gdb_arg2 in 'pid_t' 'int' 'long'; do
for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long' 'void *'; do
for gdb_arg4 in 'int' 'long' 'void *'; do
- AC_TRY_COMPILE(
- [$gdb_ptrace_headers],
- [extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4);],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [$gdb_ptrace_headers],
+ [extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4);]
+ )],
[gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4";
break 4;]
)
for gdb_arg5 in 'int *' 'int' 'long'; do
- AC_TRY_COMPILE(
- [$gdb_ptrace_headers],
- [extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5);],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [$gdb_ptrace_headers],
+ [extern $gdb_cv_func_ptrace_ret ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5);]
+ )],
[gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4,$gdb_arg5";
break 5;]
)
generated by cgit v1.1 at 2025-08-21 02:55:32 +0000