arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use clean compile as feature test gate on PowerPC (GH #742)

pull/748/head
Jeffrey Walton 2018-11-18 20:49:55 -05:00
parent 76cb99ffe8
commit 1ac7207545
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
GNUmakefile
View File

@ -617,16 +617,16 @@ ifeq ($(DETECT_FEATURES),1)
#ifeq ($(findstring -qxlcompatmacros,$(CXXFLAGS)),) #ifeq ($(findstring -qxlcompatmacros,$(CXXFLAGS)),)
# TPROG = TestPrograms/test_ppc_altivec.cxx # TPROG = TestPrograms/test_ppc_altivec.cxx
# TOPT = -qxlcompatmacros # TOPT = -qxlcompatmacros
# HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) # HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
# ifeq ($(HAVE_OPT),0) # ifeq ($(strip $(HAVE_OPT)),0)
# CXXFLAGS += -qxlcompatmacros # CXXFLAGS += -qxlcompatmacros
# endif # endif
#endif #endif
TPROG = TestPrograms/test_ppc_power8.cxx TPROG = TestPrograms/test_ppc_power8.cxx
TOPT = $(POWER9_FLAG) TOPT = $(POWER9_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER9_FLAG) ALTIVEC_FLAG = $(POWER9_FLAG)
AES_FLAG = $(POWER9_FLAG) AES_FLAG = $(POWER9_FLAG)
BLAKE2B_FLAG = $(POWER9_FLAG) BLAKE2B_FLAG = $(POWER9_FLAG)
@ -645,8 +645,8 @@ ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_ppc_power8.cxx TPROG = TestPrograms/test_ppc_power8.cxx
TOPT = $(POWER8_FLAG) TOPT = $(POWER8_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER8_FLAG) ALTIVEC_FLAG = $(POWER8_FLAG)
AES_FLAG = $(POWER8_FLAG) AES_FLAG = $(POWER8_FLAG)
BLAKE2B_FLAG = $(POWER8_FLAG) BLAKE2B_FLAG = $(POWER8_FLAG)
@ -665,8 +665,8 @@ ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_ppc_power7.cxx TPROG = TestPrograms/test_ppc_power7.cxx
TOPT = $(POWER7_FLAG) TOPT = $(POWER7_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER7_FLAG) ALTIVEC_FLAG = $(POWER7_FLAG)
ARIA_FLAG = $(POWER7_FLAG) ARIA_FLAG = $(POWER7_FLAG)
BLAKE2S_FLAG = $(POWER7_FLAG) BLAKE2S_FLAG = $(POWER7_FLAG)
@ -682,8 +682,8 @@ ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_ppc_altivec.cxx TPROG = TestPrograms/test_ppc_altivec.cxx
TOPT = $(POWER6_FLAG) TOPT = $(POWER6_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER6_FLAG) ALTIVEC_FLAG = $(POWER6_FLAG)
else else
POWER6_FLAG = POWER6_FLAG =
@ -691,8 +691,8 @@ ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_ppc_altivec.cxx TPROG = TestPrograms/test_ppc_altivec.cxx
TOPT = $(POWER5_FLAG) TOPT = $(POWER5_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER5_FLAG) ALTIVEC_FLAG = $(POWER5_FLAG)
else else
POWER5_FLAG = POWER5_FLAG =
@ -700,8 +700,8 @@ ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_ppc_altivec.cxx TPROG = TestPrograms/test_ppc_altivec.cxx
TOPT = $(POWER4_FLAG) TOPT = $(POWER4_FLAG)
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(HAVE_OPT),0) ifeq ($(strip $(HAVE_OPT)),0)
ALTIVEC_FLAG = $(POWER4_FLAG) ALTIVEC_FLAG = $(POWER4_FLAG)
else else
POWER4_FLAG = POWER4_FLAG =