From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 588 invoked by alias); 1 Nov 2004 14:06:29 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 567 invoked from network); 1 Nov 2004 14:06:28 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26) by sourceware.org with SMTP; 1 Nov 2004 14:06:28 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id iA1E4K3j007520; Mon, 1 Nov 2004 15:04:20 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id iA1E4KtX007518; Mon, 1 Nov 2004 15:04:20 +0100 Date: Mon, 01 Nov 2004 14:06:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix some i386 vs. x86_64 -m32 glibc header differences Message-ID: <20041101140420.GS30497@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-SW-Source: 2004-11/txt/msg00000.txt.bz2 Hi! Other differences than the ones fixed here are e.g.: 1) missing sys/elf.h on x86_64 - it is a deprecated header, so probably not a big deal, though not hard to add 2) missing sys/vm86.h on x86_64 - vm86 doesn't work on x86-64 64-bit kernel even for 32-bit programs AFAIK, so again not a big deal 3) gnu/lib-names.h, gnu/stubs.h - hard to fix 4) bits/wchar.h - not sure why __WCHAR_M{IN,AX} on i386 are long constants and int elsewhere, doesn't match what arches have unsigned long wchar_t and which have unsigned int wchar_t 5) bits/mathinline.h, bits/string.h 6) bits/byteswap.h - no support for !__GNUC__ compilers on x86_64 -m32 2004-11-01 Jakub Jelinek * sysdeps/unix/sysv/linux/x86_64/sys/procfs.h [__WORDSIZE == 32] (elf_fpxregset_t): New type. (struct elf_prpsinfo): If __WORDSIZE == 32, change pr_[ug]id type to unsigned short int. * sysdeps/unix/sysv/linux/x86_64/sys/user.h (struct user_fpregs_struct): Fix comment. * sysdeps/i386/fpu/bits/mathdef.h (float_t, double_t): If __FLOAT_EVAL_METHOD__ is defined and 0, typedef to float resp. double. * sysdeps/x86_64/fpu/bits/mathdef.h: Include bits/wordsize.h. (float_t, double_t): If -m32 and not -mfpmath=sse, typedef to long double. * sysdeps/x86_64/fpu/bits/fenv.h: Include bits/wordsize.h. (fenv_t): Remove __mxcsr field for -m32. --- libc/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h.jj 2001-09-19 12:30:49.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h 2004-11-01 14:19:31.658005034 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,10 +45,20 @@ typedef unsigned long elf_greg_t; #define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) typedef elf_greg_t elf_gregset_t[ELF_NGREG]; +#if __WORDSIZE == 32 +/* Register set for the floating-point registers. */ +typedef struct user_fpregs_struct elf_fpregset_t; + +/* Register set for the extended floating-point registers. Includes + the Pentium III SSE registers in addition to the classic + floating-point stuff. */ +typedef struct user_fpxregs_struct elf_fpxregset_t; +#else /* Register set for the extended floating-point registers. Includes the Pentium III SSE registers in addition to the classic floating-point stuff. */ typedef struct user_fpregs_struct elf_fpregset_t; +#endif /* Signal info. */ struct elf_siginfo @@ -94,8 +104,13 @@ struct elf_prpsinfo char pr_zomb; /* Zombie. */ char pr_nice; /* Nice val. */ unsigned long int pr_flag; /* Flags. */ +#if __WORDSIZE == 32 + unsigned short int pr_uid; + unsigned short int pr_gid; +#else unsigned int pr_uid; unsigned int pr_gid; +#endif int pr_pid, pr_ppid, pr_pgrp, pr_sid; /* Lots missing */ char pr_fname[16]; /* Filename of executable. */ --- libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h.jj 2002-03-22 13:16:57.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h 2004-11-01 14:22:35.650336103 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -38,7 +38,7 @@ struct user_fpregs_struct __uint32_t mxcsr; __uint32_t mxcr_mask; __uint32_t st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ - __uint32_t xmm_space[64]; /* 16*16 bytes for each XMM-reg = 128 bytes */ + __uint32_t xmm_space[64]; /* 16*16 bytes for each XMM-reg = 256 bytes */ __uint32_t padding[24]; }; --- libc/sysdeps/i386/fpu/bits/mathdef.h.jj 2004-03-16 13:30:07.000000000 +0100 +++ libc/sysdeps/i386/fpu/bits/mathdef.h 2004-11-01 14:04:50.063530247 +0100 @@ -23,6 +23,13 @@ #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 +# if defined __FLT_EVAL_METHOD__ && __FLT_EVAL_METHOD__ == 0 +/* When using -mfpmath=sse, values are computed with the precission of the + used type. */ +typedef float float_t; /* `float' expressions are evaluated as `float'. */ +typedef double double_t; /* `double' expressions are evaluated as + `double'. */ +# else /* The ix87 FPUs evaluate all values in the 80 bit floating-point format which is also available for the user as `long double'. Therefore we define: */ @@ -30,6 +37,7 @@ typedef long double float_t; /* `float' `long double'. */ typedef long double double_t; /* `double' expressions are evaluated as `long double'. */ +# endif /* The values returned by `ilogb' for 0 and NaN respectively. */ # define FP_ILOGB0 (-2147483647 - 1) --- libc/sysdeps/x86_64/fpu/bits/fenv.h.jj 2001-09-19 12:22:08.000000000 +0200 +++ libc/sysdeps/x86_64/fpu/bits/fenv.h 2004-11-01 13:53:25.033232033 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1998,1999,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,6 +20,8 @@ # error "Never use directly; include instead." #endif +#include + /* Define bits representing the exception. We use the bit positions of the appropriate bits in the FPU control word. */ @@ -80,7 +82,9 @@ typedef struct unsigned int __data_offset; unsigned short int __data_selector; unsigned short int __unused5; +#if __WORDSIZE == 64 unsigned int __mxcsr; +#endif } fenv_t; --- libc/sysdeps/x86_64/fpu/bits/mathdef.h.jj 2004-03-16 13:30:16.000000000 +0100 +++ libc/sysdeps/x86_64/fpu/bits/mathdef.h 2004-11-01 14:05:49.467976050 +0100 @@ -23,11 +23,23 @@ #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 +# include + +# if __WORDSIZE == 64 || (defined __FLT_EVAL_METHOD__ && __FLT_EVAL_METHOD__ == 0) /* The x86-64 architecture computes values with the precission of the - used type. */ + used type. Similarly for -m32 -mfpmath=sse. */ typedef float float_t; /* `float' expressions are evaluated as `float'. */ typedef double double_t; /* `double' expressions are evaluated as `double'. */ +# else +/* The ix87 FPUs evaluate all values in the 80 bit floating-point format + which is also available for the user as `long double'. Therefore we + define: */ +typedef long double float_t; /* `float' expressions are evaluated as + `long double'. */ +typedef long double double_t; /* `double' expressions are evaluated as + `long double'. */ +# endif /* The values returned by `ilogb' for 0 and NaN respectively. */ # define FP_ILOGB0 (-2147483647 - 1) Jakub