From 9e271531390b70fd400fdfbd1ba5a774f9fe4df5 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 10 Feb 2015 10:09:49 +0000 Subject: [PATCH] Fix signbit on Solaris fixincludes: * inclhack.def (solaris_math_11): New fix. * fixincl.x: Regenerate. * tests/base/iso/math_c99.h [SOLARIS_MATH_11_CHECK]: New test. gcc/testsuite: * gcc.dg/signbit-sa.c: New test. From-SVN: r220577 --- fixincludes/ChangeLog | 6 +++ fixincludes/fixincl.x | 74 +++++++++++++++++++++++++++++++---- fixincludes/inclhack.def | 52 ++++++++++++++++++++++++ fixincludes/tests/base/iso/math_c99.h | 11 ++++++ gcc/testsuite/ChangeLog | 4 ++ gcc/testsuite/gcc.dg/signbit-sa.c | 11 ++++++ 6 files changed, 151 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/signbit-sa.c diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index c6ae152..f5483cf 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2015-02-10 Rainer Orth + + * inclhack.def (solaris_math_11): New fix. + * fixincl.x: Regenerate. + * tests/base/iso/math_c99.h [SOLARIS_MATH_11_CHECK]: New test. + 2015-02-06 David Edelsohn PR bootstrap/53348 diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 42009e9..77a9c32 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -1,12 +1,12 @@ /* -*- buffer-read-only: t -*- vi: set ro: - * + * * DO NOT EDIT THIS FILE (fixincl.x) - * - * It has been AutoGen-ed December 20, 2014 at 03:22:33 PM by AutoGen 5.18.5pre6 + * + * It has been AutoGen-ed Friday February 6, 2015 at 04:31:58 PM CET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Dec 20 15:22:33 PST 2014 +/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Feb 6 16:31:58 CET 2015 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 223 fixup descriptions. + * This file contains 224 fixup descriptions. * * See README for more information. * @@ -6858,6 +6858,60 @@ static const char* apzSolaris_Math_9Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Math_11 fix + */ +tSCC zSolaris_Math_11Name[] = + "solaris_math_11"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_11List[] = + "iso/math_c99.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_11Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_11Select0[] = + "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ "; + +#define SOLARIS_MATH_11_TEST_CT 1 +static tTestDesc aSolaris_Math_11Tests[] = { + { TT_EGREP, zSolaris_Math_11Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_11 + */ +static const char* apzSolaris_Math_11Patch[] = { + "format", + "#undef\tsignbit\n\ +#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\ +\t\t\t ? __builtin_signbitf(x) \\\n\ +\t\t\t : sizeof(x) == sizeof(long double) \\\n\ +\t\t\t ? __builtin_signbitl(x) \\\n\ +\t\t\t : __builtin_signbit(x))", + "^#undef[ \t]+signbit\n\ +#if defined\\(__sparc\\)\n\ +#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\ +[ \t]+\\{[ \t]*__typeof\\(x\\)[ \t]*__x_s[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\ +[ \t]+\\(int\\)[ \t]*\\(\\*\\(unsigned[ \t]*\\*\\)[ \t]*\\&__x_s[ \t]*>>[ \t]*31\\);[ \t]*\\}\\)\n\ +#elif defined\\(__i386\\) \\|\\| defined\\(__amd64\\)\n\ +#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\ +[ \t]+\\{ __typeof\\(x\\) __x_s = \\(x\\); \\\\\n\ +[ \t]+\\(sizeof \\(__x_s\\) == sizeof \\(float\\) \\? \\\\\n\ +[ \t]+\\(int\\) \\(\\*\\(unsigned \\*\\) \\&__x_s >> 31\\) : \\\\\n\ +[ \t]+sizeof \\(__x_s\\) == sizeof \\(double\\) \\? \\\\\n\ +[ \t]+\\(int\\) \\(\\(\\(unsigned \\*\\) \\&__x_s\\)\\[1\\] >> 31\\) : \\\\\n\ +[ \t]+\\(int\\) \\(\\(\\(unsigned short \\*\\) \\&__x_s\\)\\[4\\] >> 15\\)\\); \\}\\)\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Once_Init_1 fix */ tSCC zSolaris_Once_Init_1Name[] = @@ -9152,9 +9206,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 260 +#define REGEX_COUNT 261 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 223 +#define FIX_COUNT 224 /* * Enumerate the fixes @@ -9325,6 +9379,7 @@ typedef enum { SOLARIS_MATH_4_FIXIDX, SOLARIS_MATH_8_FIXIDX, SOLARIS_MATH_9_FIXIDX, + SOLARIS_MATH_11_FIXIDX, SOLARIS_ONCE_INIT_1_FIXIDX, SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX, SOLARIS_POW_INT_OVERLOAD_FIXIDX, @@ -10211,6 +10266,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_9Tests, apzSolaris_Math_9Patch, 0 }, + { zSolaris_Math_11Name, zSolaris_Math_11List, + apzSolaris_Math_11Machs, + SOLARIS_MATH_11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_11Tests, apzSolaris_Math_11Patch, 0 }, + { zSolaris_Once_Init_1Name, zSolaris_Once_Init_1List, apzSolaris_Once_Init_1Machs, SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index fa9287e..ce9a2ca 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -3549,6 +3549,58 @@ fix = { }; /* + * Newer Solaris 10/11 GCC signbit implementations cause strict-aliasing + * warnings. + */ +fix = { + hackname = solaris_math_11; + select = '@\(#\)math_c99\.h' "[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ "; + files = iso/math_c99.h; + c_fix = format; + c_fix_arg = << _EOArg_ +#undef signbit +#define signbit(x) (sizeof(x) == sizeof(float) \ + ? __builtin_signbitf(x) \ + : sizeof(x) == sizeof(long double) \ + ? __builtin_signbitl(x) \ + : __builtin_signbit(x)) +_EOArg_; + c_fix_arg = << _EOArg_ +^#undef[ ]+signbit +#if defined\(__sparc\) +#define[ ]+signbit\(x\)[ ]+__extension__\( \\ +[ ]+\{[ ]*__typeof\(x\)[ ]*__x_s[ ]*=[ ]*\(x\);[ ]*\\ +[ ]+\(int\)[ ]*\(\*\(unsigned[ ]*\*\)[ ]*\&__x_s[ ]*>>[ ]*31\);[ ]*\}\) +#elif defined\(__i386\) \|\| defined\(__amd64\) +#define[ ]+signbit\(x\)[ ]+__extension__\( \\ +[ ]+\{ __typeof\(x\) __x_s = \(x\); \\ +[ ]+\(sizeof \(__x_s\) == sizeof \(float\) \? \\ +[ ]+\(int\) \(\*\(unsigned \*\) \&__x_s >> 31\) : \\ +[ ]+sizeof \(__x_s\) == sizeof \(double\) \? \\ +[ ]+\(int\) \(\(\(unsigned \*\) \&__x_s\)\[1\] >> 31\) : \\ +[ ]+\(int\) \(\(\(unsigned short \*\) \&__x_s\)\[4\] >> 15\)\); \}\) +#endif +_EOArg_; + test_text = << _EOText_ +/* @(#)math_c99.h 1.14 13/03/27 */ +#undef signbit +#if defined(__sparc) +#define signbit(x) __extension__( \\ + { __typeof(x) __x_s = (x); \\ + (int) (*(unsigned *) &__x_s >> 31); }) +#elif defined(__i386) || defined(__amd64) +#define signbit(x) __extension__( \\ + { __typeof(x) __x_s = (x); \\ + (sizeof (__x_s) == sizeof (float) ? \\ + (int) (*(unsigned *) &__x_s >> 31) : \\ + sizeof (__x_s) == sizeof (double) ? \\ + (int) (((unsigned *) &__x_s)[1] >> 31) : \\ + (int) (((unsigned short *) &__x_s)[4] >> 15)); }) +#endif +_EOText_; +}; + +/* * Sun Solaris defines PTHREAD_ONCE_INIT as an array containing a * structure. As such, it need two levels of brackets, but only * contains one. Wrap the macro definition in an extra layer. diff --git a/fixincludes/tests/base/iso/math_c99.h b/fixincludes/tests/base/iso/math_c99.h index 3758cb9..6c642e5 100644 --- a/fixincludes/tests/base/iso/math_c99.h +++ b/fixincludes/tests/base/iso/math_c99.h @@ -75,3 +75,14 @@ #undef isunordered #define isunordered(x, y) __builtin_isunordered(x, y) #endif /* SOLARIS_MATH_9_CHECK */ + + +#if defined( SOLARIS_MATH_11_CHECK ) +/* @(#)math_c99.h 1.14 13/03/27 */ +#undef signbit +#define signbit(x) (sizeof(x) == sizeof(float) \ + ? __builtin_signbitf(x) \ + : sizeof(x) == sizeof(long double) \ + ? __builtin_signbitl(x) \ + : __builtin_signbit(x)) +#endif /* SOLARIS_MATH_11_CHECK */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 67e1ac4..9bb681c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-02-10 Rainer Orth + + * gcc.dg/signbit-sa.c: New test. + 2015-02-10 Jerry DeLisle PR libgfortran/57822 diff --git a/gcc/testsuite/gcc.dg/signbit-sa.c b/gcc/testsuite/gcc.dg/signbit-sa.c new file mode 100644 index 0000000..4cbefdd --- /dev/null +++ b/gcc/testsuite/gcc.dg/signbit-sa.c @@ -0,0 +1,11 @@ +/* Some versions of Solaris give strict-aliasing warnings for + signbit. */ +/* { dg-options "-std=c99 -O2 -Wstrict-aliasing" } */ + +#include + +int +main (void) +{ + return signbit (1.0f) | signbit (1.0) | signbit (1.0l);; +} -- 2.7.4