Hello community, here is the log from the commit of package dosemu for openSUSE:Factory checked in at 2020-01-22 23:23:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosemu (Old) and /work/SRC/openSUSE:Factory/.dosemu.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosemu" Wed Jan 22 23:23:55 2020 rev:33 rq:766416 version:1.4.0.1.r2065 Changes: -------- --- /work/SRC/openSUSE:Factory/dosemu/dosemu.changes 2019-11-03 12:23:17.909445242 +0100 +++ /work/SRC/openSUSE:Factory/.dosemu.new.26092/dosemu.changes 2020-01-22 23:23:59.297704322 +0100 @@ -1,0 +2,5 @@ +Wed Jan 22 13:19:55 UTC 2020 - Jiri Slaby <jsl...@suse.com> + +- add dosemu-LTO-fix.patch (bnc#1160098) + +------------------------------------------------------------------- New: ---- dosemu-LTO-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosemu.spec ++++++ --- /var/tmp/diff_new_pack.PBDBcb/_old 2020-01-22 23:24:01.221705293 +0100 +++ /var/tmp/diff_new_pack.PBDBcb/_new 2020-01-22 23:24:01.233705298 +0100 @@ -1,7 +1,7 @@ # # spec file for package dosemu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,7 +52,8 @@ Patch4: dosemu-skip-glibc-test.patch # PATCH-FIX-UPSTREAM https://github.com/stsp/dosemu2/pull/386 https://github.com/stsp/dosemu2/commit/8d7ab25daf6f2d8ca09e1598fd11de2d8460255e Patch5: reproducible.patch -Url: http://www.dosemu.org +Patch6: dosemu-LTO-fix.patch +URL: http://www.dosemu.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +103,8 @@ %endif %patch4 -p1 %patch5 -p1 +%patch6 -p1 + %build %global _lto_cflags %{_lto_cflags} -flto-partition=one autoreconf -fiv ++++++ dosemu-LTO-fix.patch ++++++ From: Jiri Slaby <jsl...@suse.cz> Subject: remove undefined behaviour/fix LTO build References: bnc#1160098 The code defines two const pointers: unsigned char * const mem_base; char * const lowmem_base; They are set during setup. But the C standard clearly states: If an attempt is made to modify an object defined with a const-qualified type through use of an lvalue with non-const-qualified type, the behavior is undefined. This pretty nicely breaks when using modern gcc with LTO enabled. Gcc thinks the point is always NULL, as was initialized. This was fixed in dosemu2 by: https://github.com/stsp/dosemu2/commit/d36496646b31891ce952f3e9b63946a2ff2371b3 https://github.com/stsp/dosemu2/commit/bb4437f93912d4d47961d2cbb0f13c737f8295c2 --- src/arch/linux/mapping/mapping.c | 6 +++--- src/base/init/init.c | 2 +- src/include/memory.h | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) --- a/src/arch/linux/mapping/mapping.c +++ b/src/arch/linux/mapping/mapping.c @@ -57,8 +57,8 @@ static int kmem_mappings = 0; static struct mem_map_struct kmem_map[MAX_KMEM_MAPPINGS]; static int init_done = 0; -unsigned char * const mem_base; -char * const lowmem_base; +unsigned char *mem_base; +char *lowmem_base; #ifndef HAVE_MREMAP_FIXED int have_mremap_fixed = 1; #endif @@ -427,7 +427,7 @@ void *alloc_mapping(int cap, size_t maps if (cap & MAPPING_INIT_LOWRAM) { PRIV_SAVE_AREA Q__printf("MAPPING: LOWRAM_INIT, cap=%s, base=%p\n", cap, addr); - *(char **)(&lowmem_base) = addr; + lowmem_base = addr; /* we may need root to mmap address 0 */ enter_priv_on(); addr = alias_mapping(MAPPING_INIT_LOWRAM, 0, --- a/src/base/init/init.c +++ b/src/base/init/init.c @@ -310,7 +310,7 @@ void low_mem_init(void) "WARN: as root, or by changing the vm.mmap_min_addr setting in\n" "WARN: /etc/sysctl.conf or a file in /etc/sysctl.d/ to 0.\n", result); - *(unsigned char **)&mem_base = result; + mem_base = result; #endif } --- a/src/include/memory.h +++ b/src/include/memory.h @@ -233,7 +233,7 @@ void *lowmemp(const void *ptr); restrictions it can be non-zero. Non-zero values block vm86 but at least give NULL pointer protection. */ -extern unsigned char * const mem_base; +extern unsigned char *mem_base; /* lowmem_base points to a shared memory image of the area 0--1MB+64K. It does not have any holes or mapping for video RAM etc. @@ -242,10 +242,11 @@ extern unsigned char * const mem_base; simx86, NULL page protection, and removal of the VGA protected memory access hack. - It is set "const" to help GCC optimize accesses. In reality it is set only - once, at startup + It is not set "const" as it is set once, at startup. Making it const + would violate the C standard and would cause crashes and/or weird + behaviour. */ -extern char * const lowmem_base; +extern char *lowmem_base; #define UNIX_READ_BYTE(addr) (*(Bit8u *) (addr)) #define UNIX_WRITE_BYTE(addr, val) (*(Bit8u *) (addr) = (val) )
