diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-01-06 19:21:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-01-06 19:21:46 +0000 |
| commit | 3fcb35cde0fe63487aa87cc7983734db6234035e (patch) | |
| tree | b972335fd0f6a83a724a91f1b84d33ceee6f2d58 /dev-util | |
| parent | all updated to 2013 in header, in 1.2.0-r1; SetSetup updated to encapsulate a... (diff) | |
| download | historical-3fcb35cde0fe63487aa87cc7983734db6234035e.tar.gz historical-3fcb35cde0fe63487aa87cc7983734db6234035e.tar.bz2 historical-3fcb35cde0fe63487aa87cc7983734db6234035e.zip | |
Also tweak cpuid asm in worker.cc.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/stressapptest/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/stressapptest/Manifest | 30 | ||||
| -rw-r--r-- | dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch | 25 |
3 files changed, 43 insertions, 18 deletions
diff --git a/dev-util/stressapptest/ChangeLog b/dev-util/stressapptest/ChangeLog index d55a165af08f..9c0904d7be68 100644 --- a/dev-util/stressapptest/ChangeLog +++ b/dev-util/stressapptest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/stressapptest # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/stressapptest/ChangeLog,v 1.4 2013/01/05 04:35:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/stressapptest/ChangeLog,v 1.5 2013/01/06 19:21:42 vapier Exp $ + + 06 Jan 2013; Mike Frysinger <vapier@gentoo.org> + files/stressapptest-1.0.4-cpuid-pic.patch: + Also tweak cpuid asm in worker.cc. 05 Jan 2013; Mike Frysinger <vapier@gentoo.org> +files/stressapptest-1.0.4-cpuid-pic.patch, stressapptest-1.0.4.ebuild: diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest index eabdba147322..bbd2001d37e1 100644 --- a/dev-util/stressapptest/Manifest +++ b/dev-util/stressapptest/Manifest @@ -1,25 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX stressapptest-1.0.4-cpuid-pic.patch 627 SHA256 9f6c4ad328dee44dda11ed9c46c6dc57201f9345cefab7817376044049fcd41f SHA512 870f903435c8264f5dc0f030915d5eeecf49ca589f7ed42d1091782d5570523572450637be10a205d17a95b126f8c606a8bb7af81c8944c43e4da0f680cce8e9 WHIRLPOOL d4e414d39dba1a45e3806dc7ac262fdfd26793ef6ab17b9996ae775e8bc403bf9f8c5e3611d7d19b61b7c4f32d048f0dff2101615ff2e310890f7c886fecc2cf +AUX stressapptest-1.0.4-cpuid-pic.patch 1291 SHA256 613bd0b87d0f857d0024ee1094bff036c2b058f80c5852fd2a9c51a0b859b88f SHA512 9df88ad94a66a28698a9f815655b61a6c8c54dc0ff96a0a7d28944bce0a0a38d55a261a2fe20a1042c5f3016bdce6150f1ba983d8c5192f6c9a65ce3b9ba4e15 WHIRLPOOL 0e3ff966a65f22742fcb95ced0a616524be3434f7ef1a2149543f4cbcbfd68718fdd241e32fc311ed1998cfac79bf74b773243ea1d4bde0c53dd316ac420dc00 DIST stressapptest-1.0.4_autoconf.tar.gz 200370 SHA256 c8c83419e800504682506e10800763759f3f339b2158bae1329bb145ff981b65 SHA512 bcc81057361c9ae09562106398f1a3d6b5a0a41e4bf4e7b61ca8f05144a4295e642136dd5441ad1950b5c2785476593ad30d03052e4fe9e9f4071aabd33b123f WHIRLPOOL fe8befb6f76c33c4b2d525064c47e3b9c69a1352b6a0eb502c06ca3b12143aa7a3127e9b944ab1c871937345978ddc6598f1dbe2f3fb7cd3dc6dd65b4563b537 EBUILD stressapptest-1.0.4.ebuild 867 SHA256 ae047f0a2310a349912e6b4c633553b1441eef64d3420f33fa3169690a95d4cc SHA512 2254adef9eb897014ae4cbdcb3c2a73d18bcc00de0592d6d21b2e68d8cab4a2d97677954b6b7fc1c5c8695d63b5a4ab76ad0657b3fc43f5f86c9cefa282395d6 WHIRLPOOL 22199a5df878dc2fd51f828adc0fe5d11ed1a1fe8cb1da5fa83d8e344f971c12f5379e9db612722169d9b1ccb8772616266dc8da3bd9a80bbcebed30c205a844 -MISC ChangeLog 790 SHA256 df8d4faa85dec520244ed48b335c837e2e6e80522bcc7498005171e95b3bbbfa SHA512 b1696263e18b5a04af1c7ac1d0f7c4766257d66a21bf19a9192a04b0b0adf695e772df0dd54f5b4e405011aaaea0850ff010a3e64eb9dfe94532781e409fe8b6 WHIRLPOOL e4e4cfc3f22e1fe2137fa8dfc0e3fc02918444ef763e7660f531255155347f331c59f829139fcb9dcbec7e6acb6d425f53f013dde639cc9ab937785ca785af92 +MISC ChangeLog 923 SHA256 c9307cb5f766c95e6eb587bf07e716af3a6958d4956307d1b09b454da5e5cdf3 SHA512 4af7a867c0956e66942827aa0a0d8053c7cdd306529004a19bfa875d6764fc84cb09c6c8cdef7b173655d79021d9747095b6c623ed5757f133394f4768a3185b WHIRLPOOL 219dec75365a78a8aa2bae9db4530b89dc7c3c62a6e1878758f7afed415b90d5cfcd9e790ef03af3cf3b636d1fd9db75fc790c8ce694ad3a87cbbd0e66a9fe4e MISC metadata.xml 240 SHA256 060d4d570194ff567e10d66246f85d4b9fee1efb17d111aeb9f03345f6e20efd SHA512 41a5c4b9e67d814937a0524714617a059c1351a00ac12d9344373f43b41d074e24fab5598e44c8a22f1848bfa12b8fc76cd5674ca62cd1f917b3235c77721971 WHIRLPOOL da0b560d9528cfe4fcff409de2d9749cf9ae8b7a04468b42463e8097b89e152a67a0da0ea7e6db1186f852687979c2e843e487a5eb76e663717148a796aa093d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQ564LAAoJELEHsLL7fEFWaTgP/3udauMedSBhcC/iYjgrO/q5 -NRye0w1tvY6eKvzaGPuPbmAZIvFbvZO1tRfcZN1PIEx2HASdCnXQyqKokP2/Atkr -IFCyGX7jFsVzTfeTm6BQ6SI0hWi8y8jl9b3uI5jooIfvax1wnZ5RElZRabGPJUjs -XYX5k175t6eOHjCtAEGuDrI3Kg0xYk1UOvXteYnv7udSVmV8yKXUjh3Vr4LnTqej -rO8/EEgEMyyr/S4zOPLHXBel9uphrMbZVMVvDYEJ97Gbm3kRGQGdJ6uxLtsnkWMf -dR/jvUMnLlY5uKmnV73hRDnnpf8N9Ap5+IMTWod0v4E5rnvS2+xLpFDrCb/XJczG -UKCUUG6KWs/IKNjonIozbG4hgv5oIGjr8mYWG5RNBv0tKwhwwcYfb+dacuXHGyu8 -6443niul1vbvAx0sdeOd6dgIaSlTCwvCIn9bn1Fpe3DDUcJAKmdKC2kif4DJNf8S -4Wiv28mLZopQWbnSOqhfQloXqPy8ozVLnlJ4kyDW/NG4U+f+/gdnRq5nyKeXqssx -iJjaNr/O3ZXOKKYe4urfIf34V7Er49qNZYluh0kOesA7bpl4EVwxwBUYNRQeKz/J -U0r0NxNl9MOEkv8TtQ03eCFDM5cNtVoIeEHDveFT1jkP03k7iAbBXIZhSB95BI2E -RJL3eZhhtBb4WOWElSSm -=1UdH +iQIcBAEBCAAGBQJQ6c9KAAoJELEHsLL7fEFWFvwP/Rd2P4iw0+5Ze/0pixU4O6xc +QPS8s0b3dkB1KU89RzOzakHhYZDI35c/42PgE6MmGB6ZGh8HD3+0pBwsApzetCFD +GVywAhdDZjZaYB/pN0Om0u8mtw2IUZ1WkVLxbzofcIw8Pix7+gV/mEcfCBfCoaI9 +LCOySZaRfP9HDGbp5ezii8YieFwONJrmlJ7bb3WPqwUSx7atbSx0YY2Xp1Paismw +VYZrMNlugUfhkwY3H4mz7SFy58YHY6E9FBN+WZ0BdTPXz5v+pszTWFo/YW4MzObY +rE1TZCK8N1m1QcM8FmSvH9fcWEbgRMDl4WAmu6N6X6oQeN43xlaxr3bd2Y5FLLKY +IyQ8vegLW8EQaUpyT7+w8I2fhC+YoSdLCAMel50orLckaHpnMrZJrhuGBDHL51PS +7bBosAzjfFb+ZlyqsrYUGn1kYJclb5A+EK/iCX+0PWzC7UmfnGgDDjfDOuECq8lO +W0Gq4IKr4xiwDuLgATA7NQGji7xHCbIYHVexwjQwNMOlOKWKoi3h1NBvn9WxCxud +a20PEFcCYsoeD3SuL2CfAlSS7EVHVY4vCAB8ufTWmWv1y5wOeMhQS8Z5Sr8IeOaK +eTT4kJf4wlyieoRhbD0wkceRI1V27K44tq9WyjVeyxSTglJvzyIPNLjSiBZjMfoa +MyW2KgMrE7tzvT6JFaB0 +=AQuF -----END PGP SIGNATURE----- diff --git a/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch b/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch index 6bd6c3702f3e..740349bc6f1f 100644 --- a/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch +++ b/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch @@ -1,7 +1,7 @@ http://code.google.com/p/stressapptest/issues/detail?id=26 ---- src/os.cc -+++ src/os.cc +--- a/src/os.cc ++++ b/src/os.cc @@ -149,7 +149,16 @@ void OsLayer::GetFeatures() { // http://www.sandpile.org/ia32/cpuid.htm int ax, bx, cx, dx; @@ -20,3 +20,24 @@ http://code.google.com/p/stressapptest/issues/detail?id=26 has_clflush_ = (dx >> 19) & 1; has_sse2_ = (dx >> 26) & 1; +--- a/src/worker.cc ++++ b/src/worker.cc +@@ -85,7 +85,17 @@ namespace { + inline int apicid(void) { + int cpu; + #if defined(STRESSAPPTEST_CPU_X86_64) || defined(STRESSAPPTEST_CPU_I686) +- __asm __volatile("cpuid" : "=b" (cpu) : "a" (1) : "cx", "dx"); ++ __asm__ __volatile__ ( ++# if defined(STRESSAPPTEST_CPU_I686) && defined(__PIC__) ++ "xchg %%ebx, %%esi;" ++ "cpuid;" ++ "xchg %%esi, %%ebx;" ++ : "=S" (cpu) ++# else ++ "cpuid;" ++ : "=b" (cpu) ++# endif ++ : "a" (1) : "cx", "dx"); + #elif defined(STRESSAPPTEST_CPU_ARMV7A) + #warning "Unsupported CPU type ARMV7A: unable to determine core ID." + cpu = 0; |