helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-02 02:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

memtester: Fix build with -fno-common

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-08-12 23:26:01 -07:00
parent 178a520051
commit 4c11628581
2 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch Normal file
View File

@ -0,0 +1,57 @@
From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 12 Aug 2020 23:18:30 -0700
Subject: [PATCH] Define mword16 and mword8 once
Defining them in .h meant they are defined in all .c files including
this .h file
Fixes build with gcc 10+
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests.c | 9 +++++++++
types.h | 9 ---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests.c b/tests.c
index be1b350..4305bed 100644
--- a/tests.c
+++ b/tests.c
@@ -27,6 +27,15 @@ char progress[] = "-\\|/";
#define PROGRESSOFTEN 2500
#define ONE 0x00000001L
+union {
+ unsigned char bytes[UL_LEN/8];
+ ul val;
+} mword8;
+
+union {
+ unsigned short u16s[UL_LEN/16];
+ ul val;
+} mword16;
/* Function definitions. */
int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
diff --git a/types.h b/types.h
index ad7ce73..e14ea32 100644
--- a/types.h
+++ b/types.h
@@ -25,12 +25,3 @@ struct test {
int (*fp)();
};
-union {
- unsigned char bytes[UL_LEN/8];
- ul val;
-} mword8;
-
-union {
- unsigned short u16s[UL_LEN/16];
- ul val;
-} mword16;
--
2.28.0

7
meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
View File

@ -5,9 +5,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz" SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
SRC_URI += "file://Makefile.patch" file://Makefile.patch \
file://0001-Define-mword16-and-mword8-once.patch \
"
SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe" SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe"
SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88" SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88"