Ticket #15056: libroot-fix-arm.diff

File libroot-fix-arm.diff, 2.9 KB (added by kallisti5, 17 months ago)

partial fix

  • src/system/libroot/posix/glibc/arch/arm/Jamfile

    diff --git a/src/system/libroot/posix/glibc/arch/arm/Jamfile b/src/system/libroot/posix/glibc/arch/arm/Jamfile
    index 18924a7e2f..b5c118db7a 100644
    a b for architectureObject in [ MultiArchSubDirSetup arm ] {  
    106106
    107107        SEARCH on [ FGristFiles $(genericSources) ]
    108108            = [ FDirName $(HAIKU_TOP) src system libroot posix glibc arch
    109                 generic ] ;
     109                generic ]
     110              [ FDirName $(HAIKU_TOP) src system libroot posix
     111                glibc arch generic longdouble 128bit ] ;
     112
    110113    }
    111114}
  • src/system/libroot/posix/glibc/arch/riscv64/Jamfile

    diff --git a/src/system/libroot/posix/glibc/arch/riscv64/Jamfile b/src/system/libroot/posix/glibc/arch/riscv64/Jamfile
    index 027bcaf842..0ac0317659 100644
    a b local genericSources =  
    6464    e_acos.c w_acos.c
    6565    e_atan2.c #e_atan2l.c
    6666    w_atan2.c w_atan2l.c mpatan2.c mpatan.c mptan.c mpsqrt.c w_sqrt.c w_sqrtf.c
    67     e_sqrtl.c
     67    e_sqrt.c e_sqrtf.c e_sqrtl.c
    6868    e_fmod.c w_fmod.c
    6969    e_log.c w_log.c
    7070    e_cosh.c w_cosh.c
    local genericSources =  
    7878    s_lround.c s_lroundf.c s_round.c s_roundf.c
    7979    s_rint.c s_rintf.c s_lrintf.c
    8080    e_fmodf.c w_fmodf.c
     81    s_fpclassifyl.c
    8182    e_atan2f.c w_atan2f.c
    8283    e_rem_pio2f.c k_rem_pio2f.c
    8384
    for architectureObject in [ MultiArchSubDirSetup riscv64 ] {  
    9394            $(genericSources)
    9495            ;
    9596
    96         MergeObject <$(architecture)>posix_gnu_arch_$(TARGET_ARCH)_others.o :
    97             e_sqrt.c
    98             e_sqrtf.c
    99             ;
     97        #MergeObject <$(architecture)>posix_gnu_arch_$(TARGET_ARCH)_others.o :
     98        #   ;
    10099
    101100        MergeObjectFromObjects <$(architecture)>posix_gnu_arch_$(TARGET_ARCH).o
    102101            : :
    103102            <$(architecture)>posix_gnu_arch_$(TARGET_ARCH)_generic.o
    104             <$(architecture)>posix_gnu_arch_$(TARGET_ARCH)_others.o
     103            #<$(architecture)>posix_gnu_arch_$(TARGET_ARCH)_others.o
    105104            ;
    106105
    107106        SEARCH on [ FGristFiles $(genericSources) ]
  • src/system/libroot/posix/glibc/include/arch/arm/bits/mathinline.h

    diff --git a/src/system/libroot/posix/glibc/include/arch/arm/bits/mathinline.h b/src/system/libroot/posix/glibc/include/arch/arm/bits/mathinline.h
    index 248e6cf600..b9b3f6efab 100644
    a b  
    1 #warning ARM: check mathinline.h
     1#ifndef _MATH_H
     2# error "Never use <bits/mathinline.h> directly; include <math.h> instead."
     3#endif
     4
     5#define __NTH(fct)    __attribute__ ((__nothrow__)) fct
     6
     7#ifndef __extern_always_inline
     8# define __MATH_INLINE __inline
     9#else
     10# define __MATH_INLINE __extern_always_inline
     11#endif
     12
     13#if defined __USE_ISOC99
     14
     15#  define isgreater(x, y) __builtin_isgreater (x, y)
     16#  define isgreaterequal(x, y) __builtin_isgreaterequal (x, y)
     17#  define isless(x, y) __builtin_isless (x, y)
     18#  define islessequal(x, y) __builtin_islessequal (x, y)
     19#  define islessgreater(x, y) __builtin_islessgreater (x, y)
     20#  define isunordered(x, y) __builtin_isunordered (x, y)
     21
     22#endif