diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2011-07-05 19:40:43 +0200 |
|---|---|---|
| committer | Fabian Affolter <fabian@bernewireless.net> | 2011-07-05 19:40:43 +0200 |
| commit | 7f9851115264bca9bce3926ddb29e533a23929dd (patch) | |
| tree | b0426fc489e4dad582f34b25d6f93354a65f5c0f /main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch | |
| parent | 5dac3f219058736f6e19b7bec2b1cc2b1b300981 (diff) | |
| parent | 269fc1049583d36e07153215fe535f88947ea98b (diff) | |
| download | aports-7f9851115264bca9bce3926ddb29e533a23929dd.tar.bz2 aports-7f9851115264bca9bce3926ddb29e533a23929dd.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch')
| -rw-r--r-- | main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch b/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch new file mode 100644 index 0000000000..b10d2e5635 --- /dev/null +++ b/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch @@ -0,0 +1,33 @@ +From 4c6552d2df2912a710cab6acf476347a7fbf15a0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 1 Sep 2010 09:12:44 +0000 +Subject: [PATCH] Support for Position Independet Code by aboid clobbering PIC register + +Do not use the PIC register (ebx) +See http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml#doc_chap5 +--- + utils/cpuid.h | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/utils/cpuid.h b/utils/cpuid.h +index 2bac69a..ebcec7c 100644 +--- a/utils/cpuid.h ++++ b/utils/cpuid.h +@@ -5,9 +5,12 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, + unsigned int *ecx, unsigned int *edx) + { + /* ecx is often an input as well as an output. */ +- asm volatile("cpuid" ++ asm volatile( ++ "movl %%ebx, %%esi;" ++ "cpuid;" ++ "xchg %%ebx, %%esi;" + : "=a" (*eax), +- "=b" (*ebx), ++ "=S" (*ebx), + "=c" (*ecx), + "=d" (*edx) + : "0" (*eax), "2" (*ecx)); +-- +1.7.2.2 + |