diff --git a/ChangeLog b/ChangeLog index b6467fd4ee..0298c1d426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2015-03-10 Joseph Myers + + * soft-fp/double.h [SOFT_FP_DOUBLE_H]: New multiple-include guard. + * soft-fp/extended.h [SOFT_FP_EXTENDED_H]: Likewise. + * soft-fp/op-1.h [SOFT_FP_OP_1_H]: Likewise. + * soft-fp/op-2.h [SOFT_FP_OP_2_H]: Likewise. + * soft-fp/op-4.h [SOFT_FP_OP_4_H]: Likewise. + * soft-fp/op-8.h [SOFT_FP_OP_8_H]: Likewise. + * soft-fp/op-common.h [SOFT_FP_OP_COMMON_H]: Likewise. + * soft-fp/quad.h [SOFT_FP_QUAD_H]: Likewise. + * soft-fp/single.h [SOFT_FP_SINGLE_H]: Likewise. + * soft-fp/soft-fp.h (SOFT_FP_H): Define to 1 rather than empty. + Add comment on closing #endif. + 2015-03-09 Paul Pluzhnikov * posix/wordexp.c (CHAR_IN_SET): New macro. diff --git a/soft-fp/double.h b/soft-fp/double.h index b45827b98a..a05713f683 100644 --- a/soft-fp/double.h +++ b/soft-fp/double.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_DOUBLE_H +#define SOFT_FP_DOUBLE_H 1 + #if _FP_W_TYPE_SIZE < 32 # error "Here's a nickel kid. Go buy yourself a real computer." #endif @@ -316,3 +319,5 @@ union _FP_UNION_D # define _FP_FRAC_HIGH_DW_D(X) _FP_FRAC_HIGH_2 (X) #endif /* W_TYPE_SIZE < 64 */ + +#endif /* !SOFT_FP_DOUBLE_H */ diff --git a/soft-fp/extended.h b/soft-fp/extended.h index a96d63e2f5..428f9178a6 100644 --- a/soft-fp/extended.h +++ b/soft-fp/extended.h @@ -27,6 +27,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_EXTENDED_H +#define SOFT_FP_EXTENDED_H 1 + #if _FP_W_TYPE_SIZE < 32 # error "Here's a nickel, kid. Go buy yourself a real computer." #endif @@ -506,3 +509,5 @@ union _FP_UNION_E # define _FP_FRAC_HIGH_DW_E(X) (X##_f[2]) #endif /* not _FP_W_TYPE_SIZE < 64 */ + +#endif /* !SOFT_FP_EXTENDED_H */ diff --git a/soft-fp/op-1.h b/soft-fp/op-1.h index bc9e33bf49..e3a91bfc7b 100644 --- a/soft-fp/op-1.h +++ b/soft-fp/op-1.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_OP_1_H +#define SOFT_FP_OP_1_H 1 + #define _FP_FRAC_DECL_1(X) _FP_W_TYPE X##_f _FP_ZERO_INIT #define _FP_FRAC_COPY_1(D, S) (D##_f = S##_f) #define _FP_FRAC_SET_1(X, I) (X##_f = I) @@ -362,3 +365,5 @@ /* Convert FP values between word sizes. */ #define _FP_FRAC_COPY_1_1(D, S) (D##_f = S##_f) + +#endif /* !SOFT_FP_OP_1_H */ diff --git a/soft-fp/op-2.h b/soft-fp/op-2.h index 26bdfc093d..c27b890c98 100644 --- a/soft-fp/op-2.h +++ b/soft-fp/op-2.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_OP_2_H +#define SOFT_FP_OP_2_H 1 + #define _FP_FRAC_DECL_2(X) \ _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT #define _FP_FRAC_COPY_2(D, S) (D##_f0 = S##_f0, D##_f1 = S##_f1) @@ -698,3 +701,5 @@ #define _FP_FRAC_COPY_2_1(D, S) ((D##_f0 = S##_f), (D##_f1 = 0)) #define _FP_FRAC_COPY_2_2(D, S) _FP_FRAC_COPY_2 (D, S) + +#endif /* !SOFT_FP_OP_2_H */ diff --git a/soft-fp/op-4.h b/soft-fp/op-4.h index eeb41e09c2..a5805170e4 100644 --- a/soft-fp/op-4.h +++ b/soft-fp/op-4.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_OP_4_H +#define SOFT_FP_OP_4_H 1 + #define _FP_FRAC_DECL_4(X) _FP_W_TYPE X##_f[4] #define _FP_FRAC_COPY_4(D, S) \ (D##_f[0] = S##_f[0], D##_f[1] = S##_f[1], \ @@ -868,3 +871,5 @@ while (0) #define _FP_FRAC_COPY_4_4(D, S) _FP_FRAC_COPY_4 (D, S) + +#endif /* !SOFT_FP_OP_4_H */ diff --git a/soft-fp/op-8.h b/soft-fp/op-8.h index b072ab0594..5267ae34ec 100644 --- a/soft-fp/op-8.h +++ b/soft-fp/op-8.h @@ -29,6 +29,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_OP_8_H +#define SOFT_FP_OP_8_H 1 + /* We need just a few things from here for op-4, if we ever need some other macros, they can be added. */ #define _FP_FRAC_DECL_8(X) _FP_W_TYPE X##_f[8] @@ -143,3 +146,5 @@ X##_f[0] |= (_FP_FRAC_SRS_8_s != 0); \ } \ while (0) + +#endif /* !SOFT_FP_OP_8_H */ diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h index ee4147602f..0a2f86aad9 100644 --- a/soft-fp/op-common.h +++ b/soft-fp/op-common.h @@ -29,6 +29,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_OP_COMMON_H +#define SOFT_FP_OP_COMMON_H 1 + #define _FP_DECL(wc, X) \ _FP_I_TYPE X##_c __attribute__ ((unused)) _FP_ZERO_INIT; \ _FP_I_TYPE X##_s __attribute__ ((unused)) _FP_ZERO_INIT; \ @@ -2109,3 +2112,5 @@ #define _FP_DIV_MEAT_1_loop(fs, R, X, Y) _FP_DIV_MEAT_N_loop (fs, 1, R, X, Y) #define _FP_DIV_MEAT_2_loop(fs, R, X, Y) _FP_DIV_MEAT_N_loop (fs, 2, R, X, Y) #define _FP_DIV_MEAT_4_loop(fs, R, X, Y) _FP_DIV_MEAT_N_loop (fs, 4, R, X, Y) + +#endif /* !SOFT_FP_OP_COMMON_H */ diff --git a/soft-fp/quad.h b/soft-fp/quad.h index 78387fc75b..9b5191cf5d 100644 --- a/soft-fp/quad.h +++ b/soft-fp/quad.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_QUAD_H +#define SOFT_FP_QUAD_H 1 + #if _FP_W_TYPE_SIZE < 32 # error "Here's a nickel, kid. Go buy yourself a real computer." #endif @@ -323,3 +326,5 @@ union _FP_UNION_Q # define _FP_FRAC_HIGH_DW_Q(X) _FP_FRAC_HIGH_4 (X) #endif /* not _FP_W_TYPE_SIZE < 64 */ + +#endif /* !SOFT_FP_QUAD_H */ diff --git a/soft-fp/single.h b/soft-fp/single.h index 849bca529a..b03514006f 100644 --- a/soft-fp/single.h +++ b/soft-fp/single.h @@ -30,6 +30,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef SOFT_FP_SINGLE_H +#define SOFT_FP_SINGLE_H 1 + #if _FP_W_TYPE_SIZE < 32 # error "Here's a nickel kid. Go buy yourself a real computer." #endif @@ -192,3 +195,5 @@ union _FP_UNION_S #else # define _FP_FRAC_HIGH_DW_S(X) _FP_FRAC_HIGH_1 (X) #endif + +#endif /* !SOFT_FP_SINGLE_H */ diff --git a/soft-fp/soft-fp.h b/soft-fp/soft-fp.h index f93a94182b..bb68df9160 100644 --- a/soft-fp/soft-fp.h +++ b/soft-fp/soft-fp.h @@ -30,7 +30,7 @@ . */ #ifndef SOFT_FP_H -#define SOFT_FP_H +#define SOFT_FP_H 1 #ifdef _LIBC # include @@ -337,4 +337,4 @@ typedef USItype UHWtype; extern void abort (void); #endif -#endif +#endif /* !SOFT_FP_H */