i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libroot/musl/math: Fix non-legacy hybrids

Browse Source 
* 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 <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-10-15 12:48:50 +00:00
committed by Alex von Gluck IV
parent f598f71cd5
commit e1fafa3a6e
8 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/posix/musl/math/arm/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -83,10 +78,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup arm ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c fabs.c fabsf.c
fma.c fmaf.c fma.c fmaf.c
src/system/libroot/posix/musl/math/arm64/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -83,10 +78,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup arm64 ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c fabs.c fabsf.c
fma.c fmaf.c fma.c fmaf.c
src/system/libroot/posix/musl/math/m68k/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -83,10 +78,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup m68k ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
$(generics) $(generics)
src/system/libroot/posix/musl/math/ppc/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -83,10 +78,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ppc ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c fabs.c fabsf.c
fma.c fmaf.c fma.c fmaf.c
src/system/libroot/posix/musl/math/riscv64/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -83,10 +78,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup riscv64 ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
fabs.c fabsf.c fabs.c fabsf.c
fma.c fmaf.c fma.c fmaf.c
src/system/libroot/posix/musl/math/sparc/Jamfile
+2 -5
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -87,6 +82,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
$(generics) $(generics)
; ;
src/system/libroot/posix/musl/math/x86/Jamfile
+3 -7
View File
@@ -2,14 +2,8 @@ SubDir HAIKU_TOP src system libroot posix musl math x86 ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] [ FDirName $(SUBDIR) .. ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] [ FDirName $(SUBDIR) .. ] ;
local generics = local generics =
acosh.c acoshf.c acoshl.c acosh.c acoshf.c acoshl.c
asinh.c asinhf.c asinhl.c asinh.c asinhf.c asinhl.c
@@ -58,10 +52,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
if $(architecture) = x86_gcc2 { if $(architecture) = x86_gcc2 {
# GCC 2 miscompiles some of the files in here, so we use GCC 8. # GCC 2 miscompiles some of the files in here, so we use GCC 8.
original_TARGET_CC_x86_gcc2 = $(TARGET_CC_x86_gcc2) ; original_TARGET_CC_x86_gcc2 = $(TARGET_CC_x86_gcc2) ;
src/system/libroot/posix/musl/math/x86_64/Jamfile
+3 -6
View File
@@ -4,11 +4,6 @@ SubDirCcFlags -Wno-unused-but-set-variable ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ;
local arch ;
for arch in $(TARGET_ARCHS) {
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ;
}
UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ;
local generics = local generics =
@@ -51,10 +46,12 @@ local generics =
; ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
on $(architectureObject) { on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ; local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) .. .. arch $(architecture) ] ;
MergeObject <$(architecture)>posix_musl_math.o : MergeObject <$(architecture)>posix_musl_math.o :
acosl.s asinl.s atan2l.s atanl.s acosl.s asinl.s atan2l.s atanl.s
ceill.s ceill.s