Skip to content

Commit ec6ddc1

Browse files
committed
autotools, libtool, win32: add 'aarch64' support to the file magic test.
From libtool development commit 1638a6407573b74517b57a0f6e596918344a4394
1 parent f66ffea commit ec6ddc1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

acinclude/libtool.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3033,7 +3033,7 @@ mingw* | pw32*)
30333033
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
30343034
lt_cv_file_magic_cmd='func_win32_libid'
30353035
else
3036-
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
3036+
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
30373037
lt_cv_file_magic_cmd='$OBJDUMP -f'
30383038
fi
30393039
lt_cv_deplibs_check_method=pass_all

build-scripts/ltmain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2568,7 +2568,7 @@ func_win32_libid ()
25682568
;;
25692569
*ar\ archive*) # could be an import, or static
25702570
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
2571-
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null ; then
2571+
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null ; then
25722572
win32_nmres=`eval $NM -f posix -A $1 |
25732573
$SED -n -e '
25742574
1,100{

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5385,7 +5385,7 @@ mingw* | pw32*)
53855385
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
53865386
lt_cv_file_magic_cmd='func_win32_libid'
53875387
else
5388-
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5388+
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
53895389
lt_cv_file_magic_cmd='$OBJDUMP -f'
53905390
fi
53915391
lt_cv_deplibs_check_method=pass_all

0 commit comments

Comments
 (0)