Skip to content

Commit d6b7be8

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

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

acinclude/libtool.m4

+5-5
Original file line numberDiff line numberDiff line change
@@ -2567,14 +2567,14 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
25672567
cygwin*)
25682568
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
25692569
#soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
2570-
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
2570+
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization.
25712571
m4_if([$1], [],[
25722572
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
25732573
;;
25742574
mingw* | windows* | cegcc*)
25752575
# MinGW DLLs use traditional 'lib' prefix
25762576
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
2577-
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
2577+
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization.
25782578
;;
25792579
pw32*)
25802580
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -3486,7 +3486,7 @@ cygwin*)
34863486
# func_win32_libid is a shell function defined in ltmain.sh
34873487
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
34883488
lt_cv_file_magic_cmd='func_win32_libid'
3489-
lt_cv_deplibs_check_method=pass_all # SDL customization
3489+
lt_cv_deplibs_check_method=pass_all # SDL customization.
34903490
;;
34913491
34923492
mingw* | windows* | pw32*)
@@ -3498,10 +3498,10 @@ mingw* | windows* | pw32*)
34983498
lt_cv_file_magic_cmd='func_win32_libid'
34993499
else
35003500
# Keep this pattern in sync with the one in func_win32_libid.
3501-
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
3501+
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
35023502
lt_cv_file_magic_cmd='$OBJDUMP -f'
35033503
fi
3504-
lt_cv_deplibs_check_method=pass_all # SDL customization
3504+
lt_cv_deplibs_check_method=pass_all # SDL customization.
35053505
;;
35063506
35073507
cegcc*)

build-scripts/ltmain.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -4935,7 +4935,7 @@ func_win32_libid ()
49354935
*ar\ archive*) # could be an import, or static
49364936
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
49374937
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
4938-
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
4938+
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then
49394939
case $nm_interface in
49404940
"MS dumpbin")
49414941
if func_cygming_ms_implib_p "$1" ||
@@ -6501,15 +6501,15 @@ func_mode_link ()
65016501
# we shouldn't force the makefile maintainer to figure out
65026502
# what system we are compiling for in order to pass an extra
65036503
# flag for every libtool invocation.
6504-
# SDL customization: SDL code doesn't have any undefined symbols
6504+
# SDL customization: SDL code doesn't have any undefined symbols.
65056505
allow_undefined=no
65066506

65076507
# FIXME: Unfortunately, there are problems with the above when trying
65086508
# to make a dll that has undefined symbols, in which case not
65096509
# even a static library is built. For now, we need to specify
65106510
# -no-undefined on the libtool link line when we can be certain
65116511
# that all symbols are satisfied, otherwise we get a static library.
6512-
# SDL customization: SDL code doesn't have any undefined symbols
6512+
# SDL customization: SDL code doesn't have any undefined symbols.
65136513
# allow_undefined=yes
65146514
;;
65156515
*)
@@ -8253,7 +8253,7 @@ func_mode_link ()
82538253
elif test -n "$soname_spec"; then
82548254
# bleh windows
82558255
case $host_os in
8256-
cygwin* | mingw* | windows* | cegcc*) # | os2* # SDL customization: removed OS/2 versioning support.
8256+
cygwin* | mingw* | windows* | cegcc*) # | os2* # SDL customization: removed OS/2 versioning support.
82578257
func_arith $current - $age
82588258
major=$func_arith_result
82598259
versuffix=-$major

configure

+7-7
Original file line numberDiff line numberDiff line change
@@ -5815,7 +5815,7 @@ cygwin*)
58155815
# func_win32_libid is a shell function defined in ltmain.sh
58165816
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
58175817
lt_cv_file_magic_cmd='func_win32_libid'
5818-
lt_cv_deplibs_check_method=pass_all # SDL customization
5818+
lt_cv_deplibs_check_method=pass_all # SDL customization.
58195819
;;
58205820

58215821
mingw* | windows* | pw32*)
@@ -5827,10 +5827,10 @@ mingw* | windows* | pw32*)
58275827
lt_cv_file_magic_cmd='func_win32_libid'
58285828
else
58295829
# Keep this pattern in sync with the one in func_win32_libid.
5830-
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5830+
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
58315831
lt_cv_file_magic_cmd='$OBJDUMP -f'
58325832
fi
5833-
lt_cv_deplibs_check_method=pass_all # SDL customization
5833+
lt_cv_deplibs_check_method=pass_all # SDL customization.
58345834
;;
58355835

58365836
cegcc*)
@@ -11600,14 +11600,14 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1160011600
cygwin*)
1160111601
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
1160211602
#soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
11603-
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
11603+
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization.
1160411604

1160511605
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
1160611606
;;
1160711607
mingw* | windows* | cegcc*)
1160811608
# MinGW DLLs use traditional 'lib' prefix
1160911609
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
11610-
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
11610+
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization.
1161111611
;;
1161211612
pw32*)
1161311613
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16984,13 +16984,13 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
1698416984
cygwin*)
1698516985
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
1698616986
#soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
16987-
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
16987+
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization.
1698816988

1698916989
;;
1699016990
mingw* | windows* | cegcc*)
1699116991
# MinGW DLLs use traditional 'lib' prefix
1699216992
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
16993-
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
16993+
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization.
1699416994
;;
1699516995
pw32*)
1699616996
# pw32 DLLs use 'pw' prefix rather than 'lib'

0 commit comments

Comments
 (0)