Remove routines for making exports/linux.def

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2014-05-17 16:01:30 -07:00
parent c38379c9dd
commit 5379eff022
2 changed files with 2 additions and 38 deletions

View File

@ -123,7 +123,7 @@ ifeq ($(OSNAME), Linux)
so : ../$(LIBSONAME) so : ../$(LIBSONAME)
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c ../$(LIBSONAME) : ../$(LIBNAME) linktest.c
ifneq ($(C_COMPILER), LSB) ifneq ($(C_COMPILER), LSB)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
@ -145,7 +145,7 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
so : ../$(LIBSONAME) so : ../$(LIBSONAME)
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c ../$(LIBSONAME) : ../$(LIBNAME) linktest.c
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
$(FEXTRALIB) $(EXTRALIB) $(FEXTRALIB) $(EXTRALIB)
@ -197,9 +197,6 @@ static : ../$(LIBNAME)
$(AR) -cq ../$(LIBNAME) goto.$(SUFFIX) $(AR) -cq ../$(LIBNAME) goto.$(SUFFIX)
rm -f goto.$(SUFFIX) rm -f goto.$(SUFFIX)
linux.def : gensymbol ../Makefile.system ../getarch.c
perl ./gensymbol linux $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
osx.def : gensymbol ../Makefile.system ../getarch.c osx.def : gensymbol ../Makefile.system ../getarch.c
perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F) perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)

View File

@ -2771,14 +2771,6 @@ if ($ARGV[6] == 1) {
@no_underscore_objs = (@no_underscore_objs, @lapackeobjs); @no_underscore_objs = (@no_underscore_objs, @lapackeobjs);
} }
@linuxobjs = ('__strtol_internal', 'exit', 'free', 'getenv', 'malloc',
'mmap', 'printf', 'sqrt',
'pthread_cond_broadcast', 'pthread_cond_destroy',
'pthread_cond_init', 'pthread_cond_signal', 'pthread_cond_wait',
'pthread_create', 'pthread_exit', 'pthread_join',
'pthread_mutex_destroy', 'pthread_mutex_init',
'pthread_mutex_lock', 'pthread_mutex_unlock');
@hplobjs = (daxpy, dcopy, dscal, idamax, dgemv, dtrsv, dger, dgemm, dtrsm); @hplobjs = (daxpy, dcopy, dscal, idamax, dgemv, dtrsv, dger, dgemm, dtrsm);
@hplobjs2 = (HPL_dlaswp00N, HPL_dlaswp01N, HPL_dlaswp01T); @hplobjs2 = (HPL_dlaswp00N, HPL_dlaswp01N, HPL_dlaswp01T);
@ -2786,31 +2778,6 @@ $bu = $ARGV[2];
$bu = "" if (($bu eq "0") || ($bu eq "1")); $bu = "" if (($bu eq "0") || ($bu eq "1"));
if ($ARGV[0] eq "linux"){
@underscore_objs = (@underscore_objs, @misc_common_objs);
@no_underscore_objs = (@no_underscore_objs, @misc_common_objs);
foreach $objs (@underscore_objs) {
print $objs, $bu, "\n";
}
foreach $objs (@need_2underscore_objs) {
print $objs, $bu, $bu, "\n";
}
# if ($ARGV[4] == 0) {
foreach $objs (@no_underscore_objs) {
print $objs, "\n";
}
# }
foreach $objs (@linuxobjs) {
print $objs, "\n";
}
exit(0);
}
if ($ARGV[0] eq "osx"){ if ($ARGV[0] eq "osx"){
@underscore_objs = (@underscore_objs, @misc_common_objs); @underscore_objs = (@underscore_objs, @misc_common_objs);