Attachment #200240 for bug #234145

View | Details | Raw Unified | Return to bug 234145
Collapse All | Expand All




BROKEN_aarch64=		fails to link: vector/analyzeFuncs_vector.cpp:(.data+0x38): undefined symbol 'vfp_GetPowerSpectrum(float (*) [2], float*, int)'
BROKEN_armv6=		fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
BROKEN_armv7=		fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
BROKEN_powerpc64=	fails to compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory

BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
RUN_DEPENDS=	boinc_client:net/boinc-client
LIB_DEPENDS=	libfftw3f.so:math/fftw3-float

USES=		autoreconf compiler:c++11-lang gmake gnome libtool pkgconfig \
		tar:xz

GNU_CONFIGURE=	yes


OPTIONS_SUB=	yes

X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
X11_USES=		gl jpeg
X11_USE=		GL=gl,glu,glut \
			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
X11_CONFIGURE_ENABLE=	graphics

Line 0 Link Here

(-)files/patch-client_Makefile.am (+11 lines)
	1	--- client/Makefile.am.orig 2018-12-18 10:43:02 UTC
	2	+++ client/Makefile.am
	3	@@ -203,7 +203,7 @@ if PPC
	4	seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp
	5	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	6	$(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \
	7	- -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -faltivec -mabi=altivec \
	8	+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -maltivec -mabi=altivec \
	9	-c -o $@ $<; then mv -f "$(DEPDIR)/$.Tpo" "$(DEPDIR)/$.Po"; \
	10	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
	11	seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp

Line 0 Link Here

(-)files/patch-client_pulsefind.h (+10 lines)
	1	--- client/pulsefind.h.orig 2018-12-18 12:03:47 UTC
	2	+++ client/pulsefind.h
	3	@@ -82,7 +82,6 @@ extern FoldSet AVXfold_c; // in analyzeFuncs_avx
	4	extern FoldSet sse_ben_fold; // in analyzeFuncs_sse.cpp
	5	extern FoldSet BHSSEfold; // in analyzeFuncs_sse.cpp
	6	extern FoldSet AKSSEfold; // in analyzeFuncs_sse.cpp
	7	-extern FoldSet AKavfold; // in analyzeFuncs_altivec.cpp
	8	extern FoldSet swifold; // in Pulsefind - default set
	9	extern FoldSet Foldmain; // in Pulsefind - used set
	10

Line 0 Link Here

(-)files/patch-client_vector_analyzeFuncs__altivec.cpp (+11 lines)
	1	--- client/vector/analyzeFuncs_altivec.cpp.orig 2018-01-14 23:02:12 UTC
	2	+++ client/vector/analyzeFuncs_altivec.cpp
	3	@@ -31,7 +31,7 @@
	4	// This file is empty is USE_ALTIVEC is not defined
	5	#include "sah_config.h"
	6
	7	-#if defined(__ppc__) && defined(USE_ALTIVEC)
	8	+#if defined(__ppc__) && defined(USE_ALTIVEC) && defined(__APPLE__)
	9
	10	#define INVALID_CHIRP 2e+20
	11




--- client/vector/analyzeFuncs_vector.cpp.orig	2018-01-14 23:02:12 UTC
+++ client/vector/analyzeFuncs_vector.cpp
@@ -101,7 +101,7 @@
 #if defined(HAVE__ISNAN)
 #define isnotnan(x) (!_isnan(x))
 #elif defined(HAVE_ISNAN)
-#define isnotnan(x) (!isnan(x))
+#define isnotnan(x) (!std::isnan(x))
 #elif defined(HAVE___ISNAN)
 #define isnotnan(x) (!__isnan(x))
 #else
@@ -338,7 +338,7 @@ bool found_baseline_smooth=false;
 
 GPStb GetPowerSpectrumFuncs[]={
     v_GetPowerSpectrum, BA_ANY, "v_GetPowerSpectrum",
-#ifdef USE_ALTIVEC
+#if defined(USE_ALTIVEC) && defined(__APPLE__)
     v_vGetPowerSpectrum, BA_ALTVC, "v_vGetPowerSpectrum", 
     v_vGetPowerSpectrumG4, BA_ALTVC,"v_vGetPowerSpectrumG4",
 #endif
@@ -374,7 +374,7 @@ CDtb ChirpDataFuncs[]={
     fpu_ChirpData, BA_ANY, "fpu_ChirpData",
     fpu_opt_ChirpData, BA_ANY, "fpu_opt_ChirpData",
 #endif
-#ifdef USE_ALTIVEC
+#if defined(USE_ALTIVEC) && defined(__APPLE__)
     v_vChirpData, BA_ALTVC, "v_vChirpData",  
     v_vChirpDataG4, BA_ALTVC, "v_vChirpDataG4",
     v_vChirpDataG5, BA_ALTVC, "v_vChirpDataG5",
@@ -432,7 +432,7 @@ TPtb TransposeFuncs[]={
 #ifdef USE_FFTWF
     fftwf_transpose, BA_ANY, "fftwf_transpose",
 #endif
-#ifdef USE_ALTIVEC
+#if defined(USE_ALTIVEC) && defined(__APPLE__)
     v_vTranspose, BA_ALTVC, "v_vTranspose",
 #endif
 #ifdef USE_SSE 
@@ -461,7 +461,7 @@ TPtb TransposeFuncs[]={
      v_avxTranspose8x8ntw_b, BA_AVX, "v_avxTranspose8x8ntw_b", 
 #  endif
 #endif
-#if (defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__)) || defined(__arch64__)
+#if (defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__)) || defined(__aarch64__)
     v_pfTranspose2, BA_VFP, "v_pfTranspose2",      
     v_pfTranspose4, BA_VFP, "v_pfTranspose4",      
     v_pfTranspose8, BA_VFP, "v_pfTranspose8",      
@@ -476,7 +476,7 @@ bool found_transpose=false;
 
 FolSub FoldSubs[] = {
   &swifold,      BA_ANY,
-#ifdef USE_ALTIVEC
+#if defined(USE_ALTIVEC) && defined(__APPLE__)
   &AKavfold,     BA_ALTVC,
 #endif
 #ifdef USE_SSE 

Line 0 Link Here

(-)files/patch-client_vector_analyzeFuncs__vector.h (+11 lines)
	1	--- client/vector/analyzeFuncs_vector.h.orig 2018-12-18 12:22:10 UTC
	2	+++ client/vector/analyzeFuncs_vector.h
	3	@@ -275,7 +275,7 @@ extern int v_vGetPowerSpectrumUnrolled2(
	4	);
	5	#endif
	6
	7	-#ifdef USE_ALTIVEC
	8	+#if defined(USE_ALTIVEC) && defined(__APPLE)
	9	extern int v_vGetPowerSpectrumG4(
	10	sah_complex * cx_FreqData,
	11	float * fp_PowerSpectrum,

Return to bug 234145

Lines 18-30 Link Here

(-)Makefile (-3 / +3 lines)
18	BROKEN_aarch64= fails to link: vector/analyzeFuncs_vector.cpp:(.data+0x38): undefined symbol 'vfp_GetPowerSpectrum(float () [2], float, int)'	18	BROKEN_aarch64= fails to link: vector/analyzeFuncs_vector.cpp:(.data+0x38): undefined symbol 'vfp_GetPowerSpectrum(float () [2], float, int)'
19	BROKEN_armv6= fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?	19	BROKEN_armv6= fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
20	BROKEN_armv7= fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?	20	BROKEN_armv7= fails to compile: vector/analyzeFuncs_neon.S:178:17: invalid instruction, did you mean: neg?
21	BROKEN_powerpc64= fails to compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory
22		21
23	BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3	22	BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3
24	RUN_DEPENDS= boinc_client:net/boinc-client	23	RUN_DEPENDS= boinc_client:net/boinc-client
25	LIB_DEPENDS= libfftw3f.so:math/fftw3-float	24	LIB_DEPENDS= libfftw3f.so:math/fftw3-float
26		25
27	USES= autoreconf compiler gmake libtool pkgconfig tar:xz	26	USES= autoreconf compiler:c++11-lang gmake gnome libtool pkgconfig \
		27	tar:xz
28		28
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30		30
Lines 47-53 Link Here
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48		48
49	X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client	49	X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
50	X11_USES= jpeg	50	X11_USES= gl jpeg
51	X11_USE= GL=gl,glu,glut \	51	X11_USE= GL=gl,glu,glut \
52	XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm	52	XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
53	X11_CONFIGURE_ENABLE= graphics	53	X11_CONFIGURE_ENABLE= graphics

Line 0 Link Here

(-)files/patch-client_vector_analyzeFuncs__vector.cpp (+56 lines)
	1	--- client/vector/analyzeFuncs_vector.cpp.orig 2018-01-14 23:02:12 UTC
	2	+++ client/vector/analyzeFuncs_vector.cpp
	3	@@ -101,7 +101,7 @@
	4	#if defined(HAVE__ISNAN)
	5	#define isnotnan(x) (!_isnan(x))
	6	#elif defined(HAVE_ISNAN)
	7	-#define isnotnan(x) (!isnan(x))
	8	+#define isnotnan(x) (!std::isnan(x))
	9	#elif defined(HAVE___ISNAN)
	10	#define isnotnan(x) (!__isnan(x))
	11	#else
	12	@@ -338,7 +338,7 @@ bool found_baseline_smooth=false;
	13
	14	GPStb GetPowerSpectrumFuncs[]={
	15	v_GetPowerSpectrum, BA_ANY, "v_GetPowerSpectrum",
	16	-#ifdef USE_ALTIVEC
	17	+#if defined(USE_ALTIVEC) && defined(__APPLE__)
	18	v_vGetPowerSpectrum, BA_ALTVC, "v_vGetPowerSpectrum",
	19	v_vGetPowerSpectrumG4, BA_ALTVC,"v_vGetPowerSpectrumG4",
	20	#endif
	21	@@ -374,7 +374,7 @@ CDtb ChirpDataFuncs[]={
	22	fpu_ChirpData, BA_ANY, "fpu_ChirpData",
	23	fpu_opt_ChirpData, BA_ANY, "fpu_opt_ChirpData",
	24	#endif
	25	-#ifdef USE_ALTIVEC
	26	+#if defined(USE_ALTIVEC) && defined(__APPLE__)
	27	v_vChirpData, BA_ALTVC, "v_vChirpData",
	28	v_vChirpDataG4, BA_ALTVC, "v_vChirpDataG4",
	29	v_vChirpDataG5, BA_ALTVC, "v_vChirpDataG5",
	30	@@ -432,7 +432,7 @@ TPtb TransposeFuncs[]={
	31	#ifdef USE_FFTWF
	32	fftwf_transpose, BA_ANY, "fftwf_transpose",
	33	#endif
	34	-#ifdef USE_ALTIVEC
	35	+#if defined(USE_ALTIVEC) && defined(__APPLE__)
	36	v_vTranspose, BA_ALTVC, "v_vTranspose",
	37	#endif
	38	#ifdef USE_SSE
	39	@@ -461,7 +461,7 @@ TPtb TransposeFuncs[]={
	40	v_avxTranspose8x8ntw_b, BA_AVX, "v_avxTranspose8x8ntw_b",
	41	# endif
	42	#endif
	43	-#if (defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__)) \|\| defined(__arch64__)
	44	+#if (defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__)) \|\| defined(__aarch64__)
	45	v_pfTranspose2, BA_VFP, "v_pfTranspose2",
	46	v_pfTranspose4, BA_VFP, "v_pfTranspose4",
	47	v_pfTranspose8, BA_VFP, "v_pfTranspose8",
	48	@@ -476,7 +476,7 @@ bool found_transpose=false;
	49
	50	FolSub FoldSubs[] = {
	51	&swifold, BA_ANY,
	52	-#ifdef USE_ALTIVEC
	53	+#if defined(USE_ALTIVEC) && defined(__APPLE__)
	54	&AKavfold, BA_ALTVC,
	55	#endif
	56	#ifdef USE_SSE