[atlas] 02/10: Refresh patches.
Sébastien Villemot
sebastien at debian.org
Fri Jul 29 13:35:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository atlas.
commit ea6eba74d6476fe981c6d775222836028fd298bb
Author: Sébastien Villemot <sebastien at debian.org>
Date: Fri Jul 29 15:19:58 2016 +0200
Refresh patches.
Gbp-Dch: Ignore
---
debian/patches/02_rename_lapack_atlas.diff | 4 +--
debian/patches/10_s390.diff | 18 +++++-----
debian/patches/17_hppa.diff | 10 +++---
debian/patches/18_alpha.diff | 6 ++--
debian/patches/20_armel.diff | 6 ++--
debian/patches/21_mips2.diff | 8 ++---
debian/patches/22_sh.diff | 16 ++++-----
debian/patches/generic.diff | 44 +++++++++++------------
debian/patches/kfreebsd.diff | 2 +-
debian/patches/powerpc-dcbt.patch | 2 +-
debian/patches/ppc64el-ifdef-files-with-lvx.patch | 2 +-
debian/patches/shared_libraries.diff | 2 +-
debian/patches/static_full_blas_lapack.diff | 14 ++++----
13 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/debian/patches/02_rename_lapack_atlas.diff b/debian/patches/02_rename_lapack_atlas.diff
index dfa6a6c..4302e51 100644
--- a/debian/patches/02_rename_lapack_atlas.diff
+++ b/debian/patches/02_rename_lapack_atlas.diff
@@ -7,7 +7,7 @@
@DPATCH@
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -595,7 +595,7 @@ int main(int nargs, char **args)
+@@ -615,7 +615,7 @@ int main(int nargs, char **args)
fprintf(fpout, " ATLASlib = $(LIBdir)/libatlas.a\n");
fprintf(fpout, " CBLASlib = $(LIBdir)/libcblas.a\n");
fprintf(fpout, " F77BLASlib = $(LIBdir)/libf77blas.a\n");
@@ -44,7 +44,7 @@
+CDYNlibs = liblapack_atlas.so libcblas.so libatlas.so
+CPTDYNlibs = liblapack_atlas.so libptcblas.so libatlas.so
- VER=3.10.2
+ VER=3.10.3
tmpd = RCW_tMp
@@ -26,7 +26,7 @@ $(tarnam).tar.bz2 :
cp $(LIBdir)/libatlas.a $(ARCH)/lib/.
diff --git a/debian/patches/10_s390.diff b/debian/patches/10_s390.diff
index 9d73afc..59c459c 100644
--- a/debian/patches/10_s390.diff
+++ b/debian/patches/10_s390.diff
@@ -1,15 +1,15 @@
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -394,7 +394,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -404,7 +404,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
- if (!CompIsGcc(comp))
- {
- /*
-@@ -774,8 +774,6 @@ int main(int nargs, char **args)
+ if (OS == OSAIX)
+ return((ptrbits == 64) ? "-maix64" : "-maix32");
+
+@@ -801,8 +801,6 @@ int main(int nargs, char **args)
fprintf(fpout, "_fbsd");
}
}
@@ -20,12 +20,12 @@
fprintf(fpout, " NCFLAGS = $(KCFLAGS)\n");
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -587,7 +587,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -598,7 +598,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsMIPS(arch))
return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
if (MachIsS390(arch))
- return((ptrbits == 64) ? "-m64" : "-m31");
+ return(sp);
- if (!CompIsGcc(comp))
- {
- /*
+ if (OS == OSAIX)
+ return((ptrbits == 64) ? "-maix64" : "-maix32");
+
diff --git a/debian/patches/17_hppa.diff b/debian/patches/17_hppa.diff
index 613d015..c7818d4 100644
--- a/debian/patches/17_hppa.diff
+++ b/debian/patches/17_hppa.diff
@@ -1,9 +1,9 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -63,7 +63,13 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
- ( (mach_) == ARMv7 )
+@@ -83,7 +83,13 @@ enum MACHTYPE {MACHOther, PPCG4, PPCG5,
+ ( (mach_) >= ARM64xg && || (mach_) <= ARM64a57)
#define MachIsS390(mach_) \
- ( (mach_) >= IbmZ9 && (mach_) <= IbmZ196 )
+ ( (mach_) >= IbmZ9 && (mach_) <= IbmZ13 )
-
+#ifdef __hppa__
+#define MachIsHPPA(mach_) \
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -391,6 +391,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -401,6 +401,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsIA64(arch))
return(sp);
@@ -28,7 +28,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -584,6 +584,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -595,6 +595,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsIA64(arch))
return(sp);
diff --git a/debian/patches/18_alpha.diff b/debian/patches/18_alpha.diff
index ebdb9d7..09010f7 100644
--- a/debian/patches/18_alpha.diff
+++ b/debian/patches/18_alpha.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -70,6 +70,13 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
+@@ -90,6 +90,13 @@ enum MACHTYPE {MACHOther, PPCG4, PPCG5,
#define MachIsHPPA(mach_) \
( 0 )
#endif
@@ -16,7 +16,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -393,6 +393,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -403,6 +403,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsHPPA(arch))
return(sp);
@@ -27,7 +27,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -586,6 +586,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -597,6 +597,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsHPPA(arch))
return(sp);
diff --git a/debian/patches/20_armel.diff b/debian/patches/20_armel.diff
index e0f5d64..49cc16a 100644
--- a/debian/patches/20_armel.diff
+++ b/debian/patches/20_armel.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -77,6 +77,14 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
+@@ -97,6 +97,14 @@ enum MACHTYPE {MACHOther, PPCG4, PPCG5,
#define MachIsALPHA(mach_) \
( 0 )
#endif
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -395,6 +395,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -405,6 +405,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsALPHA(arch))
return(sp);
@@ -28,7 +28,7 @@
if (MachIsS390(arch))
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -588,6 +588,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -599,6 +599,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsALPHA(arch))
return(sp);
diff --git a/debian/patches/21_mips2.diff b/debian/patches/21_mips2.diff
index ba7dcab..7ffa4ea 100644
--- a/debian/patches/21_mips2.diff
+++ b/debian/patches/21_mips2.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -398,7 +398,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -408,7 +408,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
@@ -8,10 +8,10 @@
+ return(sp);
if (MachIsS390(arch))
return(sp);
- if (!CompIsGcc(comp))
+ if (OS == OSAIX)
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -591,7 +591,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -602,7 +602,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
if (MachIsARMEL(arch))
return(sp);
if (MachIsMIPS(arch))
@@ -19,4 +19,4 @@
+ return(sp);
if (MachIsS390(arch))
return(sp);
- if (!CompIsGcc(comp))
+ if (OS == OSAIX)
diff --git a/debian/patches/22_sh.diff b/debian/patches/22_sh.diff
index 6661e85..350e4e1 100644
--- a/debian/patches/22_sh.diff
+++ b/debian/patches/22_sh.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -85,6 +85,14 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
+@@ -105,6 +105,14 @@ enum MACHTYPE {MACHOther, PPCG4, PPCG5,
( 0 )
#endif
@@ -17,7 +17,7 @@
static char *f2c_intstr[5] =
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -399,6 +399,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
+@@ -409,6 +409,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
if (MachIsMIPS(arch))
return(sp);
@@ -25,15 +25,15 @@
+ return(sp);
if (MachIsS390(arch))
return(sp);
- if (!CompIsGcc(comp))
+ if (OS == OSAIX)
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
-@@ -594,6 +594,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
- return(sp);
- if (MachIsS390(arch))
+@@ -607,6 +607,8 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enu
return(sp);
+ if (OS == OSAIX)
+ return((ptrbits == 64) ? "-maix64" : "-maix32");
+ if (MachIsSH(arch))
-+ return(sp);
++ return(sp);
+
if (!CompIsGcc(comp))
{
- /*
diff --git a/debian/patches/generic.diff b/debian/patches/generic.diff
index c535ce7..84c44da 100644
--- a/debian/patches/generic.diff
+++ b/debian/patches/generic.diff
@@ -11,30 +11,30 @@ Last-Update: 2014-07-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CONFIG/include/atlconf.h
+++ b/CONFIG/include/atlconf.h
-@@ -18,7 +18,7 @@ enum OSTYPE {OSOther=0, OSLinux, OSSunOS
- enum ARCHFAM {AFOther=0, AFPPC, AFSPARC, AFALPHA, AFX86, AFIA64, AFMIPS,
- AFARM, AFS390};
-
--#define NMACH 52
-+#define NMACH 53
+@@ -25,7 +25,7 @@ enum ARCHFAM {AFOther=0, AFPPC, AFSPARC,
+ * Corei3EP: v3 Haswell, E5-26XX
+ * Corei4: skylake
+ */
+-#define NMACH 62
++#define NMACH 63
static char *machnam[NMACH] =
- {"UNKNOWN", "POWER3", "POWER4", "POWER5", "PPCG4", "PPCG5",
- "POWER6", "POWER7", "POWERe6500", "IBMz9", "IBMz10", "IBMz196",
-@@ -29,7 +29,7 @@ static char *machnam[NMACH] =
- "Efficeon", "K7", "HAMMER", "AMD64K10h", "AMDLLANO", "AMDDOZER","AMDDRIVER",
- "UNKNOWNx86", "IA64Itan", "IA64Itan2",
+ {"UNKNOWN", "PPCG4", "PPCG5", "POWER3", "POWER4", "POWER5",
+ "POWER6", "POWER7", "POWER8", "POWERe6500",
+@@ -39,7 +39,7 @@ static char *machnam[NMACH] =
"USI", "USII", "USIII", "USIV", "UST1", "UST2", "UnknownUS",
-- "MIPSR1xK", "MIPSICE9", "ARMv7"};
-+ "MIPSR1xK", "MIPSICE9", "ARMv7", "GENERIC"};
- enum MACHTYPE {MACHOther, IbmPwr3, IbmPwr4, IbmPwr5, PPCG4, PPCG5,
- IbmPwr6, IbmPwr7, Pwre6500,
- IbmZ9, IbmZ10, IbmZ196, /* s390(x) in Linux */
-@@ -42,7 +42,8 @@ enum MACHTYPE {MACHOther, IbmPwr3, IbmPw
- SunUSI, SunUSII, SunUSIII, SunUSIV, SunUST1, SunUST2, SunUSX,
- MIPSR1xK, /* includes R10K, R12K, R14K, R16K */
- MIPSICE9, /* SiCortex ICE9 -- like MIPS5K */
-- ARMv7 /* includes Cortex A8, A9 */
-+ ARMv7, /* includes Cortex A8, A9 */
+ "MIPSR1xK", "MIPSICE9",
+ "ARMa7", "ARMa9", "ARMa15", "ARMa17",
+- "ARM64xgene1", "ARM64a53", "ARM64a57"};
++ "ARM64xgene1", "ARM64a53", "ARM64a57", "GENERIC"};
+ enum MACHTYPE {MACHOther, PPCG4, PPCG5, IbmPwr3, IbmPwr4, IbmPwr5,
+ IbmPwr6, IbmPwr7, IbmPwr8, Pwre6500,
+ IbmZ9, IbmZ10, IbmZ196, IbmZ12, IbmZ13, /* s390(x) in Linux */
+@@ -58,7 +58,8 @@ enum MACHTYPE {MACHOther, PPCG4, PPCG5,
+ ARM17, /* lots of tablets */
+ ARM64xg, /* includes ARMv8 */
+ ARM64a53,
+- ARM64a57
++ ARM64a57,
+ GENERIC
};
#define MachIsX86(mach_) \
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index 70f693a..d7aafc9 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -1,6 +1,6 @@
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -778,8 +778,10 @@
+@@ -805,8 +805,10 @@ int main(int nargs, char **args)
fprintf(fpout, " -melf_i386");
else if (ptrbits == 64)
fprintf(fpout, " -melf_x86_64");
diff --git a/debian/patches/powerpc-dcbt.patch b/debian/patches/powerpc-dcbt.patch
index 4bffa10..05a20d9 100644
--- a/debian/patches/powerpc-dcbt.patch
+++ b/debian/patches/powerpc-dcbt.patch
@@ -174,7 +174,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
fmadd rC01, rA0, rB1, rC01
--- a/tune/blas/gemm/CASES/ATL_dmm8x4x2_vsx.c
+++ b/tune/blas/gemm/CASES/ATL_dmm8x4x2_vsx.c
-@@ -52,7 +52,7 @@ static inline vector TYPE vec_mergel(vec
+@@ -60,7 +60,7 @@ static inline vector TYPE vec_mergel(vec
#ifndef ATL_GOT_L1PREFETCH
#ifdef _ARCH_PPC
#undef ATL_pfl1R
diff --git a/debian/patches/ppc64el-ifdef-files-with-lvx.patch b/debian/patches/ppc64el-ifdef-files-with-lvx.patch
index 1f9e74e..0b92687 100644
--- a/debian/patches/ppc64el-ifdef-files-with-lvx.patch
+++ b/debian/patches/ppc64el-ifdef-files-with-lvx.patch
@@ -69,7 +69,7 @@ Reviewed-By: Sébastien Villemot <sebastien at debian.org>
#include <altivec.h>
#include "atlas_misc.h"
#include "atlas_prefetch.h" /* ATL_pfl1R, ATL_pfl1W */
-@@ -651,3 +655,5 @@ void ATL_USERMM
+@@ -659,3 +663,5 @@ void ATL_USERMM
}
}
}
diff --git a/debian/patches/shared_libraries.diff b/debian/patches/shared_libraries.diff
index cbc9263..91dc8ce 100644
--- a/debian/patches/shared_libraries.diff
+++ b/debian/patches/shared_libraries.diff
@@ -120,7 +120,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ done;
--- a/CONFIG/src/Makefile
+++ b/CONFIG/src/Makefile
-@@ -576,6 +576,7 @@ $(LIBINSTdir) :
+@@ -624,6 +624,7 @@ $(LIBINSTdir) :
install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
$(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
diff --git a/debian/patches/static_full_blas_lapack.diff b/debian/patches/static_full_blas_lapack.diff
index c33f518..ef23fca 100644
--- a/debian/patches/static_full_blas_lapack.diff
+++ b/debian/patches/static_full_blas_lapack.diff
@@ -7,7 +7,7 @@ Last-Update: 2013-06-05
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Make.top
+++ b/Make.top
-@@ -14,6 +14,9 @@
+@@ -14,6 +14,9 @@ leafstart:
build:
cd bin/ ; $(MAKE) xatlas_build
cd bin/ ; ./xatlas_build $(INSTFLAGS)
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
time:
./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
C_sanity_test:
-@@ -401,6 +404,7 @@
+@@ -401,6 +404,7 @@ startup : lib include results EXtest
$(MAKE) -f Make.top leafstart leaf=src/blas/reference/level1
$(MAKE) -f Make.top leafstart leaf=src/auxil
$(MAKE) -f Make.top leafstart leaf=src/testing
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$(MAKE) -f Make.top leafstart leaf=lib
$(MAKE) -f Make.top leafstart leaf=bin
cd src/threads ; touch atomic.inc
-@@ -591,6 +595,7 @@
+@@ -591,6 +595,7 @@ killgrd :
lib :
mkdir lib
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
include:
mkdir include
-@@ -654,12 +659,17 @@
+@@ -654,12 +659,17 @@ install_inc:
chmod 0644 $(INSTdir)/cblas.h $(INSTdir)/clapack.h
cp $(INCAdir)/* $(INSTdir)/atlas/.
- chmod 0644 $(INSTdir)/atlas/*
@@ -55,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- cp $(LIBdir)/libptcblas.a $(INSTdir)/.
--- a/makes/Make.lib
+++ b/makes/Make.lib
-@@ -175,6 +175,36 @@
+@@ -175,6 +175,36 @@ TRYALL :
LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
fi
@@ -94,7 +94,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#
--- a/CONFIG/src/Makefile
+++ b/CONFIG/src/Makefile
-@@ -575,7 +575,7 @@
+@@ -623,7 +623,7 @@ $(LIBINSTdir) :
chmod 0755 $(LIBINSTdir)
install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir)
@@ -105,7 +105,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
rm -f *core* *.o config?.out
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
-@@ -604,6 +604,9 @@
+@@ -624,6 +624,9 @@ int main(int nargs, char **args)
}
fprintf(fpout, " TESTlib = $(LIBdir)/libtstatlas.a\n\n");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git
More information about the debian-science-commits
mailing list