Michael Schröder
e1e20a716d
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=378
33 lines
904 B
Diff
33 lines
904 B
Diff
Patch machine detection code: detect transmeta, rename parisc to hppa. [#52713]
|
|
|
|
--- ./lib/rpmrc.c.orig 2017-01-19 10:38:55.294687058 +0000
|
|
+++ ./lib/rpmrc.c 2017-01-19 10:39:13.697626840 +0000
|
|
@@ -817,6 +817,14 @@ static inline int RPMClass(void)
|
|
|
|
cpu = (tfms>>8)&15;
|
|
|
|
+ if (cpu == 5
|
|
+ && cpuid_ecx(0) == '68xM'
|
|
+ && cpuid_edx(0) == 'Teni'
|
|
+ && (cpuid_edx(1) & ((1<<8)|(1<<15))) == ((1<<8)|(1<<15))) {
|
|
+ sigaction(SIGILL, &oldsa, NULL);
|
|
+ return 6; /* has CX8 and CMOV */
|
|
+ }
|
|
+
|
|
sigaction(SIGILL, &oldsa, NULL);
|
|
|
|
#define USER686 ((1<<4) | (1<<8) | (1<<15))
|
|
@@ -1101,6 +1109,12 @@ static void defaultMachine(rpmrcCtx ctx,
|
|
# endif
|
|
# endif
|
|
|
|
+#if defined(__linux__)
|
|
+ /* in linux, lets rename parisc to hppa */
|
|
+ if (rstreq(un.machine, "parisc"))
|
|
+ strcpy(un.machine, "hppa");
|
|
+#endif
|
|
+
|
|
# if defined(__hpux) && defined(_SC_CPU_VERSION)
|
|
{
|
|
# if !defined(CPU_PA_RISC1_2)
|