attempt to fix #3641

devnexen · tgross35 · commit a00d7e6d1da5 · 2024-11-17T04:08:34.000-05:00
(backport <#3647>) (cherry picked from commit 2e94ad3)
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3696,7 +3696,8 @@ fn test_linux(target: &str) {
 
     cfg.skip_type(move |ty| {
         // FIXME: very recent additions to musl, not yet released.
-        if musl && (ty == "Elf32_Relr" || ty == "Elf64_Relr") {
+        // also apparently some glibc versions
+        if ty == "Elf32_Relr" || ty == "Elf64_Relr" {
             return true;
         }
         if sparc64 && (ty == "Elf32_Rela" || ty == "Elf64_Rela") {

Original file line number	Diff line number	Diff line change
`@@ -3696,7 +3696,8 @@ fn test_linux(target: &str) {`
`3696`	`3696`
`3697`	`3697`	`cfg.skip_type(move \|ty\| {`
`3698`	`3698`	`// FIXME: very recent additions to musl, not yet released.`
`3699`		`- if musl && (ty == "Elf32_Relr" \|\| ty == "Elf64_Relr") {`
	`3699`	`+ // also apparently some glibc versions`
	`3700`	`+ if ty == "Elf32_Relr" \|\| ty == "Elf64_Relr" {`
`3700`	`3701`	`return true;`
`3701`	`3702`	`}`
`3702`	`3703`	`if sparc64 && (ty == "Elf32_Rela" \|\| ty == "Elf64_Rela") {`