From 5379eff022072a6738d1d3d82e8208db9f7f36f1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 17 May 2014 16:01:30 -0700 Subject: [PATCH] Remove routines for making exports/linux.def Signed-off-by: Timothy Gu --- exports/Makefile | 7 ++----- exports/gensymbol | 33 --------------------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/exports/Makefile b/exports/Makefile index 8e50a9809..2ff7adb78 100644 --- a/exports/Makefile +++ b/exports/Makefile @@ -123,7 +123,7 @@ ifeq ($(OSNAME), Linux) so : ../$(LIBSONAME) -../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c +../$(LIBSONAME) : ../$(LIBNAME) linktest.c ifneq ($(C_COMPILER), LSB) $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ @@ -145,7 +145,7 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD)) so : ../$(LIBSONAME) -../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c +../$(LIBSONAME) : ../$(LIBNAME) linktest.c $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ $(FEXTRALIB) $(EXTRALIB) @@ -197,9 +197,6 @@ static : ../$(LIBNAME) $(AR) -cq ../$(LIBNAME) 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 perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F) diff --git a/exports/gensymbol b/exports/gensymbol index daedf8dcc..b20297d95 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -2771,14 +2771,6 @@ if ($ARGV[6] == 1) { @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); @hplobjs2 = (HPL_dlaswp00N, HPL_dlaswp01N, HPL_dlaswp01T); @@ -2786,31 +2778,6 @@ $bu = $ARGV[2]; $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"){ @underscore_objs = (@underscore_objs, @misc_common_objs);