- biosdevname-pic.patch: make cpuid() not expose %ebx out of

assembler, so we can build it with -fPIE.

OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=38
This commit is contained in:
Marcus Meissner 2015-02-21 22:50:57 +00:00 committed by Git OBS Bridge
parent 7735872d76
commit 9d3323abff
3 changed files with 29 additions and 1 deletions

20
biosdevname-pic.patch Normal file
View File

@ -0,0 +1,20 @@
Index: biosdevname-0.5.0/src/bios_dev_name.c
===================================================================
--- biosdevname-0.5.0.orig/src/bios_dev_name.c
+++ biosdevname-0.5.0/src/bios_dev_name.c
@@ -114,10 +114,13 @@ static u_int32_t
cpuid (u_int32_t eax, u_int32_t ecx)
{
asm volatile (
- "xor %%ebx, %%ebx; cpuid"
+ "pushl %%ebx\n"
+ "xor %%ebx, %%ebx\n"
+ "cpuid\n"
+ "popl %%ebx\n"
: "=a" (eax), "=c" (ecx)
: "a" (eax)
- : "%ebx", "%edx");
+ : "%edx");
return ecx;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Feb 21 22:49:47 UTC 2015 - meissner@suse.com
- biosdevname-pic.patch: make cpuid() not expose %ebx out of
assembler, so we can build it with -fPIE.
-------------------------------------------------------------------
Thu Jan 22 13:02:08 UTC 2015 - trenn@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package biosdevname
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,7 @@ Source0: %{name}-%{version}.tar.bz2
Patch1: ignore-broken-BIOSes
Patch2: whitelist-dell
Patch3: udev-rule-path.patch
Patch4: biosdevname-pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
BuildRequires: pciutils-devel
@ -62,6 +63,7 @@ You can enable/disable usage of biosdevname with boot option
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac