diff options
| author | Paul Eggert | 2014-05-30 13:19:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-30 13:19:29 -0700 |
| commit | 1915d8d63cb4de3b7fcadf059f1fe7f20fc5f8bf (patch) | |
| tree | b91c84b78c5610a2f218b00036843cf9f52a6248 /lib | |
| parent | ff66db795045b919717b16288ac083f6eafbdcb0 (diff) | |
| download | emacs-1915d8d63cb4de3b7fcadf059f1fe7f20fc5f8bf.tar.gz emacs-1915d8d63cb4de3b7fcadf059f1fe7f20fc5f8bf.zip | |
Fix port to 32-bit AIX with xlc.
This doesn't fix Bug#17598, but it does fix a regression since Emacs
built with xlc until recently, and perhaps it'll help us fix Bug#17598.
* configure.ac (GC_SETJMP_WORKS): Define for AIX, too.
Merge from gnulib, incorporating:
2014-05-30 ftoastr: work around compiler bug in IBM xlc 12.1
* lib/ftoastr.c: Update from gnulib.
* src/alloc.c (gdb_make_enums_visible): Remove FLOAT_TO_STRING_BUFSIZE.
* src/conf_post.h (FLEXIBLE_ARRAY_MEMBER) [__IBMC__]: Don't define to empty.
* src/lisp.h (FLOAT_TO_STRING_BUFSIZE): Make it a macro, instead of an enum,
to work around a compiler bug in IBM xlc 12.1.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ftoastr.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/ftoastr.h b/lib/ftoastr.h index 6236292d9d9..26cad7369ce 100644 --- a/lib/ftoastr.h +++ b/lib/ftoastr.h | |||
| @@ -72,12 +72,13 @@ enum | |||
| 72 | 72 | ||
| 73 | /* _GL_FLT_PREC_BOUND is an upper bound on the precision needed to | 73 | /* _GL_FLT_PREC_BOUND is an upper bound on the precision needed to |
| 74 | represent a float value without losing information. Likewise for | 74 | represent a float value without losing information. Likewise for |
| 75 | _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double. */ | 75 | _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double. |
| 76 | These are macros, not enums, to work around a bug in IBM xlc 12.1. */ | ||
| 76 | 77 | ||
| 77 | #if FLT_RADIX == 10 /* decimal floating point */ | 78 | #if FLT_RADIX == 10 /* decimal floating point */ |
| 78 | enum { _GL_FLT_PREC_BOUND = FLT_MANT_DIG }; | 79 | # define _GL_FLT_PREC_BOUND FLT_MANT_DIG |
| 79 | enum { _GL_DBL_PREC_BOUND = DBL_MANT_DIG }; | 80 | # define _GL_DBL_PREC_BOUND DBL_MANT_DIG |
| 80 | enum { _GL_LDBL_PREC_BOUND = LDBL_MANT_DIG }; | 81 | # define _GL_LDBL_PREC_BOUND LDBL_MANT_DIG |
| 81 | #else | 82 | #else |
| 82 | 83 | ||
| 83 | /* An upper bound on the number of bits needed to represent a single | 84 | /* An upper bound on the number of bits needed to represent a single |
| @@ -95,13 +96,13 @@ enum | |||
| 95 | DIG digits. For why the "+ 1" is needed, see "Binary to Decimal | 96 | DIG digits. For why the "+ 1" is needed, see "Binary to Decimal |
| 96 | Conversion" in David Goldberg's paper "What Every Computer | 97 | Conversion" in David Goldberg's paper "What Every Computer |
| 97 | Scientist Should Know About Floating-Point Arithmetic" | 98 | Scientist Should Know About Floating-Point Arithmetic" |
| 98 | <http://docs.sun.com/source/806-3568/ncg_goldberg.html>. */ | 99 | <http://docs.oracle.com/cd/E19957-01/806-3568/ncg_goldberg.html>. */ |
| 99 | # define _GL_FLOAT_PREC_BOUND(dig) \ | 100 | # define _GL_FLOAT_PREC_BOUND(dig) \ |
| 100 | (INT_BITS_STRLEN_BOUND ((dig) * _GL_FLOAT_DIG_BITS_BOUND) + 1) | 101 | (INT_BITS_STRLEN_BOUND ((dig) * _GL_FLOAT_DIG_BITS_BOUND) + 1) |
| 101 | 102 | ||
| 102 | enum { _GL_FLT_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG) }; | 103 | # define _GL_FLT_PREC_BOUND _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG) |
| 103 | enum { _GL_DBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG) }; | 104 | # define _GL_DBL_PREC_BOUND _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG) |
| 104 | enum { _GL_LDBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG) }; | 105 | # define _GL_LDBL_PREC_BOUND _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG) |
| 105 | #endif | 106 | #endif |
| 106 | 107 | ||
| 107 | 108 | ||