Unify ppc assembler make rules.

1 files changed, 45 insertions, 45 deletions

diff --git a/TABLE b/TABLE
index 26b43d880d..c2a67bfb83 100644
--- a/TABLE
+++ b/TABLE
@@ -728,20 +728,20 @@ $thread_cflag = -qthreaded
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR
-$cpuid_obj    = ppccpuid_aix32.o
-$bn_obj       = aix_ppc32.o aix_ppc32-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_aix32.o sha256-ppc_aix32.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = aix32
 $dso_scheme   = dlfcn
 $shared_target= aix-shared
 $shared_cflag = 
@@ -758,20 +758,20 @@ $thread_cflag = -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR
-$cpuid_obj    = ppccpuid_aix32.o
-$bn_obj       = aix_ppc32.o aix_ppc32-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_aix32.o sha256-ppc_aix32.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = aix32
 $dso_scheme   = dlfcn
 $shared_target= aix-shared
 $shared_cflag = 
@@ -818,20 +818,20 @@ $thread_cflag = -qthreaded
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
-$cpuid_obj    = ppccpuid_aix64.o
-$bn_obj       = aix_ppc64.o aix_ppc64-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o ppc-mont.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = aix64
 $dso_scheme   = dlfcn
 $shared_target= aix-shared
 $shared_cflag = 
@@ -848,20 +848,20 @@ $thread_cflag = -D_THREAD_SAFE
 $sys_id       = AIX
 $lflags       = 
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR
-$cpuid_obj    = ppccpuid_aix64.o
-$bn_obj       = aix_ppc64.o aix_ppc64-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o ppc-mont.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = aix64
 $dso_scheme   = dlfcn
 $shared_target= aix-shared
 $shared_cflag = 
@@ -1118,20 +1118,20 @@ $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid_osx32.o
-$bn_obj       = osx_ppc32.o osx_ppc32-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_osx32.o sha256-ppc_osx32.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = osx32
 $dso_scheme   = dlfcn
 $shared_target= darwin-shared
 $shared_cflag = -fPIC -fno-common
@@ -1148,20 +1148,20 @@ $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = -Wl,-search_paths_first%
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = ppccpuid_osx64.o
-$bn_obj       = osx_ppc64.o osx_ppc64-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o ppc-mont.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = osx64
 $dso_scheme   = dlfcn
 $shared_target= darwin-shared
 $shared_cflag = -fPIC -fno-common
@@ -1478,20 +1478,20 @@ $thread_cflag = -D_REENTRANT
 $sys_id       = MACOSX
 $lflags       = 
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
-$cpuid_obj    = 
-$bn_obj       = osx_ppc32.o osx_ppc32-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_osx32.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = osx32
 $dso_scheme   = dlfcn
 $shared_target= darwin-shared
 $shared_cflag = -fPIC
@@ -3278,20 +3278,20 @@ $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
 $bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = ppccpuid_linux32.o
-$bn_obj       = linux_ppc32.o linux_ppc32-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_linux32.o sha256-ppc_linux32.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = linux32
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC
@@ -3308,20 +3308,20 @@ $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $lflags       = -ldl
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
-$cpuid_obj    = ppccpuid_linux64.o
-$bn_obj       = linux_ppc64.o linux_ppc64-mont.o
+$cpuid_obj    = ppccpuid.o
+$bn_obj       = bn-ppc.o ppc-mont.o
 $des_obj      = 
-$aes_obj      = 
+$aes_obj      = aes_core.o aes_cbc.o aes-ppc.o
 $bf_obj       = 
 $md5_obj      = 
-$sha1_obj     = sha1-ppc_linux64.o sha256-ppc_linux64.o sha512-ppc_linux64.o
+$sha1_obj     = sha1-ppc.o sha256-ppc.o sha512-ppc.o
 $cast_obj     = 
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
 $wp_obj       = 
 $cmll_obj     = 
-$perlasm_scheme = void
+$perlasm_scheme = linux64
 $dso_scheme   = dlfcn
 $shared_target= linux-shared
 $shared_cflag = -fPIC