From 537fcd97235a7e5718441ce0e93c5daccdea0afc Mon Sep 17 00:00:00 2001 From: kubodera_yuichi Date: Fri, 8 Jan 2010 06:11:40 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA?= =?UTF-8?q?=E3=81=AE=E3=83=9E=E3=83=BC=E3=82=B8=E3=83=97=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=83=A9=E3=83=A0=E4=BF=AE=E6=AD=A3(=E4=B8=80=E3=81=A4?= =?UTF-8?q?=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F=E6=96=B9=E3=81=8C?= =?UTF-8?q?=E8=89=AF=E3=81=84=E3=81=8B=E3=82=82=E3=81=97=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=83=BB=E3=83=BB=E3=83=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@160 ff987cc8-cf2f-4642-8568-d52cce064691 --- Makefile | 2 +- tools/merge_lib_objs.plx | 41 ++++++++++++++------ tools/merge_lib_objs_hsm.plx | 73 +++++++++++++++++------------------- 3 files changed, 64 insertions(+), 52 deletions(-) diff --git a/Makefile b/Makefile index f60ae0a..d06b182 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ PACKAGE_DIR = ./package # OPENSSL_DIR = ./openssl-1.0.0-beta2 OPENSSL_DIR = ./openssl-0.9.8k -TARGET_LIB = lib_gen_id.a +TARGET_LIB = libgenid.a TARGET = gen_id diff --git a/tools/merge_lib_objs.plx b/tools/merge_lib_objs.plx index b5832b0..619dd07 100644 --- a/tools/merge_lib_objs.plx +++ b/tools/merge_lib_objs.plx @@ -1,19 +1,36 @@ #!/usr/bin/perl -w use strict; +my $lib_name = "../libgenid.a"; + +my @lib_list = +( + "../openssl-0.9.8k/libcrypto.a", + "../openssl-0.9.8k/libssl.a", +); + +# move work directory print "cd dep_objs/\n"; chdir 'dep_objs'; -print "ar x ../openssl-0.9.8k/libcrypto.a\n"; -system "ar", "x", "../openssl-0.9.8k/libcrypto.a"; +# merge lib +foreach ( @lib_list ) +{ + print "ar x $_\n"; + system "ar", "x", $_; + if ( /libnf(.*)\.a/ ) + { + print "mv sys-unix.o sys-unix-$1.o\n"; + system "mv", "sys-unix.o", "sys-unix-$1.o"; + } + &merge_obj; +} -print "ar x ../openssl-0.9.8k/libssl.a\n"; -system "ar", "x", "../openssl-0.9.8k/libssl.a"; - -my @object_files = glob "*.o"; - -print "ar rcs ../lib_gen_id.a @object_files\n"; -system "ar", "rcs", "../lib_gen_id.a", @object_files; - -print "rm @object_files\n"; -system "rm", @object_files; +sub merge_obj +{ + my @object_files = glob "*.o"; + print "ar rcs $lib_name @object_files\n"; + system "ar", "rcs", $lib_name, @object_files; + print "rm *.o\n"; + system "rm", @object_files; +} diff --git a/tools/merge_lib_objs_hsm.plx b/tools/merge_lib_objs_hsm.plx index 263cacf..a721956 100644 --- a/tools/merge_lib_objs_hsm.plx +++ b/tools/merge_lib_objs_hsm.plx @@ -1,45 +1,40 @@ #!/usr/bin/perl -w use strict; - + +my $lib_name = "../libgenid.a"; + +my @lib_list = +( + "../openssl-0.9.8k/libcrypto.a", + "../openssl-0.9.8k/libssl.a", + "/opt/nfast/c/ctd/gcc/lib/libnflog.a", + "/opt/nfast/c/ctd/gcc/lib/libcutils.a", + "/opt/nfast/c/ctd/gcc/lib/libnfstub.a", + "/opt/nfast/c/ctd/gcc/lib/libnfkm.a" +); + +# move work directory print "cd dep_objs/\n"; chdir 'dep_objs'; -# openssl -print "ar x ../openssl-0.9.8k/libcrypto.a\n"; -system "ar", "x", "../openssl-0.9.8k/libcrypto.a"; - -print "ar x ../openssl-0.9.8k/libssl.a\n"; -system "ar", "x", "../openssl-0.9.8k/libssl.a"; +# merge lib +foreach ( @lib_list ) +{ + print "ar x $_\n"; + system "ar", "x", $_; + if ( /libnf(.*)\.a/ ) + { + print "mv sys-unix.o sys-unix-$1.o\n"; + system "mv", "sys-unix.o", "sys-unix-$1.o"; + } + &merge_obj; +} -# hsm -print "ar x /opt/nfast/c/ctd/gcc/lib/libchknfast.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libchknfast.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libnfhwcrhk.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfhwcrhk.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libnfkm.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfkm.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libnfkma.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfkma.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/librqcard.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/librqcard.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libnfstub.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfstub.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libnflog.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnflog.a"; - -print "ar x /opt/nfast/c/ctd/gcc/lib/libcutils.a\n"; -system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libcutils.a"; - -my @object_files = glob "*.o"; - -print "ar rcs ../lib_gen_id.a @object_files\n"; -system "ar", "rcs", "../lib_gen_id.a", @object_files; - -print "rm *.o\n"; -system "rm", @object_files; +sub merge_obj +{ + my @object_files = glob "*.o"; + print "ar rcs $lib_name @object_files\n"; + system "ar", "rcs", $lib_name, @object_files; + print "rm *.o\n"; + system "rm", @object_files; +}