glibc_post_upgrade: Drop ia64 support
This commit is contained in:
parent
0f4d3ed14d
commit
91ed2dbf62
@ -24,39 +24,6 @@ __attribute__((noinline)) void sayn (long num);
|
|||||||
__attribute__((noinline)) void message (char *const path[]);
|
__attribute__((noinline)) void message (char *const path[]);
|
||||||
__attribute__((noinline)) int check_elf (const char *name);
|
__attribute__((noinline)) int check_elf (const char *name);
|
||||||
|
|
||||||
#ifdef __i386__
|
|
||||||
static int
|
|
||||||
is_ia64 (void)
|
|
||||||
{
|
|
||||||
unsigned int fl1, fl2;
|
|
||||||
|
|
||||||
/* See if we can use cpuid. */
|
|
||||||
__asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
|
|
||||||
"pushl %0; popfl; pushfl; popl %0; popfl"
|
|
||||||
: "=&r" (fl1), "=&r" (fl2)
|
|
||||||
: "i" (0x00200000));
|
|
||||||
if (((fl1 ^ fl2) & 0x00200000) == 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* Host supports cpuid. See if cpuid gives capabilities, try
|
|
||||||
CPUID(0). Preserve %ebx and %ecx; cpuid insn clobbers these, we
|
|
||||||
don't need their CPUID values here, and %ebx may be the PIC
|
|
||||||
register. */
|
|
||||||
__asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
|
|
||||||
: "=a" (fl1) : "0" (0) : "edx", "cc");
|
|
||||||
if (fl1 == 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* Invoke CPUID(1), return %edx; caller can examine bits to
|
|
||||||
determine what's supported. */
|
|
||||||
__asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
|
|
||||||
: "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
|
|
||||||
return (fl2 & (1 << 30)) != 0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
#define is_ia64() 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main (void)
|
main (void)
|
||||||
{
|
{
|
||||||
@ -172,11 +139,6 @@ main (void)
|
|||||||
#endif
|
#endif
|
||||||
char *iconv_cache = GCONV_MODULES_DIR"/gconv-modules.cache";
|
char *iconv_cache = GCONV_MODULES_DIR"/gconv-modules.cache";
|
||||||
char *iconv_dir = GCONV_MODULES_DIR;
|
char *iconv_dir = GCONV_MODULES_DIR;
|
||||||
if (is_ia64 ())
|
|
||||||
{
|
|
||||||
iconv_cache = "/emul/ia32-linux"GCONV_MODULES_DIR"/gconv-modules.cache";
|
|
||||||
iconv_dir = "/emul/ia32-linux"GCONV_MODULES_DIR;
|
|
||||||
}
|
|
||||||
verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig",
|
verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig",
|
||||||
"-o", iconv_cache,
|
"-o", iconv_cache,
|
||||||
"--nostdlib", iconv_dir);
|
"--nostdlib", iconv_dir);
|
||||||
@ -330,8 +292,6 @@ check_elf (const char *name)
|
|||||||
ret = ehdr.e_machine == EM_386;
|
ret = ehdr.e_machine == EM_386;
|
||||||
#elif defined __x86_64__
|
#elif defined __x86_64__
|
||||||
ret = ehdr.e_machine == EM_X86_64;
|
ret = ehdr.e_machine == EM_X86_64;
|
||||||
#elif defined __ia64__
|
|
||||||
ret = ehdr.e_machine == EM_IA_64;
|
|
||||||
#elif defined __powerpc64__
|
#elif defined __powerpc64__
|
||||||
ret = ehdr.e_machine == EM_PPC64;
|
ret = ehdr.e_machine == EM_PPC64;
|
||||||
#elif defined __powerpc__
|
#elif defined __powerpc__
|
||||||
|
Loading…
Reference in New Issue
Block a user