Skip to content

Commit e99e99e

Browse files
committed
Rename PowerPC specific files
This will allow us to filter-out some files more easily. Also see weidai11/cryptopp@48377cac698b
1 parent 9fc2257 commit e99e99e

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

Makefile.am

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ endif
100100

101101
if CRYPTOPP_PPC_SOURCES
102102
EXTRA_LTLIBRARIES += libppc_simd.la
103-
EXTRA_LTLIBRARIES += libppc_power7.la
104-
EXTRA_LTLIBRARIES += libppc_power8.la
105-
EXTRA_LTLIBRARIES += libppc_power9.la
103+
EXTRA_LTLIBRARIES += libpower7_ppc.la
104+
EXTRA_LTLIBRARIES += libpower8_ppc.la
105+
EXTRA_LTLIBRARIES += libpower9_ppc.la
106106
endif
107107

108108
## ARMv7-a AES and SHA by Andy Polyakov
@@ -168,9 +168,9 @@ endif
168168

169169
if CRYPTOPP_PPC_SOURCES
170170
libcryptopp_la_LIBADD += $(libppc_simd_la_OBJECTS)
171-
libcryptopp_la_LIBADD += $(libppc_power7_la_OBJECTS)
172-
libcryptopp_la_LIBADD += $(libppc_power8_la_OBJECTS)
173-
libcryptopp_la_LIBADD += $(libppc_power9_la_OBJECTS)
171+
libcryptopp_la_LIBADD += $(libpower7_ppc_la_OBJECTS)
172+
libcryptopp_la_LIBADD += $(libpower8_ppc_la_OBJECTS)
173+
libcryptopp_la_LIBADD += $(libpower9_ppc_la_OBJECTS)
174174
endif
175175

176176
## ARMv7-a AES and SHA by Andy Polyakov
@@ -232,9 +232,9 @@ endif
232232

233233
if CRYPTOPP_PPC_SOURCES
234234
libcryptopp_la_DEPENDENCIES += $(libppc_simd_la_OBJECTS)
235-
libcryptopp_la_DEPENDENCIES += $(libppc_power7_la_OBJECTS)
236-
libcryptopp_la_DEPENDENCIES += $(libppc_power8_la_OBJECTS)
237-
libcryptopp_la_DEPENDENCIES += $(libppc_power9_la_OBJECTS)
235+
libcryptopp_la_DEPENDENCIES += $(libpower7_ppc_la_OBJECTS)
236+
libcryptopp_la_DEPENDENCIES += $(libpower8_ppc_la_OBJECTS)
237+
libcryptopp_la_DEPENDENCIES += $(libpower9_ppc_la_OBJECTS)
238238
endif
239239

240240
## ARMv7-a AES and SHA by Andy Polyakov
@@ -321,17 +321,6 @@ libneon_simd_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_NEON_FLAG)
321321
libppc_simd_la_SOURCES = ppc_simd.cpp
322322
libppc_simd_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_ALTIVEC_FLAG)
323323

324-
libppc_power7_la_SOURCES = ppc_power7.cpp
325-
libppc_power7_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_POWER7_FLAG)
326-
327-
libppc_power8_la_SOURCES = ppc_power8.cpp
328-
libppc_power8_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_POWER8_FLAG)
329-
330-
# Do not use CRYPTOPP_POWER9_FLAG. See https://github.com/weidai11/cryptopp/issues/986
331-
libppc_power9_la_SOURCES = ppc_power9.cpp
332-
# libppc_power9_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_POWER9_FLAG)
333-
libppc_power9_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS)
334-
335324
librijndael_simd_la_SOURCES = rijndael_simd.cpp
336325
librijndael_simd_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_AES_FLAG)
337326

0 commit comments

Comments
 (0)