diff --git a/.gitignore b/.gitignore index 8419cc8..f2d599f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ memtest86+-4.10.tar.gz +/memtest86+-4.20.tar.gz diff --git a/memtest86+-2.11-make-gcc4-builds-work.patch b/memtest86+-2.11-make-gcc4-builds-work.patch deleted file mode 100644 index c071ad0..0000000 --- a/memtest86+-2.11-make-gcc4-builds-work.patch +++ /dev/null @@ -1,356 +0,0 @@ ---- memtest86+-2.11/test.c.orig 2008-11-15 19:18:14.000000000 -0500 -+++ memtest86+-2.11/test.c 2009-08-18 16:01:33.845957770 -0400 -@@ -13,6 +13,7 @@ - #include "config.h" - #include - #include "dmi.h" -+#include - - extern int segs, bail; - extern volatile ulong *p; -@@ -150,16 +151,16 @@ void addr_tst2() - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - -@@ -194,16 +195,16 @@ void addr_tst2() - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -260,6 +261,7 @@ void movinvr() - volatile ulong *pe; - volatile ulong *start,*end; - ulong num; -+ uintptr_t seg_start; - - /* Initialize memory with initial sequence of random numbers. */ - if (v->rdtsc) { -@@ -277,19 +279,20 @@ void movinvr() - end = v->map[j].end; - pe = start; - p = start; -+ seg_start = (uintptr_t)p; - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if (seg_start == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code */ -@@ -310,7 +313,7 @@ void movinvr() - "jb L200\n\t" - : "=D" (p) - : "D" (p), "b" (pe) -- : "eax" -+ : "eax", "edx" - ); - - do_tick(); -@@ -328,19 +331,20 @@ void movinvr() - end = v->map[j].end; - pe = start; - p = start; -+ seg_start = (uintptr_t)p; - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if (seg_start == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code */ -@@ -427,17 +431,17 @@ void movinv1(int iter, ulong p1, ulong p - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } - len = pe - p; -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -468,16 +472,16 @@ void movinv1(int iter, ulong p1, ulong p - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -534,16 +538,16 @@ void movinv1(int iter, ulong p1, ulong p - done = 0; - do { - /* Check for underflow */ -- if (pe - SPINSZ < pe) { -+ if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { - pe -= SPINSZ; - } else { - pe = start; - } -- if (pe <= start) { -+ if ((uintptr_t)pe <= (uintptr_t)start) { - pe = start; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -623,16 +627,16 @@ void movinv32(int iter, ulong p1, ulong - pat = p1; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Do a SPINSZ section of memory */ -@@ -685,16 +689,16 @@ void movinv32(int iter, ulong p1, ulong - pat = p1; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -798,16 +802,16 @@ void movinv32(int iter, ulong p1, ulong - done = 0; - do { - /* Check for underflow */ -- if (pe - SPINSZ < pe) { -+ if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { - pe -= SPINSZ; - } else { - pe = start; - } -- if (pe <= start) { -+ if ((uintptr_t)pe <= (uintptr_t)start) { - pe = start; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -906,16 +910,16 @@ void modtst(int offset, int iter, ulong - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -951,16 +955,16 @@ void modtst(int offset, int iter, ulong - k = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -1009,16 +1013,16 @@ void modtst(int offset, int iter, ulong - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ > pe) { -+ if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { - pe += SPINSZ; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - /* Original C code replaced with hand tuned assembly code -@@ -1098,16 +1102,16 @@ void block_move(int iter) - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ*4 > pe) { -+ if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { - pe += SPINSZ*4; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - len = ((ulong)pe - (ulong)p) / 64; -@@ -1167,16 +1171,16 @@ void block_move(int iter) - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ*4 > pe) { -+ if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { - pe += SPINSZ*4; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - pp = p + ((pe - p) / 2); -@@ -1234,16 +1238,16 @@ void block_move(int iter) - done = 0; - do { - /* Check for overflow */ -- if (pe + SPINSZ*4 > pe) { -+ if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { - pe += SPINSZ*4; - } else { - pe = end; - } -- if (pe >= end) { -+ if ((uintptr_t)pe >= (uintptr_t)end) { - pe = end; - done++; - } -- if (p == pe ) { -+ if ((uintptr_t)p == (uintptr_t)pe) { - break; - } - asm __volatile__ ( diff --git a/memtest86+-4.00-fix-asciimap.patch b/memtest86+-4.00-fix-asciimap.patch deleted file mode 100644 index b90fa6a..0000000 --- a/memtest86+-4.00-fix-asciimap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/spd.c b/spd.c -index 0cdfe1e..b99dd90 100644 ---- a/spd.c -+++ b/spd.c -@@ -481,6 +481,7 @@ struct ascii_map amap[] = { - { 0x34, "4"}, - { 0x35, "5"}, - { 0x36, "6"}, -+{ 0x37, "7"}, - { 0x38, "8"}, - { 0x39, "9"}, - { 0x3A, ":"}, diff --git a/memtest86+.spec b/memtest86+.spec index f00c175..7b42aaa 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -6,15 +6,14 @@ %define debug_package %{nil} Name: memtest86+ -Version: 4.10 -Release: 5%{?dist} +Version: 4.20 +Release: 1%{?dist} License: GPLv2 Summary: Stand-alone memory tester for x86 and x86-64 computers Group: System Environment/Base Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz Source1: memtest-setup Source2: new-memtest-pkg -Patch0: memtest86+-4.00-fix-asciimap.patch URL: http://www.memtest.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # require glibc-devel.i386 via this file: @@ -43,7 +42,6 @@ sed -i -e's,0x5000,0x100000,' memtest.lds %ifarch x86_64 sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile %endif -%patch0 -p1 -b .fix_asciimap %build # Regular build flags not wanted for this binary @@ -88,6 +86,11 @@ rm -rf %{buildroot} %changelog +* Mon Mar 07 2011 Jaroslav Škarvada - 4.20-1 +- Update to new version (#682425) +- Removed fix-asciimap patch (not needed now) +- Removed make-gcc4-builds-work patch (not used) + * Mon Feb 21 2011 Jaroslav Škarvada - 4.10-5 - Deprecated nash replaceed by findfs (#671503) diff --git a/sources b/sources index 220b4ae..5f21467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2144f21d4489a04149b1891b8d97e8fc memtest86+-4.10.tar.gz +ef62c2f5be616676c8c62066dedc46b3 memtest86+-4.20.tar.gz