Skip to content

Commit 2d400c8

Browse files
usamoitgross35
usamoi
authored and
tgross35
committed
links old version for glibc on mips{32,64}r6
(backport <rust-lang#4938>) (cherry picked from commit 49acdc6)
1 parent 80743a1 commit 2d400c8

1 file changed

Lines changed: 64 additions & 12 deletions

File tree

‎src/unix/mod.rs‎

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,11 @@ extern "C" {
16141614
link_name = "cfgetispeed@GLIBC_2.0"
16151615
)]
16161616
#[cfg_attr(
1617-
all(target_os = "linux", target_env = "gnu", target_arch = "mips"),
1617+
all(
1618+
target_os = "linux",
1619+
target_env = "gnu",
1620+
any(target_arch = "mips", target_arch = "mips32r6")
1621+
),
16181622
link_name = "cfgetispeed@GLIBC_2.0"
16191623
)]
16201624
#[cfg_attr(
@@ -1642,7 +1646,11 @@ extern "C" {
16421646
link_name = "cfgetispeed@GLIBC_2.36"
16431647
)]
16441648
#[cfg_attr(
1645-
all(target_os = "linux", target_env = "gnu", target_arch = "mips64"),
1649+
all(
1650+
target_os = "linux",
1651+
target_env = "gnu",
1652+
any(target_arch = "mips64", target_arch = "mips64r6")
1653+
),
16461654
link_name = "cfgetispeed@GLIBC_2.0"
16471655
)]
16481656
#[cfg_attr(
@@ -1707,7 +1715,11 @@ extern "C" {
17071715
link_name = "cfgetospeed@GLIBC_2.0"
17081716
)]
17091717
#[cfg_attr(
1710-
all(target_os = "linux", target_env = "gnu", target_arch = "mips"),
1718+
all(
1719+
target_os = "linux",
1720+
target_env = "gnu",
1721+
any(target_arch = "mips", target_arch = "mips32r6")
1722+
),
17111723
link_name = "cfgetospeed@GLIBC_2.0"
17121724
)]
17131725
#[cfg_attr(
@@ -1735,7 +1747,11 @@ extern "C" {
17351747
link_name = "cfgetospeed@GLIBC_2.36"
17361748
)]
17371749
#[cfg_attr(
1738-
all(target_os = "linux", target_env = "gnu", target_arch = "mips64"),
1750+
all(
1751+
target_os = "linux",
1752+
target_env = "gnu",
1753+
any(target_arch = "mips64", target_arch = "mips64r6")
1754+
),
17391755
link_name = "cfgetospeed@GLIBC_2.0"
17401756
)]
17411757
#[cfg_attr(
@@ -1800,7 +1816,11 @@ extern "C" {
18001816
link_name = "cfsetispeed@GLIBC_2.0"
18011817
)]
18021818
#[cfg_attr(
1803-
all(target_os = "linux", target_env = "gnu", target_arch = "mips"),
1819+
all(
1820+
target_os = "linux",
1821+
target_env = "gnu",
1822+
any(target_arch = "mips", target_arch = "mips32r6")
1823+
),
18041824
link_name = "cfsetispeed@GLIBC_2.0"
18051825
)]
18061826
#[cfg_attr(
@@ -1828,7 +1848,11 @@ extern "C" {
18281848
link_name = "cfsetispeed@GLIBC_2.36"
18291849
)]
18301850
#[cfg_attr(
1831-
all(target_os = "linux", target_env = "gnu", target_arch = "mips64"),
1851+
all(
1852+
target_os = "linux",
1853+
target_env = "gnu",
1854+
any(target_arch = "mips64", target_arch = "mips64r6")
1855+
),
18321856
link_name = "cfsetispeed@GLIBC_2.0"
18331857
)]
18341858
#[cfg_attr(
@@ -1893,7 +1917,11 @@ extern "C" {
18931917
link_name = "cfsetospeed@GLIBC_2.0"
18941918
)]
18951919
#[cfg_attr(
1896-
all(target_os = "linux", target_env = "gnu", target_arch = "mips"),
1920+
all(
1921+
target_os = "linux",
1922+
target_env = "gnu",
1923+
any(target_arch = "mips", target_arch = "mips32r6")
1924+
),
18971925
link_name = "cfsetospeed@GLIBC_2.0"
18981926
)]
18991927
#[cfg_attr(
@@ -1921,7 +1949,11 @@ extern "C" {
19211949
link_name = "cfsetospeed@GLIBC_2.36"
19221950
)]
19231951
#[cfg_attr(
1924-
all(target_os = "linux", target_env = "gnu", target_arch = "mips64"),
1952+
all(
1953+
target_os = "linux",
1954+
target_env = "gnu",
1955+
any(target_arch = "mips64", target_arch = "mips64r6")
1956+
),
19251957
link_name = "cfsetospeed@GLIBC_2.0"
19261958
)]
19271959
#[cfg_attr(
@@ -1977,7 +2009,13 @@ extern "C" {
19772009
all(
19782010
target_os = "linux",
19792011
target_env = "gnu",
1980-
any(target_arch = "mips", target_arch = "mips64", target_arch = "sparc"),
2012+
any(
2013+
target_arch = "mips",
2014+
target_arch = "mips32r6",
2015+
target_arch = "mips64",
2016+
target_arch = "mips64r6",
2017+
target_arch = "sparc"
2018+
),
19812019
),
19822020
link_name = "tcgetattr@GLIBC_2.0"
19832021
)]
@@ -1990,7 +2028,13 @@ extern "C" {
19902028
all(
19912029
target_os = "linux",
19922030
target_env = "gnu",
1993-
any(target_arch = "mips", target_arch = "mips64", target_arch = "sparc"),
2031+
any(
2032+
target_arch = "mips",
2033+
target_arch = "mips32r6",
2034+
target_arch = "mips64",
2035+
target_arch = "mips64r6",
2036+
target_arch = "sparc"
2037+
),
19942038
),
19952039
link_name = "tcsetattr@GLIBC_2.0"
19962040
)]
@@ -2299,7 +2343,11 @@ cfg_if! {
22992343
link_name = "cfsetspeed@GLIBC_2.0"
23002344
)]
23012345
#[cfg_attr(
2302-
all(target_os = "linux", target_env = "gnu", target_arch = "mips"),
2346+
all(
2347+
target_os = "linux",
2348+
target_env = "gnu",
2349+
any(target_arch = "mips", target_arch = "mips32r6")
2350+
),
23032351
link_name = "cfsetspeed@GLIBC_2.0"
23042352
)]
23052353
#[cfg_attr(
@@ -2327,7 +2375,11 @@ cfg_if! {
23272375
link_name = "cfsetspeed@GLIBC_2.36"
23282376
)]
23292377
#[cfg_attr(
2330-
all(target_os = "linux", target_env = "gnu", target_arch = "mips64"),
2378+
all(
2379+
target_os = "linux",
2380+
target_env = "gnu",
2381+
any(target_arch = "mips64", target_arch = "mips64r6")
2382+
),
23312383
link_name = "cfsetspeed@GLIBC_2.0"
23322384
)]
23332385
#[cfg_attr(

0 commit comments

Comments
 (0)