diff options
| author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-09-17 21:24:13 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-09-17 08:56:33 -0700 |
| commit | a31ce8fe9187a91ccd0ef72137cc5cb958ccc286 (patch) | |
| tree | 0660d587bea7c81216ae4654567e7f34bb1ecb7d /meta-oe/recipes-benchmark/memtester/files | |
| parent | 3ff25ef770b5b20809bdb2c0142a8f7e4ee751a4 (diff) | |
| download | meta-openembedded-a31ce8fe9187a91ccd0ef72137cc5cb958ccc286.tar.gz | |
memtester: upgrade 4.3.0 -> 4.4.0
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark/memtester/files')
| -rw-r--r-- | meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch | 57 |
1 files changed, 0 insertions, 57 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 deleted file mode 100644 index ffd9b9f266..0000000000 --- a/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 12 Aug 2020 23:18:30 -0700 | ||
| 4 | Subject: [PATCH] Define mword16 and mword8 once | ||
| 5 | |||
| 6 | Defining them in .h meant they are defined in all .c files including | ||
| 7 | this .h file | ||
| 8 | |||
| 9 | Fixes build with gcc 10+ | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | tests.c | 9 +++++++++ | ||
| 15 | types.h | 9 --------- | ||
| 16 | 2 files changed, 9 insertions(+), 9 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/tests.c b/tests.c | ||
| 19 | index be1b350..4305bed 100644 | ||
| 20 | --- a/tests.c | ||
| 21 | +++ b/tests.c | ||
| 22 | @@ -27,6 +27,15 @@ char progress[] = "-\\|/"; | ||
| 23 | #define PROGRESSOFTEN 2500 | ||
| 24 | #define ONE 0x00000001L | ||
| 25 | |||
| 26 | +union { | ||
| 27 | + unsigned char bytes[UL_LEN/8]; | ||
| 28 | + ul val; | ||
| 29 | +} mword8; | ||
| 30 | + | ||
| 31 | +union { | ||
| 32 | + unsigned short u16s[UL_LEN/16]; | ||
| 33 | + ul val; | ||
| 34 | +} mword16; | ||
| 35 | /* Function definitions. */ | ||
| 36 | |||
| 37 | int compare_regions(ulv *bufa, ulv *bufb, size_t count) { | ||
| 38 | diff --git a/types.h b/types.h | ||
| 39 | index ad7ce73..e14ea32 100644 | ||
| 40 | --- a/types.h | ||
| 41 | +++ b/types.h | ||
| 42 | @@ -25,12 +25,3 @@ struct test { | ||
| 43 | int (*fp)(); | ||
| 44 | }; | ||
| 45 | |||
| 46 | -union { | ||
| 47 | - unsigned char bytes[UL_LEN/8]; | ||
| 48 | - ul val; | ||
| 49 | -} mword8; | ||
| 50 | - | ||
| 51 | -union { | ||
| 52 | - unsigned short u16s[UL_LEN/16]; | ||
| 53 | - ul val; | ||
| 54 | -} mword16; | ||
| 55 | -- | ||
| 56 | 2.28.0 | ||
| 57 | |||
