CVS commit: pkgsrc/sysutils/memtestplus

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Feb  9 09:13:24 UTC 2019

Modified Files:
        pkgsrc/sysutils/memtestplus: Makefile distinfo
        pkgsrc/sysutils/memtestplus/files: io.h
        pkgsrc/sysutils/memtestplus/patches: patch-aa
Added Files:
        pkgsrc/sysutils/memtestplus/patches: patch-memtest__shared.lds

Log Message:
memtestplus: make room for headers
(Fixes linker issue,
        ld: memtest_shared: not enough room for program headers)

Don't create multiple definitions.

Remove workarounds for old GCC/NetBSD.

boots in QEMU, but reboots (crashes) very quickly.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/memtestplus/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/memtestplus/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/memtestplus/files/io.h
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/memtestplus/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/memtestplus/patches/patch-memtest__shared.lds

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/memtestplus/Makefile
diff -u pkgsrc/sysutils/memtestplus/Makefile:1.26 pkgsrc/sysutils/memtestplus/Makefile:1.27
--- pkgsrc/sysutils/memtestplus/Makefile:1.26   Wed Feb  7 00:59:18 2018
+++ pkgsrc/sysutils/memtestplus/Makefile        Sat Feb  9 09:13:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/02/07 00:59:18 maya Exp $
+# $NetBSD: Makefile,v 1.27 2019/02/09 09:13:24 maya Exp $
 #
 
 # Note -- version number also in the do-install rule
@@ -7,7 +7,7 @@ MINVER=01
 
 DISTNAME=              memtest86+-${MAJVER}.${MINVER}
 PKGNAME=               memtestplus-${MAJVER}.${MINVER}
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.memtest.org/download/${MAJVER}.${MINVER}/
 
@@ -22,11 +22,6 @@ FORTIFY_SUPPORTED=   no
 SSP_SUPPORTED=         no
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
-GCC_REQD+=             4.6
-.else
-GCC_REQD+=             4.5
-.endif
 
 USE_TOOLS+=            gmake
 SUBST_CLASSES+=                delcr
@@ -39,10 +34,6 @@ SUBST_SED.delcr=     -e 's/.$$//g'
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_TRANSFORM+=  rm:-fno-stack-protector
-.endif
-
 .if !empty(PKGSRC_COMPILER:Mclang)
 BROKEN+=       ${PKGNAME} does not produce a working binary with clang
 .endif

Index: pkgsrc/sysutils/memtestplus/distinfo
diff -u pkgsrc/sysutils/memtestplus/distinfo:1.15 pkgsrc/sysutils/memtestplus/distinfo:1.16
--- pkgsrc/sysutils/memtestplus/distinfo:1.15   Mon Jan 29 14:23:26 2018
+++ pkgsrc/sysutils/memtestplus/distinfo        Sat Feb  9 09:13:24 2019
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.15 2018/01/29 14:23:26 maya Exp $
+$NetBSD: distinfo,v 1.16 2019/02/09 09:13:24 maya Exp $
 
 SHA1 (memtest86+-5.01.tar.gz) = eb4b6d70114db3c9ed320785da44c0ba8349c10c
 RMD160 (memtest86+-5.01.tar.gz) = 756b57d8f8a3b7408aba0b2fc0cadcdc1df966df
 SHA512 (memtest86+-5.01.tar.gz) = d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
 Size (memtest86+-5.01.tar.gz) = 214877 bytes
-SHA1 (patch-aa) = df0b88c93ddf6c07066ef993db80cc1b2874337c
+SHA1 (patch-aa) = f4feb3386f97bf8d1b0b314295c4194e7dbffa90
 SHA1 (patch-ab) = 04ca819d23656c5a73625b457ad730c0cf33e751
 SHA1 (patch-ac) = 9186952e34139b4d4aab6c266a224921a4d39659
 SHA1 (patch-ad) = ab31fec30052fdd3c473ee885ba00d7e3676384f
 SHA1 (patch-controller.c) = 8509599b72f1f11115dc58605b0f438ddfca9b4a
 SHA1 (patch-main.c) = 7f199aa47f429c21ceee127e19120b51a300feac
 SHA1 (patch-makeiso.sh) = 939056a96a1384e4d27772bf5612a755deca8145
+SHA1 (patch-memtest__shared.lds) = 977ef9f2d6e7f875471157e72a1e4f0b2f39ea58
 SHA1 (patch-nbstart.S) = d97a6e9c25a57d0f5510c3acf4dccf0f0c0c31b0
 SHA1 (patch-reboot.c) = 8103cb52d1a6e2cdb9099ad3535115617746ed26

