diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-08-12 23:26:01 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:32:08 -0700 |
| commit | 4c116285814af6d833dbe8caeaf6981022904ca9 (patch) | |
| tree | f917e6a2d454b4707932673ca91d34a9905dd97a | |
| parent | 178a52005111c971b46f8c7d6ffca2ffa5092e8e (diff) | |
| download | meta-openembedded-contrib-4c116285814af6d833dbe8caeaf6981022904ca9.tar.gz | |
memtester: Fix build with -fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch | 57 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb | 7 |
2 files changed, 61 insertions, 3 deletions
diff --git a/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch b/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch new file mode 100644 index 0000000000..ffd9b9f266 --- /dev/null +++ b/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch @@ -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 + diff --git a/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb index 0964c04874..3d29055781 100644 --- a/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb +++ b/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb @@ -5,9 +5,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz" -SRC_URI += "file://Makefile.patch" - +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ + file://Makefile.patch \ + file://0001-Define-mword16-and-mword8-once.patch \ + " SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe" SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88" |