hrev54650 adds 1 changeset to branch 'master'
old head: f598f71cd5eb10ebed7d4ae151c8a8f704d5becd
new head: e1fafa3a6e5041fc1df842abf3dfba23e4e79464
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=e1fafa3a6e50+%5Ef598f71cd5eb
----------------------------------------------------------------------------
e1fafa3a6e50: libroot/musl/math: Fix non-legacy hybrids
* If you're building a hybrid, each arch directory gets included.
* If the architectures are all non-legacy, you end up getting
"all architectures" built in each architecture directory.
* This prevents this condition by filtering on sane architecture
matches per arch directory.
Change-Id: I529e2b3d315b0930aff594239dadd9db70dc9cfa
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3316
Reviewed-by: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54650
Commit: e1fafa3a6e5041fc1df842abf3dfba23e4e79464
URL: https://git.haiku-os.org/haiku/commit/?id=e1fafa3a6e50
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Oct 14 02:40:06 2020 UTC
Committer: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Thu Oct 15 12:48:50 2020 UTC
----------------------------------------------------------------------------
8 files changed, 23 insertions(+), 48 deletions(-)
src/system/libroot/posix/musl/math/arm/Jamfile | 9 +++------
src/system/libroot/posix/musl/math/arm64/Jamfile | 9 +++------
src/system/libroot/posix/musl/math/m68k/Jamfile | 9 +++------
src/system/libroot/posix/musl/math/ppc/Jamfile | 9 +++------
src/system/libroot/posix/musl/math/riscv64/Jamfile | 9 +++------
src/system/libroot/posix/musl/math/sparc/Jamfile | 7 ++-----
src/system/libroot/posix/musl/math/x86/Jamfile | 10 +++-------
src/system/libroot/posix/musl/math/x86_64/Jamfile | 9 +++------
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/musl/math/arm/Jamfile
b/src/system/libroot/posix/musl/math/arm/Jamfile
index 79b6309a26..e7443d0479 100644
--- a/src/system/libroot/posix/musl/math/arm/Jamfile
+++ b/src/system/libroot/posix/musl/math/arm/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -83,10 +78,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup arm ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c
fma.c fmaf.c
diff --git a/src/system/libroot/posix/musl/math/arm64/Jamfile
b/src/system/libroot/posix/musl/math/arm64/Jamfile
index a8c5cd76e5..780ac798b9 100644
--- a/src/system/libroot/posix/musl/math/arm64/Jamfile
+++ b/src/system/libroot/posix/musl/math/arm64/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -83,10 +78,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup arm64 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c
fma.c fmaf.c
diff --git a/src/system/libroot/posix/musl/math/m68k/Jamfile
b/src/system/libroot/posix/musl/math/m68k/Jamfile
index 141c03cf4f..1be8e65ea4 100644
--- a/src/system/libroot/posix/musl/math/m68k/Jamfile
+++ b/src/system/libroot/posix/musl/math/m68k/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -83,10 +78,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup m68k ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
$(generics)
diff --git a/src/system/libroot/posix/musl/math/ppc/Jamfile
b/src/system/libroot/posix/musl/math/ppc/Jamfile
index eae6ad633d..bcef920a93 100644
--- a/src/system/libroot/posix/musl/math/ppc/Jamfile
+++ b/src/system/libroot/posix/musl/math/ppc/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -83,10 +78,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup ppc ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c
fma.c fmaf.c
diff --git a/src/system/libroot/posix/musl/math/riscv64/Jamfile
b/src/system/libroot/posix/musl/math/riscv64/Jamfile
index b24a209c64..3dec5c739b 100644
--- a/src/system/libroot/posix/musl/math/riscv64/Jamfile
+++ b/src/system/libroot/posix/musl/math/riscv64/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -83,10 +78,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup riscv64 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c
fma.c fmaf.c
diff --git a/src/system/libroot/posix/musl/math/sparc/Jamfile
b/src/system/libroot/posix/musl/math/sparc/Jamfile
index afe88156a6..af4e8608b5 100644
--- a/src/system/libroot/posix/musl/math/sparc/Jamfile
+++ b/src/system/libroot/posix/musl/math/sparc/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -87,6 +82,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
$(generics)
;
diff --git a/src/system/libroot/posix/musl/math/x86/Jamfile
b/src/system/libroot/posix/musl/math/x86/Jamfile
index ac3398466a..4461d2fc42 100644
--- a/src/system/libroot/posix/musl/math/x86/Jamfile
+++ b/src/system/libroot/posix/musl/math/x86/Jamfile
@@ -2,14 +2,8 @@ SubDir HAIKU_TOP src system libroot posix musl math x86 ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] [ FDirName $(SUBDIR) .. ]
;
-
local generics =
acosh.c acoshf.c acoshl.c
asinh.c asinhf.c asinhl.c
@@ -58,10 +52,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
if $(architecture) = x86_gcc2 {
# GCC 2 miscompiles some of the files in here, so we
use GCC 8.
original_TARGET_CC_x86_gcc2 = $(TARGET_CC_x86_gcc2) ;
diff --git a/src/system/libroot/posix/musl/math/x86_64/Jamfile
b/src/system/libroot/posix/musl/math/x86_64/Jamfile
index e4da5e49fa..1039ad7e30 100644
--- a/src/system/libroot/posix/musl/math/x86_64/Jamfile
+++ b/src/system/libroot/posix/musl/math/x86_64/Jamfile
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
-
-local arch ;
-for arch in $(TARGET_ARCHS) {
- UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
-}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics =
@@ -51,10 +46,12 @@ local generics =
;
local architectureObject ;
-for architectureObject in [ MultiArchSubDirSetup ] {
+for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
+ UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
+
MergeObject <$(architecture)>posix_musl_math.o :
acosl.s asinl.s atan2l.s atanl.s
ceill.s