Index: pkgsrc/sysutils/memtestplus/files/io.h
diff -u pkgsrc/sysutils/memtestplus/files/io.h:1.1 pkgsrc/sysutils/memtestplus/files/io.h:1.2
--- pkgsrc/sysutils/memtestplus/files/io.h:1.1  Wed Feb  7 00:59:18 2018
+++ pkgsrc/sysutils/memtestplus/files/io.h      Sat Feb  9 09:13:24 2019
@@ -18,12 +18,12 @@ static inline void slow_down_io(void)
 }
 
 
-void __outb(char value, int port) {
+static inline void __outb(char value, int port) {
        asm volatile("outb" " %b" "0, %w1"
                     : : "a"(value), "Nd"(port));
 }
 
-unsigned char __inb(int port)
+static inline unsigned char __inb(int port)
 {
        unsigned char value;
        asm volatile("inb" " %w1, %b" "0"
@@ -31,12 +31,12 @@ unsigned char __inb(int port)
        return value;
 }
 
-void __outw(short value, int port) {
+static inline void __outw(short value, int port) {
        asm volatile("outw" " %w" "0, %w1"
                     : : "a"(value), "Nd"(port));
 }
 
-unsigned short __inw(int port)
+static inline unsigned short __inw(int port)
 {
        unsigned short value;
        asm volatile("inw" " %w1, %w" "0"
@@ -44,12 +44,12 @@ unsigned short __inw(int port)
        return value;
 }
 
-void __outl(int value, int port) {
+static inline void __outl(int value, int port) {
        asm volatile("outl" " %" "0, %w1"
                     : : "a"(value), "Nd"(port));
 }
 
-unsigned int __inl(int port)
+static inline unsigned int __inl(int port)
 {
        unsigned int value;
        asm volatile("inl" " %w1, %" "0"

Index: pkgsrc/sysutils/memtestplus/patches/patch-aa
diff -u pkgsrc/sysutils/memtestplus/patches/patch-aa:1.7 pkgsrc/sysutils/memtestplus/patches/patch-aa:1.8
--- pkgsrc/sysutils/memtestplus/patches/patch-aa:1.7    Mon Jan 29 14:23:26 2018
+++ pkgsrc/sysutils/memtestplus/patches/patch-aa        Sat Feb  9 09:13:24 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2018/01/29 14:23:26 maya Exp $
+$NetBSD: patch-aa,v 1.8 2019/02/09 09:13:24 maya Exp $
 
 --- Makefile.orig      2013-08-10 02:01:58.000000000 +0000
 +++ Makefile
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.7 2018/01/29 14:23
        -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
        
  OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-@@ -20,22 +20,24 @@ OBJS= head.o reloc.o main.o test.o init.
+@@ -20,8 +20,7 @@ OBJS= head.o reloc.o main.o test.o init.
        smp.o vmem.o random.o
        
  
@@ -27,14 +27,7 @@ $NetBSD: patch-aa,v 1.7 2018/01/29 14:23
  
  # Link it statically once so I know I don't have undefined
  # symbols and then link it dynamically so I have full
- # relocation information
- memtest_shared: $(OBJS) memtest_shared.lds Makefile
--      $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+      $(LD) --allow-multiple-definition --warn-constructors --warn-common -static -T memtest_shared.lds \
-        -o $@ $(OBJS) && \
--      $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
-+      $(LD) --allow-multiple-definition -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
+@@ -34,8 +33,11 @@ memtest_shared: $(OBJS) memtest_shared.l
  memtest_shared.bin: memtest_shared
        objcopy -O binary $< memtest_shared.bin
  

Added files:

Index: pkgsrc/sysutils/memtestplus/patches/patch-memtest__shared.lds
diff -u /dev/null pkgsrc/sysutils/memtestplus/patches/patch-memtest__shared.lds:1.1
--- /dev/null   Sat Feb  9 09:13:24 2019
+++ pkgsrc/sysutils/memtestplus/patches/patch-memtest__shared.lds       Sat Feb  9 09:13:24 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-memtest__shared.lds,v 1.1 2019/02/09 09:13:24 maya Exp $
+
+--- memtest_shared.lds.orig    2013-08-10 02:01:58.000000000 +0000
++++ memtest_shared.lds
+@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);
+ 
+ ENTRY(startup_32); 
+ SECTIONS {
+-      . = 0;
++      . = 0x100;
+       .text : {
+               _start = .;
+               *(.text)