Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdbsupport: replace AC_TRY_COMPILE in ptrace.m4

Browse Source 
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
This commit is contained in:
Simon Marchi
2020-10-31 08:30:59 -04:00
parent b6fb30eda7
commit 5164c11714
7 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@@ -2,6 +2,10 @@
* configure: Re-generate.
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
* configure: Re-generate.
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
* acinclude.m4: Modernize.

7
gdb/configure vendored
View File

@@ -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;
}

4
gdbserver/ChangeLog
View File

@@ -2,6 +2,10 @@
* configure: Re-generate.
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
* configure: Re-generate.
2020-10-31 Simon Marchi <simon.marchi@polymtl.ca>
* configure.ac: Modernize.

7
gdbserver/configure vendored
View File

@@ -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;
}

6
gdbsupport/ChangeLog
View File

@@ -1,3 +1,9 @@
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.

7
gdbsupport/configure vendored
View File

@@ -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;
}

40
gdbsupport/ptrace.m4
View File

@@ -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;]
)