diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-31 15:21:24 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-31 15:21:24 +0000 |
| commit | dd7d7e3f138d1835d153c316f3d771e40dc641ba (patch) | |
| tree | 7427232d1e9759028490f843152a83a4bbbab7db | |
| parent | 89ed2cccba266f7738ceb445e4d43103c08cbe75 (diff) | |
| download | uClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.bz2 uClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.xz | |
Synch with trunk at rev 22997.
Basically trailing whitespaces removal, fix non standard keywords
asm -> __asm__ inline -> __inline__ and some minor changes on trunk.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
397 files changed, 1371 insertions, 1314 deletions
@@ -15,7 +15,7 @@ PHONY := FORCE ifeq ($(HAVE_SHARED),y) .LIBPATTERNS: "lib%.so" libs: $(lib-so-y) $(lib-a-y) -$(lib-so-y): $(interp) +$(lib-so-y): | $(interp) else .LIBPATTERNS: "lib%.a" ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y) @@ -409,3 +409,4 @@ ifneq ($(strip $(.depends.dep)),) endif endif +# vi: ft=make : @@ -461,6 +461,9 @@ CFLAGS := -include $(top_builddir)include/libc-symbols.h \ -fno-builtin -nostdinc -I$(top_builddir)include -I. \ -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) +# Make sure that we can be built with non-C99 compilers, too. +# Use __\1__ instead. +CFLAGS += $(call check_gcc,-fno-asm,) ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") CFLAGS += $(subst ",, $(UCLIBC_EXTRA_CFLAGS)) endif diff --git a/extra/Configs/Config.x86_64 b/extra/Configs/Config.x86_64 index 16097a0ca..7ae357f61 100644 --- a/extra/Configs/Config.x86_64 +++ b/extra/Configs/Config.x86_64 @@ -12,7 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN select ARCH_HAS_MMU - select UCLIBC_HAS_LFS config ARCH_CFLAGS string diff --git a/extra/config/expr.h b/extra/config/expr.h index 9d4cba1c0..9d60dd330 100644 --- a/extra/config/expr.h +++ b/extra/config/expr.h @@ -184,12 +184,12 @@ void expr_fprint(struct expr *e, FILE *out); struct gstr; /* forward */ void expr_gstr_print(struct expr *e, struct gstr *gs); -static inline int expr_is_yes(struct expr *e) +static __inline__ int expr_is_yes(struct expr *e) { return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes); } -static inline int expr_is_no(struct expr *e) +static __inline__ int expr_is_no(struct expr *e) { return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); } diff --git a/extra/config/lkc.h b/extra/config/lkc.h index 4bc68f20a..c55c2fbd7 100644 --- a/extra/config/lkc.h +++ b/extra/config/lkc.h @@ -116,38 +116,38 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym); struct symbol *prop_get_symbol(struct property *prop); struct property *sym_get_env_prop(struct symbol *sym); -static inline tristate sym_get_tristate_value(struct symbol *sym) +static __inline__ tristate sym_get_tristate_value(struct symbol *sym) { return sym->curr.tri; } -static inline struct symbol *sym_get_choice_value(struct symbol *sym) +static __inline__ struct symbol *sym_get_choice_value(struct symbol *sym) { return (struct symbol *)sym->curr.val; } -static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) +static __inline__ bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) { return sym_set_tristate_value(chval, yes); } -static inline bool sym_is_choice(struct symbol *sym) +static __inline__ bool sym_is_choice(struct symbol *sym) { return sym->flags & SYMBOL_CHOICE ? true : false; } -static inline bool sym_is_choice_value(struct symbol *sym) +static __inline__ bool sym_is_choice_value(struct symbol *sym) { return sym->flags & SYMBOL_CHOICEVAL ? true : false; } -static inline bool sym_is_optional(struct symbol *sym) +static __inline__ bool sym_is_optional(struct symbol *sym) { return sym->flags & SYMBOL_OPTIONAL ? true : false; } -static inline bool sym_has_value(struct symbol *sym) +static __inline__ bool sym_has_value(struct symbol *sym) { return sym->flags & SYMBOL_DEF_USER ? true : false; } diff --git a/extra/config/lxdialog/menubox.c b/extra/config/lxdialog/menubox.c index fa9d633f2..c689fc03b 100644 --- a/extra/config/lxdialog/menubox.c +++ b/extra/config/lxdialog/menubox.c @@ -26,7 +26,7 @@ * * *) A bugfix for the Page-Down problem * - * *) Formerly when I used Page Down and Page Up, the cursor would be set + * *) Formerly when I used Page Down and Page Up, the cursor would be set * to the first position in the menu box. Now lxdialog is a bit * smarter and works more like other menu systems (just have a look at * it). diff --git a/extra/locale/gen_collate.c b/extra/locale/gen_collate.c index 42b20f79a..77dc5ff9e 100644 --- a/extra/locale/gen_collate.c +++ b/extra/locale/gen_collate.c @@ -62,7 +62,7 @@ typedef struct { int base_idx; /* */ int undefined_idx; /* */ - + int overrides_offset; /* */ int multistart_offset; /* */ } der_locale_t; @@ -1094,7 +1094,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - init_locale_list(); + init_locale_list(); while (--argc) { p = (const deps_t *) bsearch(*++argv, deps, sizeof(deps)/sizeof(deps[0]), sizeof(deps[0]), dep_cmp); @@ -1107,7 +1107,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } } - + i = p->base_locale; ++der_count[i]; @@ -1115,7 +1115,7 @@ int main(int argc, char **argv) /* same name as base, so skip after count incremented */ continue; } - + /* add it to the list. the main body will catch duplicates */ lli = (ll_item_t *) xmalloc(sizeof(ll_item_t)); lli->prev = lli->next = NULL; @@ -1202,7 +1202,7 @@ static int old_main(int argc, char **argv) processfile(); /* this does a popfile */ /* twalk(cur_col->root_colitem, print_colnode); */ - + if (next_is_base == 1) { next_is_base = 0; } @@ -1264,7 +1264,7 @@ static int old_main(int argc, char **argv) return EXIT_SUCCESS; } -static void error_msg(const char *fmt, ...) +static void error_msg(const char *fmt, ...) { va_list arg; @@ -1289,7 +1289,7 @@ static void pushfile(char *filename) if (fno >= MAX_FNO) { error_msg("file stack size exceeded"); } - + if (!(fstack[++fno] = fopen(fbuf, "r"))) { --fno; /* oops */ error_msg("cannot open file %s", fbuf); @@ -1645,7 +1645,7 @@ static int colelement_cmp(const void *n1, const void *n2) r = 0; /* both null */ } else { r = (((colitem_t *)n1)->element == NULL) ? -1 : 1; - } + } } return r; } @@ -1733,7 +1733,7 @@ static void add_script(const char *s) if (find_section_list_item(s, cur_col)) { error_msg("attempt to readd script %s", s); } - + l = find_ll_last(cur_col->section_list); insque(new_ll_item(DT_SECTION, new_section(s)), l); } @@ -2674,7 +2674,7 @@ static void finalize_base(void) index2weight_buffer[index2weight_len] = lli->idx = i++; index2weight_len += index2weight_len_inc; add_final_col_index(w->symbol); - + } else { assert(lli->data_type & DT_REORDER); r = ll_len( ((section_t *)(lli->data))->itm_list ); @@ -2975,7 +2975,7 @@ static void finalize_base(void) continue; } if (index2weight_len_inc) { - index2ruleidx_buffer[index2ruleidx_len++] = + index2ruleidx_buffer[index2ruleidx_len++] = add_rule((weighted_item_t *)(lli->data)); } /* fprintf(stdout, "%11s: w %6d %6d %s\n", */ @@ -3001,7 +3001,7 @@ static void finalize_base(void) w = (weighted_item_t *)(lli->data); if (find_wi_index_reordered(w->symbol)) { /* reordered symbol so skip on first pass */ if (index2weight_len_inc) { - index2ruleidx_buffer[index2ruleidx_len++] = + index2ruleidx_buffer[index2ruleidx_len++] = add_rule((weighted_item_t *)(lli->data)); } /* fprintf(stdout, "%11s: r %6d %6d %s\n", */ @@ -3050,7 +3050,7 @@ static void finalize_base(void) der_locale_array[der_locale_len].name = cur_base->name; der_locale_array[der_locale_len].base_idx = base_locale_len; - + u16_buf[0] = 1; u16_buf[1] = 0; u16_buf_len = 2; @@ -3511,7 +3511,7 @@ size_t newopt(tbl_item *ut, size_t usize, int shift, table_data *tbl) /* sort */ nu_val = blocksize; qsort(ti, numblocks, sizeof(unsigned char *), nu_memcmp); - + uniq = 1; uit[(ti[0]-ut)/blocksize] = 0; for (i=1 ; i < numblocks ; i++) { @@ -3687,7 +3687,7 @@ static unsigned int add_rule(weighted_item_t *wi) assert(r < (1 << 14)); rbuf[i] = r | rule2val[(int)(w->rule[i])]; } else { /* item */ - r = final_index_val_x(w->colitem[i], wi->symbol); + r = final_index_val_x(w->colitem[i], wi->symbol); rbuf[i] = r | rule2val[(int)(w->rule[i])]; } } @@ -3831,7 +3831,7 @@ static void dump_der_locale(int n) DUMPn(base_idx); DUMPn(undefined_idx); - + DUMPn(overrides_offset); DUMPn(multistart_offset); @@ -3856,7 +3856,7 @@ static void dump_u16_array(FILE *fp, uint16_t *u, int len, const char *name) collate_pos += len; } -#define OUT_U16C(X,N) fprintf(fp,"\t%10d, /* %8lu %s */\n", X, collate_pos++, N); +#define OUT_U16C(X,N) fprintf(fp,"\t%10d, /* %8lu %s */\n", X, collate_pos++, N); static void dump_collate(FILE *fp) { @@ -3901,7 +3901,7 @@ static void dump_collate(FILE *fp) DUMPn(wcs2colidt_offset_low); DUMPn(wcs2colidt_offset_hi); } -#undef DUMPn +#undef DUMPn fprintf(fp, "#define COL_IDX_C %5d\n", 0); diff --git a/extra/locale/gen_ldc.c b/extra/locale/gen_ldc.c index 3ffc90efe..2a121610e 100644 --- a/extra/locale/gen_ldc.c +++ b/extra/locale/gen_ldc.c @@ -238,7 +238,7 @@ int main(void) /* collate should be last*/ assert(sizeof(__locale_collate_tbl)/sizeof(__locale_collate_tbl[0]) == __lc_collate_data_LEN) ; out_u16(lso, __locale_collate_tbl, __lc_collate_data_LEN, "collate_data"); - + { unsigned char co_buf[__LOCALE_DATA_CATEGORIES] = { @@ -251,7 +251,7 @@ int main(void) }; out_uc(lso, co_buf, __LOCALE_DATA_CATEGORIES, "lc_common_item_offsets_LEN"); } - + out_size_t(lso, common_tbl_offsets, __LOCALE_DATA_CATEGORIES * 4, "lc_common_tbl_offsets"); /* offsets from start of locale_mmap_t */ /* rows, item_offsets, item_idx, data */ diff --git a/extra/locale/gen_locale.c b/extra/locale/gen_locale.c index b44be318e..31df4156e 100644 --- a/extra/locale/gen_locale.c +++ b/extra/locale/gen_locale.c @@ -281,12 +281,12 @@ static void read_at_mappings(void) #if 0 { p = at_strings; - + if (!*p) { printf("no @ strings\n"); return; } - + do { printf("%s\n", p+1); p += 1 + (unsigned char) *p; @@ -469,7 +469,7 @@ static void read_locale_list(void) printf("ignoring UTF-8 locale %s\n", ln); *line_buf = 0; continue; - } else if ((i > 2) && !default_8bit) { + } else if ((i > 2) && !default_8bit) { printf("ignoring 8-bit codeset locale %s\n", ln); *line_buf = 0; continue; @@ -503,7 +503,7 @@ static void read_locale_list(void) printf("ignoring UTF-8 locale %s\n", ln); *line_buf = 0; continue; - } else if ((i > 2) && !default_8bit) { + } else if ((i > 2) && !default_8bit) { printf("ignoring 8-bit codeset locale %s\n", ln); *line_buf = 0; continue; diff --git a/extra/locale/gen_wc8bit.c b/extra/locale/gen_wc8bit.c index 3cdcca801..c6db41231 100644 --- a/extra/locale/gen_wc8bit.c +++ b/extra/locale/gen_wc8bit.c @@ -182,7 +182,7 @@ int main(int argc, char **argv) char *s0; char *s1; int n; - + s0 = strrchr(*argv, '/'); if (!s0) { s0 = *argv; @@ -379,7 +379,7 @@ int main(int argc, char **argv) if ((c != 0) || 1) { u = towupper(c); l = towlower(c); - + if (u >= 0x80) u = csd[numsets].w2c[u]; if (l >= 0x80) l = csd[numsets].w2c[l]; diff --git a/extra/locale/gen_wctype.c b/extra/locale/gen_wctype.c index 2e2e42506..085ec51b1 100644 --- a/extra/locale/gen_wctype.c +++ b/extra/locale/gen_wctype.c @@ -709,7 +709,7 @@ int main(int argc, char **argv) printf("%#8x : towupper glibc %#4x != %#4x mine\n", c, towupper(c), upper); } - + if (towlower(c) != lower) { printf("%#8x : towlower glibc %#4x != %#4x mine i0 = %d\n", c, towlower(c), lower, i0); @@ -739,7 +739,7 @@ int main(int argc, char **argv) (unsigned long) RANGE); output_table(fp, "ctype", &cttable); output_table(fp, "uplow", &ultable); - + #warning fix the upper bound on the upper/lower tables... save 200 bytes or so fprintf(fp, "#define __LOCALE_DATA_WCuplow_diffs %7u\n", ul_count); @@ -794,7 +794,7 @@ size_t newopt(unsigned char *ut, size_t usize, int shift, table_data *tbl) /* sort */ nu_val = blocksize; qsort(ti, numblocks, sizeof(unsigned char *), nu_memcmp); - + uniq = 1; uit[(ti[0]-ut)/blocksize] = 0; for (i=1 ; i < numblocks ; i++) { diff --git a/extra/scripts/gen-as-const.awk b/extra/scripts/gen-as-const.awk index fde5af033..f9ec31672 100644 --- a/extra/scripts/gen-as-const.awk +++ b/extra/scripts/gen-as-const.awk @@ -26,7 +26,7 @@ NF == 1 { sub(/^.*$/, "& &"); } NF > 1 { name = $1; sub(/^[^ ]+[ ]+/, ""); - printf "asm (\"@@@name@@@%s@@@value@@@%%0@@@end@@@\" : : \"i\" (%s));\n", + printf "__asm__ (\"@@@name@@@%s@@@value@@@%%0@@@end@@@\" : : \"i\" (%s));\n", name, $0; } diff --git a/include/_lfs_64.h b/include/_lfs_64.h index 3e56bbf67..deee98a77 100644 --- a/include/_lfs_64.h +++ b/include/_lfs_64.h @@ -7,7 +7,7 @@ #ifdef __UCLIBC_HAS_LFS__ -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 +#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 #undef _FILE_OFFSET_BITS #define _FILE_OFFSET_BITS 64 #endif diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h index 43bcd3aff..e3ef864cd 100644 --- a/include/arpa/nameser_compat.h +++ b/include/arpa/nameser_compat.h @@ -1,6 +1,6 @@ /* Copyright (c) 1983, 1989 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,7 +12,7 @@ * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/include/assert.h b/include/assert.h index 7eaba0070..9b9d1b796 100644 --- a/include/assert.h +++ b/include/assert.h @@ -59,7 +59,7 @@ __END_DECLS (__ASSERT_VOID_CAST ((expr) ? 0 : \ (__assert (__STRING(expr), __FILE__, __LINE__, \ __ASSERT_FUNCTION), 0))) - + /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' which contains the name of the function currently being defined. This is broken in G++ before version 2.6. diff --git a/include/math.h b/include/math.h index c50b2e7b0..34c042dc5 100644 --- a/include/math.h +++ b/include/math.h @@ -101,7 +101,7 @@ __BEGIN_DECLS && (!defined __NO_LONG_DOUBLE_MATH || defined __LDBL_COMPAT) # ifdef __LDBL_COMPAT -# ifdef __USE_ISOC99 +# ifdef __USE_ISOC99 extern float __nldbl_nexttowardf (float __x, long double __y) __THROW __attribute__ ((__const__)); # ifdef __REDIRECT_NTH diff --git a/include/net/if_ppp.h b/include/net/if_ppp.h index bf5ec8387..1b1c3ea6e 100644 --- a/include/net/if_ppp.h +++ b/include/net/if_ppp.h @@ -3,7 +3,7 @@ /* * if_ppp.h - Point-to-Point Protocol definitions. * - * Copyright (c) 1989 Carnegie Mellon University. + * Copyright (c) 1989 Carnegie Mellon University. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/obstack.h b/include/obstack.h index 071acaff0..244e580ad 100644 --- a/include/obstack.h +++ b/include/obstack.h @@ -109,7 +109,7 @@ Summary: #ifdef __cplusplus extern "C" { #endif - + /* We use subtraction of (char *) 0 instead of casting to int because on word-addressable machines a simple cast to int may ignore the byte-within-word field of the pointer. */ @@ -206,7 +206,7 @@ extern int _obstack_begin (); extern int _obstack_begin_1 (); extern int _obstack_memory_used (); #endif - + #if defined __STDC__ && __STDC__ /* Do the function-declarations after the structs @@ -264,7 +264,7 @@ extern void (*obstack_alloc_failed_handler) (); /* Exit value used when `print_and_abort' is used. */ extern int obstack_exit_failure; - + /* Pointer to beginning of object being allocated or to be allocated next. Note that this might not be the final address of the object because a new chunk might be needed to hold the final size. */ @@ -348,7 +348,7 @@ extern int obstack_exit_failure; #define obstack_blank_fast(h,n) ((h)->next_free += (n)) #define obstack_memory_used(h) _obstack_memory_used (h) - + #if defined __GNUC__ && defined __STDC__ && __STDC__ /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and does not implement __extension__. But that compiler doesn't define @@ -492,7 +492,7 @@ __extension__ \ if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ __o->next_free = __o->object_base = (char *)__obj; \ else (obstack_free) (__o, __obj); }) - + #else /* not __GNUC__ or not __STDC__ */ # define obstack_object_size(h) \ diff --git a/include/regex.h b/include/regex.h index 2209f2b8f..e8b7eb9f1 100644 --- a/include/regex.h +++ b/include/regex.h @@ -188,7 +188,7 @@ typedef unsigned long int reg_syntax_t; stored in the pattern buffer, so changing this does not affect already-compiled regexps. */ extern reg_syntax_t re_syntax_options; - + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so don't delete them!) */ @@ -259,7 +259,7 @@ extern reg_syntax_t re_syntax_options; | RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ - + /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ @@ -338,7 +338,7 @@ typedef enum REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; - + /* This data structure represents a compiled pattern. Before calling the pattern compiler, the fields `buffer', `allocated', `fastmap', `translate', and `no_sub' can be set. After the pattern has been @@ -414,7 +414,7 @@ struct re_pattern_buffer }; typedef struct re_pattern_buffer regex_t; - + /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; @@ -445,7 +445,7 @@ typedef struct regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ } regmatch_t; - + /* Declarations for routines. */ /* To avoid duplicating every routine declaration -- once with a diff --git a/include/rpc/key_prot.h b/include/rpc/key_prot.h index 3e2eb7208..629e24991 100644 --- a/include/rpc/key_prot.h +++ b/include/rpc/key_prot.h @@ -41,7 +41,7 @@ #endif /* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ -/* +/* * Compiled from key_prot.x using rpcgen. * DO NOT EDIT THIS FILE! * This is NOT source code! @@ -60,33 +60,33 @@ enum keystatus { KEY_SYSTEMERR = 3, }; typedef enum keystatus keystatus; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_keystatus(XDR *, keystatus*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_keystatus(XDR *, keystatus*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_keystatus(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef char keybuf[HEXKEYBYTES]; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_keybuf(XDR *, keybuf); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_keybuf(XDR *, keybuf); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_keybuf(); -#endif /* Old Style C */ +#endif /* Old Style C */ typedef char *netnamestr; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_netnamestr(XDR *, netnamestr*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_netnamestr(XDR *, netnamestr*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_netnamestr(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct cryptkeyarg { @@ -94,13 +94,13 @@ struct cryptkeyarg { des_block deskey; }; typedef struct cryptkeyarg cryptkeyarg; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_cryptkeyarg(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct cryptkeyarg2 { @@ -109,13 +109,13 @@ struct cryptkeyarg2 { des_block deskey; }; typedef struct cryptkeyarg2 cryptkeyarg2; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_cryptkeyarg2(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct cryptkeyres { @@ -125,13 +125,13 @@ struct cryptkeyres { } cryptkeyres_u; }; typedef struct cryptkeyres cryptkeyres; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_cryptkeyres(XDR *, cryptkeyres*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_cryptkeyres(XDR *, cryptkeyres*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_cryptkeyres(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define MAXGIDS 16 @@ -144,13 +144,13 @@ struct unixcred { } gids; }; typedef struct unixcred unixcred; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_unixcred(XDR *, unixcred*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_unixcred(XDR *, unixcred*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_unixcred(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct getcredres { @@ -160,13 +160,13 @@ struct getcredres { } getcredres_u; }; typedef struct getcredres getcredres; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_getcredres(XDR *, getcredres*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_getcredres(XDR *, getcredres*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_getcredres(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct key_netstarg { @@ -175,13 +175,13 @@ struct key_netstarg { netnamestr st_netname; }; typedef struct key_netstarg key_netstarg; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_key_netstarg(XDR *, key_netstarg*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_key_netstarg(XDR *, key_netstarg*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_key_netstarg(); -#endif /* Old Style C */ +#endif /* Old Style C */ struct key_netstres { @@ -191,13 +191,13 @@ struct key_netstres { } key_netstres_u; }; typedef struct key_netstres key_netstres; -#ifdef __cplusplus +#ifdef __cplusplus extern "C" bool_t xdr_key_netstres(XDR *, key_netstres*); -#elif __STDC__ +#elif __STDC__ extern bool_t xdr_key_netstres(XDR *, key_netstres*); -#else /* Old Style C */ +#else /* Old Style C */ bool_t xdr_key_netstres(); -#endif /* Old Style C */ +#endif /* Old Style C */ #ifndef opaque @@ -242,7 +242,7 @@ extern des_block * key_gen_1_svc(void *, struct svc_req *); extern getcredres * key_getcred_1(netnamestr *, CLIENT *); extern getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *); -#else /* Old Style C */ +#else /* Old Style C */ #define KEY_SET ((u_long)1) extern keystatus * key_set_1(); extern keystatus * key_set_1_svc(); @@ -258,7 +258,7 @@ extern des_block * key_gen_1_svc(); #define KEY_GETCRED ((u_long)5) extern getcredres * key_getcred_1(); extern getcredres * key_getcred_1_svc(); -#endif /* Old Style C */ +#endif /* Old Style C */ #define KEY_VERS2 ((u_long)2) #ifdef __cplusplus @@ -315,7 +315,7 @@ extern key_netstres * key_net_get_2_svc(void *, struct svc_req *); extern cryptkeyres * key_get_conv_2(opaque *, CLIENT *); extern cryptkeyres * key_get_conv_2_svc(opaque *, struct svc_req *); -#else /* Old Style C */ +#else /* Old Style C */ extern keystatus * key_set_2(); extern keystatus * key_set_2_svc(); extern cryptkeyres * key_encrypt_2(); @@ -341,6 +341,6 @@ extern key_netstres * key_net_get_2_svc(); #define KEY_GET_CONV ((u_long)10) extern cryptkeyres * key_get_conv_2(); extern cryptkeyres * key_get_conv_2_svc(); -#endif /* Old Style C */ +#endif /* Old Style C */ #endif /* !_KEY_PROT_H_RPCGEN */ diff --git a/include/rpc/rpc_des.h b/include/rpc/rpc_des.h index 0f36d1697..96e536984 100644 --- a/include/rpc/rpc_des.h +++ b/include/rpc/rpc_des.h @@ -5,23 +5,23 @@ * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index 11f016179..ba8c84faf 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -17,7 +17,7 @@ 02111-1307 USA. */ #ifndef _SCSI_IOCTL_H -#define _SCSI_IOCTL_H +#define _SCSI_IOCTL_H /* IOCTLs for SCSI. */ #define SCSI_IOCTL_SEND_COMMAND 1 /* Send a command to the SCSI host. */ diff --git a/include/stdint.h b/include/stdint.h index 2f4020eb6..6d1ecbec4 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -238,7 +238,7 @@ typedef unsigned long long int uintmax_t; # define UINTPTR_MAX (4294967295U) # endif -#if !defined(__H8300H__) && !defined(__H8300S__) +#if !defined(__H8300H__) && !defined(__H8300S__) /* Minimum for largest signed integral type. */ # define INTMAX_MIN (-__INT64_C(9223372036854775807)-1) /* Maximum for largest signed integral type. */ diff --git a/include/sys/mman.h b/include/sys/mman.h index 326685f61..10471e683 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -94,7 +94,7 @@ extern int msync (void *__addr, size_t __len, int __flags); #else /* On no-mmu systems you can't have real private mappings. */ -static inline int msync (void *__addr, size_t __len, int __flags) { return 0; } +static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0; } #endif @@ -131,10 +131,10 @@ extern int munlockall (void) __THROW; /* On no-mmu systems, memory cannot be swapped out, so * these functions will always succeed. */ -static inline int mlock (__const void *__addr, size_t __len) { return 0; } -static inline int munlock (__const void *__addr, size_t __len) { return 0; } -static inline int mlockall (int __flags) { return 0; } -static inline int munlockall (void) { return 0; } +static __inline__ int mlock (__const void *__addr, size_t __len) { return 0; } +static __inline__ int munlock (__const void *__addr, size_t __len) { return 0; } +static __inline__ int mlockall (int __flags) { return 0; } +static __inline__ int munlockall (void) { return 0; } #endif #endif /* __UCLIBC_HAS_REALTIME__ */ diff --git a/include/sys/personality.h b/include/sys/personality.h index 5d14a9bc8..154b1131a 100644 --- a/include/sys/personality.h +++ b/include/sys/personality.h @@ -38,7 +38,7 @@ enum These go in the low byte. Avoid using the top bit, it will conflict with error returns. */ -enum +enum { PER_LINUX = 0x0000, PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT, diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 08b1c8b50..076678cfc 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -21,8 +21,8 @@ struct elf_resolve; extern int _dl_map_cache(void); extern int _dl_unmap_cache(void); #else -static inline void _dl_map_cache(void) { } -static inline void _dl_unmap_cache(void) { } +static __inline__ void _dl_map_cache(void) { } +static __inline__ void _dl_unmap_cache(void) { } #endif diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index e2f5f6fdd..1b28a34b6 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -164,7 +164,7 @@ extern int _dl_linux_dynamic_link(void); extern char * _dl_library_path; extern char * _dl_not_lazy; -static inline int _dl_symbol(char * name) +static __inline__ int _dl_symbol(char * name) { if (name[0] != '_' || name[1] != 'd' || name[2] != 'l' || name[3] != '_') return 0; diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 168465bb9..011974482 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -71,8 +71,8 @@ extern int _dl_debug_file; # define _dl_if_debug_dprint(fmt, args...) \ do { if (_dl_debug) __dl_debug_dprint(fmt, ## args); } while (0) #else -# define __dl_debug_dprint(fmt, args...) -# define _dl_if_debug_dprint(fmt, args...) +# define __dl_debug_dprint(fmt, args...) do {} while (0) +# define _dl_if_debug_dprint(fmt, args...) do {} while (0) # define _dl_debug_file 2 #endif /* __SUPPORT_LD_DEBUG__ */ @@ -96,7 +96,7 @@ extern int _dl_debug_file; #ifdef __SUPPORT_LD_DEBUG_EARLY__ # define _dl_debug_early(fmt, args...) __dl_debug_dprint(fmt, ## args) #else -# define _dl_debug_early(fmt, args...) +# define _dl_debug_early(fmt, args...) do {} while (0) #endif /* __SUPPORT_LD_DEBUG_EARLY__ */ #ifndef NULL diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index db5dbdadc..3955004a4 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -63,7 +63,6 @@ $(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y) $(Q)$(RM) $@ $(do_ar) - $(do_t_strip) $(UCLIBC_LDSO_NAME)_clean: $(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS} diff --git a/ldso/ldso/arm/dl-syscalls.h b/ldso/ldso/arm/dl-syscalls.h index ecbe96a1c..1c0e6699e 100644 --- a/ldso/ldso/arm/dl-syscalls.h +++ b/ldso/ldso/arm/dl-syscalls.h @@ -9,7 +9,7 @@ extern int _dl_errno; * provides them, so define them here (only required for thumb). */ #if defined(__thumb__) -asm( +__asm__( ".macro call_via register\n" " .global _call_via_\\register\n" " .hidden _call_via_\\register\n" diff --git a/ldso/ldso/arm/dl-sysdep.h b/ldso/ldso/arm/dl-sysdep.h index 4f5a517a6..2a0bbad77 100644 --- a/ldso/ldso/arm/dl-sysdep.h +++ b/ldso/ldso/arm/dl-sysdep.h @@ -18,7 +18,7 @@ GOT_BASE[1] = (unsigned long) MODULE; \ } -static inline unsigned long arm_modulus(unsigned long m, unsigned long p) +static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p) { unsigned long i,t,inc; i=p; t=0; @@ -79,7 +79,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); first element of the GOT. We used to use the PIC register to do this without a constant pool reference, but GCC 4.2 will use a pseudo-register for the PIC base, so it may not be in r10. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_dynamic (void) { Elf32_Addr dynamic; @@ -111,7 +111,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_load_address (void) { extern void __dl_start __asm__ ("_dl_start"); @@ -135,7 +135,7 @@ elf_machine_load_address (void) return pcrel_addr - got_addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/avr32/dl-startup.h b/ldso/ldso/avr32/dl-startup.h index 3b9a64176..3b8bf4ce2 100644 --- a/ldso/ldso/avr32/dl-startup.h +++ b/ldso/ldso/avr32/dl-startup.h @@ -9,7 +9,7 @@ /* This is the library loader's main entry point. Let _dl_boot2 do its * initializations and jump to the application's entry point * afterwards. */ -asm( " .text\n" +__asm__(" .text\n" " .global _start\n" " .type _start,@function\n" "_start:\n" diff --git a/ldso/ldso/avr32/dl-sysdep.h b/ldso/ldso/avr32/dl-sysdep.h index 1a301727b..5ee110101 100644 --- a/ldso/ldso/avr32/dl-sysdep.h +++ b/ldso/ldso/avr32/dl-sysdep.h @@ -60,22 +60,22 @@ unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got); /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { - register Elf32_Addr *got asm ("r6"); + register Elf32_Addr *got __asm__("r6"); return *got; } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { - extern void __dl_start asm("_dl_start"); + extern void __dl_start __asm__("_dl_start"); Elf32_Addr got_addr = (Elf32_Addr) &__dl_start; Elf32_Addr pcrel_addr; - asm (" lddpc %0, 2f\n" + __asm__(" lddpc %0, 2f\n" "1: add %0, pc\n" " rjmp 3f\n" " .align 2\n" @@ -91,7 +91,7 @@ elf_machine_load_address (void) * Currently, we don't use that tag, but we might in the future as * this would reduce the startup time somewhat (although probably not by much). */ -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/bfin/dl-inlines.h b/ldso/ldso/bfin/dl-inlines.h index 76ce32dea..f8b8f85f1 100644 --- a/ldso/ldso/bfin/dl-inlines.h +++ b/ldso/ldso/bfin/dl-inlines.h @@ -200,7 +200,7 @@ struct funcdesc_ht /* Current number of elements. */ size_t n_elements; -}; +}; inline static int hash_pointer (const void *p) @@ -219,11 +219,11 @@ htab_create (void) ht->entries = _dl_malloc (sizeof (struct funcdesc_ht_value *) * ht->size); if (! ht->entries) return NULL; - + ht->n_elements = 0; _dl_memset (ht->entries, 0, sizeof (struct funcdesc_ht_value *) * ht->size); - + return ht; } @@ -361,14 +361,14 @@ htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert) goto empty_entry; else if ((*entry)->entry_point == ptr) return entry; - + hash2 = 1 + hash % (size - 2); for (;;) { index += hash2; if (index >= size) index -= size; - + entry = &htab->entries[index]; if (!*entry) goto empty_entry; @@ -427,7 +427,7 @@ _dl_lookup_address (void const *address) if ((Elf32_Addr)address & 7) /* It's not a function descriptor. */ return address; - + fd = (struct funcdesc_value const *)address; for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) @@ -448,7 +448,7 @@ _dl_lookup_address (void const *address) else address = fd; } - + return address; } @@ -531,7 +531,7 @@ __dl_map_segment (Elf32_Ehdr *epnt, (tryaddr = 0, size = (ppnt->p_vaddr & ADDR_ALIGN) + ppnt->p_filesz, LXFLAGS(ppnt->p_flags), - flags | MAP_EXECUTABLE | MAP_DENYWRITE, + flags | MAP_EXECUTABLE | MAP_DENYWRITE, infile, ppnt->p_offset & OFFS_ALIGN); if (_dl_mmap_check_error(status) || (tryaddr && tryaddr != status)) diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h index 5b596fd01..a1e150e27 100644 --- a/ldso/ldso/bfin/dl-startup.h +++ b/ldso/ldso/bfin/dl-startup.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with uClibc; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + /* Any assembly language/system dependent hacks needed to setup * boot1.c so it will work as expected and cope with whatever platform * specific wierdness is needed for this architecture. diff --git a/ldso/ldso/bfin/dl-syscalls.h b/ldso/ldso/bfin/dl-syscalls.h index f9ba79b7c..21e4cdd2c 100644 --- a/ldso/ldso/bfin/dl-syscalls.h +++ b/ldso/ldso/bfin/dl-syscalls.h @@ -30,7 +30,7 @@ extern int _dl_errno; #if DYNAMIC_LOADER_IN_SIMULATOR #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Make sure we don't get another definition of _dl_mmap from the diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h index 8c3a16663..52df4c91f 100644 --- a/ldso/ldso/bfin/dl-sysdep.h +++ b/ldso/ldso/bfin/dl-sysdep.h @@ -171,7 +171,7 @@ do \ } \ \ } \ -while (0) +while (0) /* We want want to apply all relocations in the interpreter during bootstrap. Because of this, we have to skip the interpreter @@ -213,7 +213,7 @@ while (0) #endif #include <elf.h> -static inline void +static __inline__ void elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c index d003e2e71..ac24337a1 100644 --- a/ldso/ldso/bfin/elfinterp.c +++ b/ldso/ldso/bfin/elfinterp.c @@ -63,7 +63,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) symname= strtab + symtab[symtab_index].st_name; if (reloc_type != R_BFIN_FUNCDESC_VALUE) { - _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", + _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", _dl_progname); _dl_exit(1); } @@ -89,7 +89,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) if (_dl_debug_bindings) { _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); if (_dl_debug_detail) - _dl_dprintf(_dl_debug_file, + _dl_dprintf(_dl_debug_file, "\n\tpatched (%x,%x) ==> (%x,%x) @ %x\n", got_entry->entry_point, got_entry->got_value, funcval.entry_point, funcval.got_value, @@ -126,7 +126,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, for (i = 0; i < rel_size; i++, rpnt++) { int res; - + symtab_index = ELF_R_SYM(rpnt->r_info); debug_sym(symtab,strtab,symtab_index); debug_reloc(symtab,strtab,rpnt); @@ -136,17 +136,17 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, if (res==0) continue; _dl_dprintf(2, "\n%s: ",_dl_progname); - + if (symtab_index) _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); - + if (res <0) { int reloc_type = ELF_R_TYPE(rpnt->r_info); #if defined (__SUPPORT_LD_DEBUG__) _dl_dprintf(2, "can't handle reloc type %s\n ", _dl_reltypes(reloc_type)); #else _dl_dprintf(2, "can't handle reloc type %x\n", reloc_type); -#endif +#endif _dl_exit(-res); } else if (res >0) { _dl_dprintf(2, "can't resolve symbol\n"); diff --git a/ldso/ldso/cris/dl-startup.h b/ldso/ldso/cris/dl-startup.h index 417cb5096..832c3528b 100644 --- a/ldso/ldso/cris/dl-startup.h +++ b/ldso/ldso/cris/dl-startup.h @@ -6,7 +6,7 @@ * can find argc, argv and auxvt (Auxillary Vector Table). */ #ifdef __arch_v32 -asm("" \ +__asm__("" \ " .text\n" \ " .globl _start\n" \ " .type _start,@function\n" \ @@ -24,7 +24,7 @@ asm("" \ #else -asm("" \ +__asm__("" \ " .text\n" \ " .globl _start\n" \ " .type _start,@function\n" \ diff --git a/ldso/ldso/cris/dl-sysdep.h b/ldso/ldso/cris/dl-sysdep.h index b84dcad70..c68541d1b 100644 --- a/ldso/ldso/cris/dl-sysdep.h +++ b/ldso/ldso/cris/dl-sysdep.h @@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entr || ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY)) -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic(void) { /* Don't just set this to an asm variable "r0" since that's not logical @@ -61,7 +61,7 @@ elf_machine_dynamic(void) there's some other symbol we could use, that we don't *have* to force a GOT entry for. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address(void) { Elf32_Addr gotaddr_diff; @@ -95,7 +95,7 @@ elf_machine_load_address(void) return gotaddr_diff; } -static inline void +static __inline__ void elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index f7b506d43..b27da3af2 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -603,11 +603,11 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, return NULL; } - if (! piclib2map) + if (! piclib2map) { DL_INIT_LOADADDR_HDR (lib_loadaddr, status + (ppnt->p_vaddr & ADDR_ALIGN), ppnt); - + } /* Now we want to allocate and zero-out any data from the end of the region we mapped in from the diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index c0ded65a9..531fbb9b5 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -49,7 +49,7 @@ struct dyn_elf *_dl_handles = NULL; /* This is the new hash function that is used by the ELF linker to generate the * GNU hash table that each executable and library will have if --hash-style=[gnu,both] * is passed to the linker. We need it to decode the GNU hash table. */ -static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name) +static __inline__ Elf_Symndx _dl_gnu_hash (const unsigned char *name) { unsigned long h = 5381; unsigned char c; @@ -62,7 +62,7 @@ static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name) /* This is the hash function that is used by the ELF linker to generate the * hash table that each executable and library is required to have. We need * it to decode the hash table. */ -static inline Elf_Symndx _dl_elf_hash(const unsigned char *name) +static __inline__ Elf_Symndx _dl_elf_hash(const unsigned char *name) { unsigned long hash=0; unsigned long tmp; diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c index 6c9651976..a1ff5bd93 100644 --- a/ldso/ldso/dl-tls.c +++ b/ldso/ldso/dl-tls.c @@ -985,7 +985,7 @@ init_tls (void) size_t nelem = _dl_tls_max_dtv_idx + 1 + TLS_SLOTINFO_SURPLUS; /* Allocate. */ - _dl_assert (_dl_tls_dtv_slotinfo_list == NULL); + _dl_assert (_dl_tls_dtv_slotinfo_list == NULL); _dl_tls_dtv_slotinfo_list = (struct dtv_slotinfo_list *) _dl_calloc (sizeof (struct dtv_slotinfo_list) + nelem * sizeof (struct dtv_slotinfo), 1); diff --git a/ldso/ldso/frv/dl-inlines.h b/ldso/ldso/frv/dl-inlines.h index 00ff263ea..0d469dd88 100644 --- a/ldso/ldso/frv/dl-inlines.h +++ b/ldso/ldso/frv/dl-inlines.h @@ -184,7 +184,7 @@ struct funcdesc_ht /* Current number of elements. */ size_t n_elements; -}; +}; inline static int hash_pointer (const void *p) @@ -203,11 +203,11 @@ htab_create (void) ht->entries = _dl_malloc (sizeof (struct funcdesc_ht_value *) * ht->size); if (! ht->entries) return NULL; - + ht->n_elements = 0; _dl_memset (ht->entries, 0, sizeof (struct funcdesc_ht_value *) * ht->size); - + return ht; } @@ -345,14 +345,14 @@ htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert) goto empty_entry; else if ((*entry)->entry_point == ptr) return entry; - + hash2 = 1 + hash % (size - 2); for (;;) { index += hash2; if (index >= size) index -= size; - + entry = &htab->entries[index]; if (!*entry) goto empty_entry; @@ -411,7 +411,7 @@ _dl_lookup_address (void const *address) if ((Elf32_Addr)address & 7) /* It's not a function descriptor. */ return address; - + fd = (struct funcdesc_value const *)address; for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) @@ -432,7 +432,7 @@ _dl_lookup_address (void const *address) else address = fd; } - + return address; } diff --git a/ldso/ldso/frv/dl-startup.h b/ldso/ldso/frv/dl-startup.h index 00c7592e1..674f81c15 100644 --- a/ldso/ldso/frv/dl-startup.h +++ b/ldso/ldso/frv/dl-startup.h @@ -25,7 +25,7 @@ __self_reloc returns the relocated pointer to us, so that we can use this value to initialize the PIC register. */ -asm("" \ +__asm__("" \ " .text\n" \ " .global _dl_boot\n" \ " .type _dl_boot,@function\n" \ diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h index ffd59b82d..093d0dca8 100644 --- a/ldso/ldso/frv/dl-syscalls.h +++ b/ldso/ldso/frv/dl-syscalls.h @@ -16,7 +16,7 @@ extern int _dl_errno; #if DYNAMIC_LOADER_IN_SIMULATOR #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Make sure we don't get another definition of _dl_mmap from the diff --git a/ldso/ldso/frv/dl-sysdep.h b/ldso/ldso/frv/dl-sysdep.h index f72d54a4d..32d86ed2c 100644 --- a/ldso/ldso/frv/dl-sysdep.h +++ b/ldso/ldso/frv/dl-sysdep.h @@ -152,7 +152,7 @@ do \ _dl_close(infile); \ } \ } \ -while (0) +while (0) /* We want want to apply all relocations in the interpreter during bootstrap. Because of this, we have to skip the interpreter @@ -179,7 +179,7 @@ while (0) #define DL_GET_READY_TO_RUN_EXTRA_ARGS \ , dl_boot_progmap - + #ifdef __USE_GNU diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c index d8714c58e..df41f97bf 100644 --- a/ldso/ldso/frv/elfinterp.c +++ b/ldso/ldso/frv/elfinterp.c @@ -52,7 +52,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) symname= strtab + symtab[symtab_index].st_name; if (reloc_type != R_FRV_FUNCDESC_VALUE) { - _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", + _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", _dl_progname); _dl_exit(1); } @@ -82,7 +82,7 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) { _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); if (_dl_debug_detail) - _dl_dprintf(_dl_debug_file, + _dl_dprintf(_dl_debug_file, "\n\tpatched (%x,%x) ==> (%x,%x) @ %x\n", got_entry->entry_point, got_entry->got_value, funcval.entry_point, funcval.got_value, @@ -120,7 +120,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, for (i = 0; i < rel_size; i++, rpnt++) { int res; - + symtab_index = ELF32_R_SYM(rpnt->r_info); debug_sym(symtab,strtab,symtab_index); debug_reloc(symtab,strtab,rpnt); @@ -130,10 +130,10 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, if (res==0) continue; _dl_dprintf(2, "\n%s: ",_dl_progname); - + if (symtab_index) _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); - + if (res <0) { int reloc_type = ELF32_R_TYPE(rpnt->r_info); @@ -141,7 +141,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, _dl_dprintf(2, "can't handle reloc type %s\n ", _dl_reltypes(reloc_type)); #else _dl_dprintf(2, "can't handle reloc type %x\n", reloc_type); -#endif +#endif _dl_exit(-res); } else if (res >0) diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h index 931abe305..19128df7b 100644 --- a/ldso/ldso/i386/dl-sysdep.h +++ b/ldso/ldso/i386/dl-sysdep.h @@ -42,8 +42,8 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr elf_machine_dynamic (void) attribute_unused; -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused; +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%ebx"); @@ -52,8 +52,8 @@ elf_machine_dynamic (void) /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr elf_machine_load_address (void) attribute_unused; -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused; +static __inline__ Elf32_Addr elf_machine_load_address (void) { /* It doesn't matter what variable this is, the reference never makes @@ -66,7 +66,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/m68k/dl-startup.h b/ldso/ldso/m68k/dl-startup.h index fca4b6ccb..2ed9ead50 100644 --- a/ldso/ldso/m68k/dl-startup.h +++ b/ldso/ldso/m68k/dl-startup.h @@ -4,7 +4,7 @@ * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org> */ -asm ("\ +__asm__ ("\ .text\n\ .globl _start\n\ .type _start,@function\n\ diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h index 138cabd41..13e9e6015 100644 --- a/ldso/ldso/m68k/dl-sysdep.h +++ b/ldso/ldso/m68k/dl-sysdep.h @@ -1,7 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * Various assmbly language/system dependent hacks that are required - * so that we can minimize the amount of platform specific code. + * so that we can minimize the amount of platform specific code. * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org> */ @@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int); /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%a5"); @@ -50,7 +50,7 @@ elf_machine_dynamic (void) /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr; @@ -60,7 +60,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h index 4e3fcafb8..d76f4874d 100644 --- a/ldso/ldso/mips/dl-startup.h +++ b/ldso/ldso/mips/dl-startup.h @@ -7,7 +7,7 @@ #include <sgidefs.h> -asm("" +__asm__("" " .text\n" " .globl _start\n" " .ent _start\n" diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h index 1e69653b7..1b5a6e07a 100644 --- a/ldso/ldso/mips/dl-sysdep.h +++ b/ldso/ldso/mips/dl-sysdep.h @@ -163,7 +163,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy) #define OFFSET_GP_GOT 0x7ff0 -static inline ElfW(Addr) * +static __inline__ ElfW(Addr) * elf_mips_got_from_gpreg (ElfW(Addr) gpreg) { /* FIXME: the offset of gp from GOT may be system-dependent. */ @@ -173,7 +173,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg) /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. We assume its $gp points to the primary GOT. */ -static inline ElfW(Addr) +static __inline__ ElfW(Addr) elf_machine_dynamic (void) { register ElfW(Addr) gp __asm__ ("$28"); @@ -192,7 +192,7 @@ elf_machine_dynamic (void) #endif /* Return the run-time load address of the shared object. */ -static inline ElfW(Addr) +static __inline__ ElfW(Addr) elf_machine_load_address (void) { ElfW(Addr) addr; @@ -208,7 +208,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr, ElfW(Word) relative_count) { diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h index a5a8a83f2..7033da32b 100644 --- a/ldso/ldso/powerpc/dl-startup.h +++ b/ldso/ldso/powerpc/dl-startup.h @@ -4,7 +4,7 @@ * Copyright (C) 2005 by Joakim Tjernlund */ -asm( +__asm__( " .text\n" " .globl _start\n" " .type _start,@function\n" diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h index a4a2dd144..d5282485d 100644 --- a/ldso/ldso/powerpc/dl-sysdep.h +++ b/ldso/ldso/powerpc/dl-sysdep.h @@ -90,7 +90,7 @@ void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt); #define ELF_MACHINE_PLTREL_OVERLAP 1 /* Return the value of the GOT pointer. */ -static inline Elf32_Addr * __attribute__ ((const)) +static __inline__ Elf32_Addr * __attribute__ ((const)) ppc_got (void) { Elf32_Addr *got; @@ -109,14 +109,14 @@ ppc_got (void) /* Return the link-time address of _DYNAMIC, stored as the first value in the GOT. */ -static inline Elf32_Addr __attribute__ ((const)) +static __inline__ Elf32_Addr __attribute__ ((const)) elf_machine_dynamic (void) { return *ppc_got(); } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((const)) +static __inline__ Elf32_Addr __attribute__ ((const)) elf_machine_load_address (void) { Elf32_Addr *branchaddr; @@ -164,13 +164,13 @@ elf_machine_load_address (void) return runtime_dynamic - elf_machine_dynamic (); } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { Elf32_Rela * rpnt = (void *)rel_addr; --rpnt; - do { /* PowerPC handles pre increment/decrement better */ + do { /* PowerPC handles pre increment/decrement better */ Elf32_Addr *const reloc_addr = (void *) (load_off + (++rpnt)->r_offset); *reloc_addr = load_off + rpnt->r_addend; diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c index 8953e7059..eeb325092 100644 --- a/ldso/ldso/powerpc/elfinterp.c +++ b/ldso/ldso/powerpc/elfinterp.c @@ -186,7 +186,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) return finaladdr; } -static inline int +static __inline__ int _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab) { @@ -202,7 +202,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, #endif reloc_addr = (Elf32_Addr *)(intptr_t) (tpnt->loadaddr + (unsigned long) rpnt->r_offset); reloc_type = ELF32_R_TYPE(rpnt->r_info); - symbol_addr = tpnt->loadaddr; /* For R_PPC_RELATIVE */ + symbol_addr = tpnt->loadaddr; /* For R_PPC_RELATIVE */ symtab_index = ELF32_R_SYM(rpnt->r_info); symname = strtab + symtab[symtab_index].st_name; if (symtab_index) { @@ -368,7 +368,7 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt, PPC_ISYNC; } -static inline int +static __inline__ int _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, unsigned long rel_addr, unsigned long rel_size, int (*reloc_fnc) (struct elf_resolve *tpnt, struct dyn_elf *scope, @@ -386,7 +386,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB]; strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; - + for (i = 0; i < rel_size; i++, rpnt++) { int res; diff --git a/ldso/ldso/sh/dl-startup.h b/ldso/ldso/sh/dl-startup.h index bd51cebe0..3e59093fa 100644 --- a/ldso/ldso/sh/dl-startup.h +++ b/ldso/ldso/sh/dl-startup.h @@ -2,7 +2,7 @@ * will work as expected and cope with whatever platform specific wierdness is * needed for this architecture. */ -asm( +__asm__( " .text\n" " .globl _start\n" " .type _start,@function\n" diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h index abe0a123f..2b0f1cc42 100644 --- a/ldso/ldso/sh/dl-sysdep.h +++ b/ldso/ldso/sh/dl-sysdep.h @@ -26,7 +26,7 @@ struct elf_resolve; extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); -static inline unsigned int +static __inline__ unsigned int _dl_urem(unsigned int n, unsigned int base) { int res; @@ -109,7 +109,7 @@ _dl_urem(unsigned int n, unsigned int base) /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_dynamic (void) { register Elf32_Addr *got; @@ -118,7 +118,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_load_address (void) { Elf32_Addr addr; @@ -160,7 +160,7 @@ elf_machine_load_address (void) } \ } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/sh64/dl-startup.h b/ldso/ldso/sh64/dl-startup.h index 7701afc71..8c0a58df8 100644 --- a/ldso/ldso/sh64/dl-startup.h +++ b/ldso/ldso/sh64/dl-startup.h @@ -3,7 +3,7 @@ * needed for this architecture. */ -asm("" \ +__asm__("" \ " .section .text..SHmedia32,\"ax\"\n" \ " .globl _start\n" \ " .type _start, @function\n" \ diff --git a/ldso/ldso/sh64/dl-sysdep.h b/ldso/ldso/sh64/dl-sysdep.h index f16885b23..dadde6103 100644 --- a/ldso/ldso/sh64/dl-sysdep.h +++ b/ldso/ldso/sh64/dl-sysdep.h @@ -42,7 +42,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr elf_machine_dynamic(void) +static __inline__ Elf32_Addr elf_machine_dynamic(void) { register Elf32_Addr *got; @@ -70,7 +70,7 @@ static inline Elf32_Addr elf_machine_dynamic(void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr elf_machine_load_address(void) +static __inline__ Elf32_Addr elf_machine_load_address(void) { Elf32_Addr addr; @@ -123,7 +123,7 @@ static inline Elf32_Addr elf_machine_load_address(void) } \ } -static inline void +static __inline__ void elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/sparc/dl-startup.h b/ldso/ldso/sparc/dl-startup.h index 4ceb7c55a..c310e5df9 100644 --- a/ldso/ldso/sparc/dl-startup.h +++ b/ldso/ldso/sparc/dl-startup.h @@ -4,7 +4,7 @@ * can be done. */ -asm ("\ +__asm__ ("\ .text\n\ .global _start\n\ .type _start,%function\n\ diff --git a/ldso/ldso/sparc/dl-sysdep.h b/ldso/ldso/sparc/dl-sysdep.h index 82665083c..4c5013cd8 100644 --- a/ldso/ldso/sparc/dl-sysdep.h +++ b/ldso/ldso/sparc/dl-sysdep.h @@ -49,7 +49,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); #ifndef COMPILE_ASM /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */ -static inline unsigned long +static __inline__ unsigned long sparc_mod(unsigned long m, unsigned long p) { unsigned long i, t, inc; @@ -127,29 +127,29 @@ do { register Elf32_Addr pc __asm__("o7"); \ /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%l7"); - + LOAD_PIC_REG (got); - + return *got; } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { register Elf32_Addr *pc __asm__ ("%o7"), *got __asm ("%l7"); - + __asm__ ("sethi %%hi(_GLOBAL_OFFSET_TABLE_-4), %1\n\t" "call 1f\n\t" " add %1, %%lo(_GLOBAL_OFFSET_TABLE_+4), %1\n\t" "call _DYNAMIC\n\t" "call _GLOBAL_OFFSET_TABLE_\n" "1:\tadd %1, %0, %1\n\t" : "=r" (pc), "=r" (got)); - + /* got is now l_addr + _GLOBAL_OFFSET_TABLE_ *got is _DYNAMIC pc[2]*4 is l_addr + _DYNAMIC - (long)pc - 8 @@ -157,7 +157,7 @@ elf_machine_load_address (void) return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/xtensa/dl-startup.h b/ldso/ldso/xtensa/dl-startup.h index 2fd012846..8ae962408 100644 --- a/ldso/ldso/xtensa/dl-startup.h +++ b/ldso/ldso/xtensa/dl-startup.h @@ -5,7 +5,7 @@ * Copyright (C) 2007 Tensilica Inc. * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - * Parts taken from glibc/sysdeps/xtensa/dl-machine.h. + * Parts taken from glibc/sysdeps/xtensa/dl-machine.h. */ __asm__ ( diff --git a/ldso/ldso/xtensa/dl-sysdep.h b/ldso/ldso/xtensa/dl-sysdep.h index afbbf3bfe..b58feff54 100644 --- a/ldso/ldso/xtensa/dl-sysdep.h +++ b/ldso/ldso/xtensa/dl-sysdep.h @@ -87,7 +87,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int); (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) /* Return the link-time address of _DYNAMIC. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { /* This function is only used while bootstrapping the runtime linker. @@ -97,7 +97,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr, tmp; @@ -118,7 +118,7 @@ elf_machine_load_address (void) return addr - 3; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c index d81888f9a..25c1c32fa 100644 --- a/libc/inet/getaddrinfo.c +++ b/libc/inet/getaddrinfo.c @@ -1,5 +1,5 @@ /* - * Copyright 1996 by Craig Metz + * Copyright 1996 by Craig Metz * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * Portions from the GNU C library, * Copyright (C) 2003, 2006 Free Software Foundation, Inc. @@ -535,7 +535,7 @@ gaih_inet (const char *name, const struct gaih_service *service, } else { - /* + /* * Neither socket type nor protocol is set. Return all socket types * we know about. */ @@ -810,7 +810,7 @@ gaih_inet (const char *name, const struct gaih_service *service, sin6p->sin6_addr.s6_addr32[0] = 0; sin6p->sin6_addr.s6_addr32[1] = 0; sin6p->sin6_addr.s6_addr32[2] = htonl(0x0000ffff); - memcpy(&sin6p->sin6_addr.s6_addr32[3], + memcpy(&sin6p->sin6_addr.s6_addr32[3], at2->addr, sizeof (sin6p->sin6_addr.s6_addr32[3])); } sin6p->sin6_port = st2->port; diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c index 1e3e843f5..a079f6487 100644 --- a/libc/inet/getproto.c +++ b/libc/inet/getproto.c @@ -12,7 +12,7 @@ ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** Library General Public License for more details. -** +** ** You should have received a copy of the GNU Library General Public ** License along with the NYS Library; see the file COPYING.LIB. If ** not, write to the Free Software Foundation, Inc., 675 Mass Ave, diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c index 05b7b2669..bf00f3f8c 100644 --- a/libc/inet/if_index.c +++ b/libc/inet/if_index.c @@ -50,7 +50,7 @@ extern int __opensock(void) attribute_hidden; libc_hidden_proto(if_nametoindex) unsigned int -if_nametoindex(const char* ifname) +if_nametoindex(const char* ifname) { #ifndef SIOCGIFINDEX __set_errno (ENOSYS); diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c index c1f3fc83c..f19556dcd 100644 --- a/libc/inet/ntop.c +++ b/libc/inet/ntop.c @@ -254,7 +254,7 @@ inet_pton4(const char *src, u_char *dst) #ifdef __UCLIBC_HAS_IPV6__ /* We cannot use the macro version of tolower() or very bad - * things happen when '*src++' gets evaluated multiple times. + * things happen when '*src++' gets evaluated multiple times. * So undef it here so we get the function version of tolower * instead. */ diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c index 89a31a2d6..7e6c907ce 100644 --- a/libc/inet/rpc/clnt_perror.c +++ b/libc/inet/rpc/clnt_perror.c @@ -258,7 +258,7 @@ clnt_sperror (CLIENT * rpch, const char *msg) case RPC_CANTSEND: case RPC_CANTRECV: __glibc_strerror_r (e.re_errno, chrbuf, sizeof chrbuf); - len = sprintf (str, "; errno = %s", chrbuf); + len = sprintf (str, "; errno = %s", chrbuf); str += len; break; diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index fe00d6a78..cd8d620c0 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -53,7 +53,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - */ + */ #if 0 static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; @@ -144,7 +144,7 @@ libc_hidden_proto(rresvport) /* some forward declarations */ static int __ivaliduser2(FILE *hostf, u_int32_t raddr, const char *luser, const char *ruser, const char *rhost); -static int iruserok2 (u_int32_t raddr, int superuser, const char *ruser, +static int iruserok2 (u_int32_t raddr, int superuser, const char *ruser, const char *luser, const char *rhost); @@ -178,7 +178,7 @@ int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) tmphstbuf = malloc (hstbuflen); #endif - while (gethostbyname_r (*ahost, &hostbuf, tmphstbuf, + while (gethostbyname_r (*ahost, &hostbuf, tmphstbuf, hstbuflen, &hp, &herr) != 0 || hp == NULL) { if (herr != NETDB_INTERNAL || errno != ERANGE) @@ -212,7 +212,7 @@ int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) #endif pfd[0].events = POLLIN; pfd[1].events = POLLIN; - + *ahost = hp->h_name; oldmask = sigblock(sigmask(SIGURG)); /* __sigblock */ for (timo = 1, lport = IPPORT_RESERVED - 1;;) { @@ -361,7 +361,7 @@ int rresvport(int *alport) return -1; } } - + return -1; } libc_hidden_def(rresvport) @@ -394,8 +394,8 @@ int ruserok(rhost, superuser, ruser, luser) buffer = malloc (buflen); #endif - while (gethostbyname_r (rhost, &hostbuf, buffer, - buflen, &hp, &herr) != 0 || hp == NULL) + while (gethostbyname_r (rhost, &hostbuf, buffer, + buflen, &hp, &herr) != 0 || hp == NULL) { if (herr != NETDB_INTERNAL || errno != ERANGE) { #ifndef __ARCH_USE_MMU__ @@ -493,7 +493,7 @@ iruserok2 (raddr, superuser, ruser, luser, rhost) if (!superuser) hostf = iruserfopen (_PATH_HEQUIV, 0); - + if (hostf) { isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost); fclose (hostf); @@ -517,7 +517,7 @@ iruserok2 (raddr, superuser, ruser, luser, rhost) char *buffer = malloc (buflen); #endif - if (getpwnam_r (luser, &pwdbuf, buffer, + if (getpwnam_r (luser, &pwdbuf, buffer, buflen, &pwd) != 0 || pwd == NULL) { #ifndef __ARCH_USE_MMU__ @@ -545,12 +545,12 @@ iruserok2 (raddr, superuser, ruser, luser, rhost) seteuid (pwd->pw_uid); hostf = iruserfopen (pbuf, pwd->pw_uid); free(pbuf); - + if (hostf != NULL) { isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost); fclose (hostf); } - + seteuid (uid); return isbad; } diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index 7c25a39fb..abb76ebdc 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -599,7 +599,7 @@ const __ctype_mask_t __C_ctype_b_data[] = { /* -4 M-| */ 0, /* -3 M-} */ 0, /* -2 M-~ */ 0, -#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ +#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ /* -1 M-^? */ 0, /* 0 ^@ */ _IScntrl, /* 1 ^A */ _IScntrl, @@ -911,7 +911,7 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ +#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, @@ -1033,7 +1033,7 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ +#endif /* __UCLIBC_HAS_CTYPE_SIGNED__*/ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, diff --git a/libc/misc/dirent/dirstream.h b/libc/misc/dirent/dirstream.h index 761111b9e..370886aa7 100644 --- a/libc/misc/dirent/dirstream.h +++ b/libc/misc/dirent/dirstream.h @@ -60,7 +60,7 @@ struct __dirstream { /* total size of buffer */ size_t dd_max; - + /* lock */ __UCLIBC_MUTEX(dd_lock); }; /* stream data from opendir() */ diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c index 0e823ad98..aba63f20b 100644 --- a/libc/misc/dirent/scandir.c +++ b/libc/misc/dirent/scandir.c @@ -18,7 +18,7 @@ libc_hidden_proto(opendir) libc_hidden_proto(closedir) libc_hidden_proto(qsort) -int scandir(const char *dir, struct dirent ***namelist, +int scandir(const char *dir, struct dirent ***namelist, int (*selector) (const struct dirent *), int (*compar) (const void *, const void *)) { diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c index 98433f46d..083d2de18 100644 --- a/libc/misc/dirent/scandir64.c +++ b/libc/misc/dirent/scandir64.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. + 02111-1307 USA. */ /* Modified for uClibc by Erik Andersen @@ -36,7 +36,7 @@ libc_hidden_proto(closedir) libc_hidden_proto(qsort) libc_hidden_proto(readdir64) -int scandir64(const char *dir, struct dirent64 ***namelist, +int scandir64(const char *dir, struct dirent64 ***namelist, int (*selector) (const struct dirent64 *), int (*compar) (const void *, const void *)) { diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c index 81944ce98..c136f1e8d 100644 --- a/libc/misc/ftw/ftw.c +++ b/libc/misc/ftw/ftw.c @@ -279,7 +279,7 @@ object_compare (const void *p1, const void *p2) } -static inline int +static __inline__ int add_object (struct ftw_data *data, struct STAT *st) { struct known_object *newp = malloc (sizeof (struct known_object)); @@ -291,7 +291,7 @@ add_object (struct ftw_data *data, struct STAT *st) } -static inline int +static __inline__ int find_object (struct ftw_data *data, struct STAT *st) { struct known_object obj; @@ -301,7 +301,7 @@ find_object (struct ftw_data *data, struct STAT *st) } -static inline int +static __inline__ int __attribute ((always_inline)) open_dir_stream (struct ftw_data *data, struct dir_data *dirp) { diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c index 8f441ac68..00963c36e 100644 --- a/libc/misc/glob/glob-susv3.c +++ b/libc/misc/glob/glob-susv3.c @@ -235,7 +235,7 @@ int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), size_t cnt, i; size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0; int error = 0; - + if (*p == '/') { for (; *p == '/'; p++); d = "/"; @@ -256,7 +256,7 @@ int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), __glob_freelist(&head); return error; } - + for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++); if (!cnt) { if (flags & GLOB_NOCHECK) { @@ -292,7 +292,7 @@ int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), if (!(flags & GLOB_NOSORT)) qsort(g->gl_pathv+offs, cnt, sizeof(char *), __glob_sort); - + return error; } #ifdef __GLOB64 diff --git a/libc/misc/glob/glob64-susv3.c b/libc/misc/glob/glob64-susv3.c index cc633cd88..f73e2c3a7 100644 --- a/libc/misc/glob/glob64-susv3.c +++ b/libc/misc/glob/glob64-susv3.c @@ -16,5 +16,5 @@ #define globfree(pglob) globfree64 (pglob) #define __GLOB64 1 - + #include "glob-susv3.c" diff --git a/libc/misc/gnu/obstack.c b/libc/misc/gnu/obstack.c index a2e0de63b..246d164cd 100644 --- a/libc/misc/gnu/obstack.c +++ b/libc/misc/gnu/obstack.c @@ -154,7 +154,7 @@ struct obstack *_obstack; } while (0) # endif - + /* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). Objects start on multiples of ALIGNMENT (0 means use default). CHUNKFUN is the function to use to allocate chunks, @@ -383,7 +383,7 @@ _obstack_allocated_p ( } return lp != 0; } - + /* Free objects in obstack H, including OBJ and everything allocate more recently than OBJ. If OBJ is zero, free everything in H. */ @@ -457,7 +457,7 @@ obstack_free ( /* obj is not in any of the chunks! */ abort (); } - + int _obstack_memory_used ( struct obstack *h) @@ -471,7 +471,7 @@ _obstack_memory_used ( } return nbytes; } - + /* Define the error handler. */ # ifndef _ /* # if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC */ @@ -506,7 +506,7 @@ print_and_abort (void) fprintf (stderr, "%s\n", _("memory exhausted")); exit (obstack_exit_failure); } - + # if 0 /* These are now turned off because the applications do not use it and it uses bcopy via obstack_grow, which causes trouble on sysV. */ diff --git a/libc/misc/internals/tempname.h b/libc/misc/internals/tempname.h index 80a6cf7c1..ac40bef6e 100644 --- a/libc/misc/internals/tempname.h +++ b/libc/misc/internals/tempname.h @@ -1,11 +1,11 @@ -#ifndef __TEMPNAME_H__ +#ifndef __TEMPNAME_H__ #define __TEMPNAME_H__ #define __need_size_t #include <stddef.h> /* Disable support for $TMPDIR */ -extern int ___path_search (char *tmpl, size_t tmpl_len, const char *dir, +extern int ___path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx /*, int try_tmpdir */) attribute_hidden; #define __path_search(tmpl, tmpl_len, dir, pfx, try_tmpdir) ___path_search(tmpl, tmpl_len, dir, pfx) diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index 9825798ed..858a02c33 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -188,7 +188,7 @@ static const char utf8[] = "UTF-8"; #ifdef __UCLIBC_MJN3_ONLY__ #warning TODO: Fix dimensions of hr_locale. #endif -/* Individual category strings start at hr_locale + category * MAX_LOCALE_CATEGORY. +/* Individual category strings start at hr_locale + category * MAX_LOCALE_CATEGORY. * This holds for LC_ALL as well. */ static char hr_locale[(MAX_LOCALE_CATEGORY_STR * LC_ALL) + MAX_LOCALE_STR]; @@ -638,7 +638,7 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base) x = (const char **)(((char *) base) + base->category_offsets[i]); - + stp = __locale_mmap->lc_common_tbl_offsets + 4*i; r = (const unsigned char *)( ((char *)__locale_mmap) + *stp ); io = (const uint16_t *)( ((char *)__locale_mmap) + *++stp ); @@ -750,7 +750,7 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base) [ ((int)(c8b->idx8uplow [u >> __LOCALE_DATA_Cuplow_IDX_SHIFT]) << __LOCALE_DATA_Cuplow_IDX_SHIFT) - + ((128 + u) + + ((128 + u) & ((1 << __LOCALE_DATA_Cuplow_IDX_SHIFT) - 1)) ]; if (m & _ISlower) { @@ -835,7 +835,7 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base) assert(base->thousands_sep_len > 0); assert(base->thousands_sep[base->thousands_sep_len] == 0); #endif - } + } /* } else if (i == LC_COLLATE) { */ /* init_cur_collate(__locale_mmap->locales[ __LOCALE_DATA_WIDTH_LOCALES */ @@ -967,63 +967,63 @@ void _locale_init(void) static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = { /* static const char cat_start[LC_ALL + 1] = { */ - '\x00', '\x0b', '\x0e', '\x24', '\x56', '\x56', '\x5a', + '\x00', '\x0b', '\x0e', '\x24', '\x56', '\x56', '\x5a', /* }; */ /* static const char item_offset[90] = { */ - '\x00', '\x02', '\x04', '\x06', '\x08', '\x0a', '\x0c', '\x0e', - '\x10', '\x12', '\x14', '\x1a', '\x1b', '\x1b', '\x1b', '\x1b', - '\x1b', '\x1b', '\x1b', '\x1b', '\x1b', '\x1c', '\x1c', '\x1c', - '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', - '\x1c', '\x1c', '\x1c', '\x1e', '\x20', '\x24', '\x28', '\x2c', - '\x30', '\x34', '\x38', '\x3c', '\x43', '\x4a', '\x52', '\x5c', - '\x65', '\x6c', '\x75', '\x79', '\x7d', '\x81', '\x85', '\x89', - '\x8d', '\x91', '\x95', '\x99', '\x9d', '\xa1', '\xa5', '\xad', - '\x36', '\x3c', '\x42', '\x46', '\x4b', '\x50', '\x57', '\x61', - '\x69', '\x72', '\x7b', '\x7e', '\x81', '\x96', '\x9f', '\xa8', - '\xb3', '\xb3', '\xb3', '\xb3', '\xb3', '\xb3', '\xb4', '\xba', - '\xbf', '\xbf', + '\x00', '\x02', '\x04', '\x06', '\x08', '\x0a', '\x0c', '\x0e', + '\x10', '\x12', '\x14', '\x1a', '\x1b', '\x1b', '\x1b', '\x1b', + '\x1b', '\x1b', '\x1b', '\x1b', '\x1b', '\x1c', '\x1c', '\x1c', + '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', '\x1c', + '\x1c', '\x1c', '\x1c', '\x1e', '\x20', '\x24', '\x28', '\x2c', + '\x30', '\x34', '\x38', '\x3c', '\x43', '\x4a', '\x52', '\x5c', + '\x65', '\x6c', '\x75', '\x79', '\x7d', '\x81', '\x85', '\x89', + '\x8d', '\x91', '\x95', '\x99', '\x9d', '\xa1', '\xa5', '\xad', + '\x36', '\x3c', '\x42', '\x46', '\x4b', '\x50', '\x57', '\x61', + '\x69', '\x72', '\x7b', '\x7e', '\x81', '\x96', '\x9f', '\xa8', + '\xb3', '\xb3', '\xb3', '\xb3', '\xb3', '\xb3', '\xb4', '\xba', + '\xbf', '\xbf', /* }; */ /* static const char C_locale_data[320] = { */ - '0', '\x00', '1', '\x00', '2', '\x00', '3', '\x00', - '4', '\x00', '5', '\x00', '6', '\x00', '7', '\x00', - '8', '\x00', '9', '\x00', 'A', 'S', 'C', 'I', - 'I', '\x00', '.', '\x00', '\x7f', '\x00', '-', '\x00', - 'S', 'u', 'n', '\x00', 'M', 'o', 'n', '\x00', - 'T', 'u', 'e', '\x00', 'W', 'e', 'd', '\x00', - 'T', 'h', 'u', '\x00', 'F', 'r', 'i', '\x00', - 'S', 'a', 't', '\x00', 'S', 'u', 'n', 'd', - 'a', 'y', '\x00', 'M', 'o', 'n', 'd', 'a', - 'y', '\x00', 'T', 'u', 'e', 's', 'd', 'a', - 'y', '\x00', 'W', 'e', 'd', 'n', 'e', 's', - 'd', 'a', 'y', '\x00', 'T', 'h', 'u', 'r', - 's', 'd', 'a', 'y', '\x00', 'F', 'r', 'i', - 'd', 'a', 'y', '\x00', 'S', 'a', 't', 'u', - 'r', 'd', 'a', 'y', '\x00', 'J', 'a', 'n', - '\x00', 'F', 'e', 'b', '\x00', 'M', 'a', 'r', - '\x00', 'A', 'p', 'r', '\x00', 'M', 'a', 'y', - '\x00', 'J', 'u', 'n', '\x00', 'J', 'u', 'l', - '\x00', 'A', 'u', 'g', '\x00', 'S', 'e', 'p', - '\x00', 'O', 'c', 't', '\x00', 'N', 'o', 'v', - '\x00', 'D', 'e', 'c', '\x00', 'J', 'a', 'n', - 'u', 'a', 'r', 'y', '\x00', 'F', 'e', 'b', - 'r', 'u', 'a', 'r', 'y', '\x00', 'M', 'a', - 'r', 'c', 'h', '\x00', 'A', 'p', 'r', 'i', - 'l', '\x00', 'M', 'a', 'y', '\x00', 'J', 'u', - 'n', 'e', '\x00', 'J', 'u', 'l', 'y', '\x00', - 'A', 'u', 'g', 'u', 's', 't', '\x00', 'S', - 'e', 'p', 't', 'e', 'm', 'b', 'e', 'r', - '\x00', 'O', 'c', 't', 'o', 'b', 'e', 'r', - '\x00', 'N', 'o', 'v', 'e', 'm', 'b', 'e', - 'r', '\x00', 'D', 'e', 'c', 'e', 'm', 'b', - 'e', 'r', '\x00', 'A', 'M', '\x00', 'P', 'M', - '\x00', '%', 'a', ' ', '%', 'b', ' ', '%', - 'e', ' ', '%', 'H', ':', '%', 'M', ':', - '%', 'S', ' ', '%', 'Y', '\x00', '%', 'm', - '/', '%', 'd', '/', '%', 'y', '\x00', '%', - 'H', ':', '%', 'M', ':', '%', 'S', '\x00', - '%', 'I', ':', '%', 'M', ':', '%', 'S', - ' ', '%', 'p', '\x00', '^', '[', 'y', 'Y', - ']', '\x00', '^', '[', 'n', 'N', ']', '\x00', + '0', '\x00', '1', '\x00', '2', '\x00', '3', '\x00', + '4', '\x00', '5', '\x00', '6', '\x00', '7', '\x00', + '8', '\x00', '9', '\x00', 'A', 'S', 'C', 'I', + 'I', '\x00', '.', '\x00', '\x7f', '\x00', '-', '\x00', + 'S', 'u', 'n', '\x00', 'M', 'o', 'n', '\x00', + 'T', 'u', 'e', '\x00', 'W', 'e', 'd', '\x00', + 'T', 'h', 'u', '\x00', 'F', 'r', 'i', '\x00', + 'S', 'a', 't', '\x00', 'S', 'u', 'n', 'd', + 'a', 'y', '\x00', 'M', 'o', 'n', 'd', 'a', + 'y', '\x00', 'T', 'u', 'e', 's', 'd', 'a', + 'y', '\x00', 'W', 'e', 'd', 'n', 'e', 's', + 'd', 'a', 'y', '\x00', 'T', 'h', 'u', 'r', + 's', 'd', 'a', 'y', '\x00', 'F', 'r', 'i', + 'd', 'a', 'y', '\x00', 'S', 'a', 't', 'u', + 'r', 'd', 'a', 'y', '\x00', 'J', 'a', 'n', + '\x00', 'F', 'e', 'b', '\x00', 'M', 'a', 'r', + '\x00', 'A', 'p', 'r', '\x00', 'M', 'a', 'y', + '\x00', 'J', 'u', 'n', '\x00', 'J', 'u', 'l', + '\x00', 'A', 'u', 'g', '\x00', 'S', 'e', 'p', + '\x00', 'O', 'c', 't', '\x00', 'N', 'o', 'v', + '\x00', 'D', 'e', 'c', '\x00', 'J', 'a', 'n', + 'u', 'a', 'r', 'y', '\x00', 'F', 'e', 'b', + 'r', 'u', 'a', 'r', 'y', '\x00', 'M', 'a', + 'r', 'c', 'h', '\x00', 'A', 'p', 'r', 'i', + 'l', '\x00', 'M', 'a', 'y', '\x00', 'J', 'u', + 'n', 'e', '\x00', 'J', 'u', 'l', 'y', '\x00', + 'A', 'u', 'g', 'u', 's', 't', '\x00', 'S', + 'e', 'p', 't', 'e', 'm', 'b', 'e', 'r', + '\x00', 'O', 'c', 't', 'o', 'b', 'e', 'r', + '\x00', 'N', 'o', 'v', 'e', 'm', 'b', 'e', + 'r', '\x00', 'D', 'e', 'c', 'e', 'm', 'b', + 'e', 'r', '\x00', 'A', 'M', '\x00', 'P', 'M', + '\x00', '%', 'a', ' ', '%', 'b', ' ', '%', + 'e', ' ', '%', 'H', ':', '%', 'M', ':', + '%', 'S', ' ', '%', 'Y', '\x00', '%', 'm', + '/', '%', 'd', '/', '%', 'y', '\x00', '%', + 'H', ':', '%', 'M', ':', '%', 'S', '\x00', + '%', 'I', ':', '%', 'M', ':', '%', 'S', + ' ', '%', 'p', '\x00', '^', '[', 'y', 'Y', + ']', '\x00', '^', '[', 'n', 'N', ']', '\x00', }; libc_hidden_proto(nl_langinfo) diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index c3367955c..f4220784a 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -27,7 +27,7 @@ libc_hidden_proto(abort) libc_hidden_proto(fprintf) /* Reentrant version of getmntent. */ -struct mntent *getmntent_r (FILE *filep, +struct mntent *getmntent_r (FILE *filep, struct mntent *mnt, char *buff, int bufsize) { char *cp, *ptrptr; @@ -82,13 +82,13 @@ struct mntent *getmntent(FILE * filep) static char *buff = NULL; static struct mntent mnt; __UCLIBC_MUTEX_LOCK(mylock); - + if (!buff) { buff = malloc(BUFSIZ); if (!buff) abort(); } - + tmp = getmntent_r(filep, &mnt, buff, BUFSIZ); __UCLIBC_MUTEX_UNLOCK(mylock); return(tmp); diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 471ea55f0..210ae05ee 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -120,7 +120,7 @@ static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa); static void free_token (re_token_t *node); static reg_errcode_t free_tree (void *extra, bin_tree_t *node); static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node); - + /* This table gives an error message for each of the error codes listed in regex.h. Obviously the order here has to be same as there. POSIX doesn't require that we do anything for REG_NOERROR, @@ -200,7 +200,7 @@ const size_t __re_error_msgid_idx[] attribute_hidden = REG_ESIZE_IDX, REG_ERPAREN_IDX }; - + /* Entry points for GNU code. */ /* re_compile_pattern is the GNU regular expression compiler: it @@ -286,7 +286,7 @@ re_compile_fastmap (bufp) strong_alias(__re_compile_fastmap, re_compile_fastmap) #endif -static inline void +static __inline__ void __attribute ((always_inline)) re_set_fastmap (char *fastmap, int icase, int ch) { @@ -406,7 +406,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, } } } - + /* Entry point for POSIX code. */ /* regcomp takes a regular expression as a string and compiles it. @@ -632,7 +632,7 @@ regfree (preg) #if defined _LIBC || defined __UCLIBC__ strong_alias(__regfree, regfree) #endif - + /* Entry points compatible with 4.2 BSD regex library. We don't define them unless specifically requested. */ @@ -701,7 +701,7 @@ libc_freeres_fn (free_mem) #endif #endif /* _REGEX_RE_COMP */ - + /* Internal entry point. Compile the regular expression PATTERN, whose length is LENGTH. SYNTAX indicate regular expression's syntax. */ @@ -1019,7 +1019,7 @@ create_initial_state (re_dfa_t *dfa) re_node_set_free (&init_nodes); return REG_NOERROR; } - + #ifdef RE_ENABLE_I18N /* If it is possible to do searching in single byte encoding instead of UTF-8 to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change @@ -1089,7 +1089,7 @@ optimize_utf8 (re_dfa_t *dfa) dfa->has_mb_node = dfa->nbackref > 0 || has_period; } #endif - + /* Analyze the structure tree, and calculate "first", "next", "edest", "eclosure", and "inveclosure". */ @@ -1700,7 +1700,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root) *new_set = eclosure; return REG_NOERROR; } - + /* Functions for token which are used in the parser. */ /* Fetch a token from INPUT. @@ -2037,7 +2037,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) } return 1; } - + /* Functions for parser. */ /* Entry point of the parser. @@ -2721,7 +2721,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, Seek the collating symbol entry correspondings to NAME. Return the index of the symbol in the SYMB_TABLE. */ - auto inline int32_t + auto __inline__ int32_t __attribute ((always_inline)) seek_collating_symbol_entry (name, name_len) const unsigned char *name; @@ -2759,7 +2759,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, Look up the collation sequence value of BR_ELEM. Return the value if succeeded, UINT_MAX otherwise. */ - auto inline unsigned int + auto __inline__ unsigned int __attribute ((always_inline)) lookup_collation_sequence_value (br_elem) bracket_elem_t *br_elem; @@ -2827,7 +2827,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, mbcset->range_ends, is a pointer argument sinse we may update it. */ - auto inline reg_errcode_t + auto __inline__ reg_errcode_t __attribute ((always_inline)) build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem) re_charset_t *mbcset; @@ -2910,7 +2910,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a pointer argument sinse we may update it. */ - auto inline reg_errcode_t + auto __inline__ reg_errcode_t __attribute ((always_inline)) build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name) re_charset_t *mbcset; @@ -3660,7 +3660,7 @@ fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax) } return num; } - + #ifdef RE_ENABLE_I18N static void free_charset (re_charset_t *cset) @@ -3676,7 +3676,7 @@ free_charset (re_charset_t *cset) re_free (cset); } #endif /* RE_ENABLE_I18N */ - + /* Functions for binary tree operation. */ /* Create a tree node. */ diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c index fa0b336e8..11b1be7c2 100644 --- a/libc/misc/regex/regex_internal.c +++ b/libc/misc/regex/regex_internal.c @@ -29,7 +29,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, unsigned int hash) internal_function; - + /* Functions for string operation. */ /* This function allocate the buffers. It is necessary to call @@ -873,7 +873,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags) return IS_NEWLINE (c) && input->newline_anchor ? CONTEXT_NEWLINE : 0; } } - + /* Functions for set operation. */ static reg_errcode_t @@ -1314,7 +1314,7 @@ re_node_set_remove_at (re_node_set *set, int idx) for (; idx < set->nelem; idx++) set->elems[idx] = set->elems[idx + 1]; } - + /* Add the token TOKEN to dfa->nodes, and return the index of the token. Or return -1, if an error will be occured. */ @@ -1366,7 +1366,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) return dfa->nodes_len++; } -static inline unsigned int +static __inline__ unsigned int internal_function calc_state_hash (const re_node_set *nodes, unsigned int context) { diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h index af38acc42..725e33a5a 100644 --- a/libc/misc/regex/regex_internal.h +++ b/libc/misc/regex/regex_internal.h @@ -656,7 +656,7 @@ struct re_dfa_t (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1)) #define re_node_set_empty(p) ((p)->nelem = 0) #define re_node_set_free(set) re_free ((set)->elems) - + typedef enum { @@ -682,7 +682,7 @@ typedef struct /* Inline functions for bitset operation. */ -static inline void +static __inline__ void bitset_not (bitset_t set) { int bitset_i; @@ -690,7 +690,7 @@ bitset_not (bitset_t set) set[bitset_i] = ~set[bitset_i]; } -static inline void +static __inline__ void bitset_merge (bitset_t dest, const bitset_t src) { int bitset_i; @@ -698,7 +698,7 @@ bitset_merge (bitset_t dest, const bitset_t src) dest[bitset_i] |= src[bitset_i]; } -static inline void +static __inline__ void bitset_mask (bitset_t dest, const bitset_t src) { int bitset_i; @@ -708,7 +708,7 @@ bitset_mask (bitset_t dest, const bitset_t src) #ifdef RE_ENABLE_I18N /* Inline functions for re_string. */ -static inline int +static __inline__ int internal_function __attribute ((pure)) re_string_char_size_at (const re_string_t *pstr, int idx) { @@ -721,7 +721,7 @@ re_string_char_size_at (const re_string_t *pstr, int idx) return byte_idx; } -static inline wint_t +static __inline__ wint_t internal_function __attribute ((pure)) re_string_wchar_at (const re_string_t *pstr, int idx) { diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index dc5781967..f56c56bf9 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -223,7 +223,7 @@ char *realloc (); # ifndef MB_LEN_MAX # define MB_LEN_MAX 1 # endif - + /* Get the interface, including the syntax bits. */ # ifdef __UCLIBC__ # include "_regex.h" @@ -296,7 +296,7 @@ char *realloc (); /* As in Harbison and Steele. */ # define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) # endif - + # ifndef emacs /* How many characters in the character set. */ # define CHAR_SET_SIZE 256 @@ -335,7 +335,7 @@ init_syntax_once () # define SYNTAX(c) re_syntax_table[(unsigned char) (c)] # endif /* emacs */ - + /* Integer type for pointers. */ # if !defined _LIBC && !defined __intptr_t_defined typedef unsigned long int uintptr_t; @@ -482,7 +482,7 @@ static int wcs_re_search_2 PARAMS ((struct re_pattern_buffer *bufp, struct re_registers *regs, int stop)); static int wcs_re_compile_fastmap PARAMS ((struct re_pattern_buffer *bufp)); #endif - + /* These are the command codes that appear in compiled regular expressions. Some opcodes are followed by argument bytes. A command code can specify any interpretation whatsoever for its @@ -641,7 +641,7 @@ typedef enum # endif /* emacs */ } re_opcode_t; #endif /* not INSIDE_RECURSION */ - + #ifdef BYTE # define CHAR_T char @@ -777,7 +777,7 @@ PREFIX(extract_number_and_incr) (destination, source) # endif /* DEBUG */ - + /* If DEBUG is defined, Regex prints many voluminous messages about what it is doing (if the variable `debug' is nonzero). If linked with the @@ -1277,7 +1277,7 @@ printchar (c) # endif /* not DEBUG */ - + # ifdef WCHAR /* This convert a multibyte string to a wide character string. @@ -1394,7 +1394,7 @@ re_set_syntax (syntax) # if defined _LIBC || defined __UCLIBC__ strong_alias(__re_set_syntax, re_set_syntax) # endif - + /* This table gives an error message for each of the error codes listed in regex.h. Obviously the order here has to be same as there. POSIX doesn't require that we do anything for REG_NOERROR, @@ -1474,7 +1474,7 @@ static const size_t re_error_msgid_idx[] = REG_ESIZE_IDX, REG_ERPAREN_IDX }; - + #endif /* INSIDE_RECURSION */ #ifndef DEFINED_ONCE @@ -1515,7 +1515,7 @@ static const size_t re_error_msgid_idx[] = # undef MATCH_MAY_ALLOCATE # endif #endif /* not DEFINED_ONCE */ - + #ifdef INSIDE_RECURSION /* Failure stack declarations and macros; both re_compile_fastmap and re_match_2 use a failure stack. These have to be macros because of @@ -1887,7 +1887,7 @@ typedef struct set_regs_matched_done = 0; \ DEBUG_STATEMENT (nfailure_points_popped++); \ } /* POP_FAILURE_POINT */ - + /* Structure for per-register (a.k.a. per-group) information. Other register information, such as the starting and ending positions (which are addresses), and the list of @@ -2306,7 +2306,7 @@ typedef struct || STREQ (string, "cntrl") || STREQ (string, "blank")) # endif # endif /* DEFINED_ONCE */ - + # ifndef MATCH_MAY_ALLOCATE /* If we cannot allocate large objects within re_match_2_internal, @@ -2357,7 +2357,7 @@ PREFIX(regex_grow_registers) (num_regs) } # endif /* not MATCH_MAY_ALLOCATE */ - + # ifndef DEFINED_ONCE static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type compile_stack, @@ -4648,7 +4648,7 @@ byte_compile_range (range_start_char, p_ptr, pend, translate, syntax, b) return ret; } #endif /* WCHAR */ - + /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible characters can start a string that matches the pattern. This fastmap @@ -5018,7 +5018,7 @@ re_compile_fastmap (bufp) #if defined _LIBC || defined __UCLIBC__ strong_alias(__re_compile_fastmap, re_compile_fastmap) #endif - + /* Set REGS to hold NUM_REGS registers, storing them in STARTS and ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use @@ -5057,7 +5057,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends) #if defined _LIBC || defined __UCLIBC__ strong_alias(__re_set_registers, re_set_registers) #endif - + /* Searching routines. */ /* Like re_search_2, below, but only one string is specified, and @@ -5546,7 +5546,7 @@ PREFIX(re_search_2) (bufp, string1, size1, string2, size2, startpos, range, to actually save any registers when none are active. */ #define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH) #define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1) - + #else /* not INSIDE_RECURSION */ /* Matching routines. */ @@ -7659,7 +7659,7 @@ byte_re_match_2_internal (bufp, string1, size1,string2, size2, pos, return -1; /* Failure to match. */ } /* re_match_2 */ - + /* Subroutine definitions for re_match_2. */ @@ -7931,7 +7931,7 @@ PREFIX(bcmp_translate) (s1, s2, len, translate) } return 0; } - + #else /* not INSIDE_RECURSION */ @@ -7980,7 +7980,7 @@ re_compile_pattern (pattern, length, bufp) #if defined _LIBC || defined __UCLIBC__ strong_alias(__re_compile_pattern, re_compile_pattern) #endif - + /* Entry points compatible with 4.2 BSD regex library. We don't define them unless specifically requested. */ @@ -8056,7 +8056,7 @@ re_exec (s) } #endif /* _REGEX_RE_COMP */ - + /* POSIX.2 functions. Don't define these for Emacs. */ #ifndef emacs @@ -8331,7 +8331,7 @@ strong_alias(__regfree, regfree) #endif /* not INSIDE_RECURSION */ - + #undef STORE_NUMBER #undef STORE_NUMBER_AND_INCR #undef EXTRACT_NUMBER diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c index 2c8917e19..587e6af30 100644 --- a/libc/misc/regex/regexec.c +++ b/libc/misc/regex/regexec.c @@ -200,7 +200,7 @@ static int check_node_accept (const re_match_context_t *mctx, internal_function; static reg_errcode_t extend_buffers (re_match_context_t *mctx) internal_function; - + /* Entry point for POSIX code. */ /* regexec searches for a given pattern, specified by PREG, in the @@ -595,7 +595,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends) #if defined _LIBC || defined __UCLIBC__ strong_alias(__re_set_registers, re_set_registers) #endif - + /* Entry points compatible with 4.2 BSD regex library. We don't define them unless specifically requested. */ @@ -610,7 +610,7 @@ re_exec (s) return 0 == regexec (&re_comp_buf, s, 0, NULL, 0); } #endif /* _REGEX_RE_COMP */ - + /* Internal entry point. */ /* Searches for a compiled pattern PREG in the string STRING, whose @@ -1027,7 +1027,7 @@ prune_impossible_nodes (mctx) We must select appropriate initial state depending on the context, since initial states may have constraints like "\<", "^", etc.. */ -static inline re_dfastate_t * +static __inline__ re_dfastate_t * __attribute ((always_inline)) internal_function acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, int idx) @@ -2236,7 +2236,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, } #endif /* RE_ENABLE_I18N */ - + /* Functions for state transition. */ /* Return the next state to which the current state STATE will transit by @@ -4117,7 +4117,7 @@ extend_buffers (re_match_context_t *mctx) return REG_NOERROR; } - + /* Functions for matching context. */ /* Initialize MCTX. */ diff --git a/libc/misc/search/_lsearch.c b/libc/misc/search/_lsearch.c index 6c3afcba1..e91ea9441 100644 --- a/libc/misc/search/_lsearch.c +++ b/libc/misc/search/_lsearch.c @@ -1,7 +1,7 @@ /* * This file lifted in toto from 'Dlibs' on the atari ST (RdeBath) * - * + * * Dale Schumacher 399 Beacon Ave. * (alias: Dalnefre') St. Paul, MN 55104 * dal@syntel.UUCP United States of America @@ -36,7 +36,7 @@ libc_hidden_def(lfind) /* Experimentally off - libc_hidden_proto(memcpy) */ -void *lsearch(const void *key, void *base, size_t *nmemb, +void *lsearch(const void *key, void *base, size_t *nmemb, size_t size, int (*compar)(const void *, const void *)) { register char *p; diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c index 989710e08..3d43aa543 100644 --- a/libc/misc/search/_tsearch.c +++ b/libc/misc/search/_tsearch.c @@ -177,7 +177,7 @@ static void trecurse(__const void *vroot, __action_fn_t action, int level) } } -/* void twalk(root, action) Walk the nodes of a tree +/* void twalk(root, action) Walk the nodes of a tree node *root; Root of the tree to be walked void (*action)(); Function to be called at each node PTR diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in index c979b2255..b0a8b84c9 100644 --- a/libc/misc/statfs/Makefile.in +++ b/libc/misc/statfs/Makefile.in @@ -7,7 +7,10 @@ CSRC := statvfs.c fstatvfs.c ifeq ($(UCLIBC_HAS_LFS),y) -CSRC += fstatfs64.c statfs64.c statvfs64.c fstatvfs64.c +ifeq ($(UCLIBC_LINUX_SPECIFIC),y) +CSRC += fstatfs64.c statfs64.c +endif +CSRC += statvfs64.c fstatvfs64.c endif MISC_STATFS_DIR := $(top_srcdir)libc/misc/statfs diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c index 231d45207..e21235e01 100644 --- a/libc/misc/statfs/fstatvfs.c +++ b/libc/misc/statfs/fstatvfs.c @@ -34,7 +34,6 @@ libc_hidden_proto(setmntent) libc_hidden_proto(getmntent_r) libc_hidden_proto(endmntent) -#if !defined __UCLIBC_LINUX_SPECIFIC__ #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) __THROW __nonnull ((2)); @@ -46,7 +45,7 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf), # define fstatfs fstatfs64 # endif #endif -#endif + extern __typeof(fstatfs) __libc_fstatfs; libc_hidden_proto(__libc_fstatfs) libc_hidden_proto(fstat) diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c index 02e7011cf..2d44e4217 100644 --- a/libc/misc/statfs/fstatvfs64.c +++ b/libc/misc/statfs/fstatvfs64.c @@ -28,6 +28,7 @@ #include <sys/statfs.h> #include <sys/statvfs.h> + /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strsep) */ @@ -37,19 +38,40 @@ libc_hidden_proto(endmntent) #undef stat #define stat stat64 +#if defined __UCLIBC_LINUX_SPECIFIC__ libc_hidden_proto(fstatfs64) libc_hidden_proto(fstat64) +#endif libc_hidden_proto(stat64) int fstatvfs64 (int fd, struct statvfs64 *buf) { struct statfs64 fsbuf; struct stat64 st; +#if !defined __UCLIBC_LINUX_SPECIFIC__ + int ret; + struct statvfs buf32; + ret = fstatvfs (fd, &buf32); + if (ret == 0) { + fsbuf.f_bsize = buf32.f_bsize; + fsbuf.f_frsize = buf32.f_frsize; + fsbuf.f_blocks = buf32.f_blocks; + fsbuf.f_bfree = buf32.f_bfree; + fsbuf.f_bavail = buf32.f_bavail; + fsbuf.f_files = buf32.f_files; + fsbuf.f_ffree = buf32.f_ffree; + if (sizeof (fsbuf.f_fsid) == sizeof(buf32.f_fsid)) + memcpy (&fsbuf.f_fsid, &buf32.f_fsid, sizeof(fsbuf.f_fsid)); + /* and if not, then you could approximate or whatever.. */ + fsbuf.f_namelen = buf32.f_namemax; + } else + return ret; +#else /* Get as much information as possible from the system. */ if (fstatfs64 (fd, &fsbuf) < 0) return -1; - +#endif #define STAT(st) fstat64 (fd, st) #include "internal_statvfs.c" diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c index c91e1fe26..66f648ac1 100644 --- a/libc/misc/statfs/statvfs64.c +++ b/libc/misc/statfs/statvfs64.c @@ -37,18 +37,41 @@ libc_hidden_proto(endmntent) #undef stat #define stat stat64 +#if !defined __UCLIBC_LINUX_SPECIFIC__ libc_hidden_proto(statfs64) +#else +libc_hidden_proto(statvfs) +#endif libc_hidden_proto(stat64) int statvfs64 (const char *file, struct statvfs64 *buf) { struct statfs64 fsbuf; struct stat64 st; +#if !defined __UCLIBC_LINUX_SPECIFIC__ + int ret; + struct statvfs buf32; + ret = statvfs (file, &buf32); + if (ret == 0) { + fsbuf.f_bsize = buf32.f_bsize; + fsbuf.f_frsize = buf32.f_frsize; + fsbuf.f_blocks = buf32.f_blocks; + fsbuf.f_bfree = buf32.f_bfree; + fsbuf.f_bavail = buf32.f_bavail; + fsbuf.f_files = buf32.f_files; + fsbuf.f_ffree = buf32.f_ffree; + if (sizeof (fsbuf.f_fsid) == sizeof(buf32.f_fsid)) + memcpy (&fsbuf.f_fsid, &buf32.f_fsid, sizeof(fsbuf.f_fsid)); + /* and if not, then you could approximate or whatever.. */ + fsbuf.f_namelen = buf32.f_namemax; + } else + return ret; +#else /* Get as much information as possible from the system. */ if (statfs64 (file, &fsbuf) < 0) return -1; - +#endif #define STAT(st) stat (file, st) #include "internal_statvfs.c" diff --git a/libc/misc/sysvipc/msgq.c b/libc/misc/sysvipc/msgq.c index 59fd47424..34b398bb6 100644 --- a/libc/misc/sysvipc/msgq.c +++ b/libc/misc/sysvipc/msgq.c @@ -12,7 +12,7 @@ #ifdef __NR_msgctl #define __NR___libc_msgctl __NR_msgctl -static inline _syscall3(int, __libc_msgctl, int, msqid, int, cmd, struct msqid_ds *, buf); +static __inline__ _syscall3(int, __libc_msgctl, int, msqid, int, cmd, struct msqid_ds *, buf); #endif /* Message queue control operation. */ int msgctl(int msqid, int cmd, struct msqid_ds *buf) diff --git a/libc/misc/sysvipc/sem.c b/libc/misc/sysvipc/sem.c index 07705c9d9..1caec5a8c 100644 --- a/libc/misc/sysvipc/sem.c +++ b/libc/misc/sysvipc/sem.c @@ -40,7 +40,7 @@ union semun { #ifdef __NR_semctl #define __NR___semctl __NR_semctl -static inline _syscall4(int, __semctl, int, semid, int, semnum, int, cmd, void *, arg); +static __inline__ _syscall4(int, __semctl, int, semid, int, semnum, int, cmd, void *, arg); #endif int semctl(int semid, int semnum, int cmd, ...) diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c index 9f76a12ed..b1af943b8 100644 --- a/libc/misc/sysvipc/shm.c +++ b/libc/misc/sysvipc/shm.c @@ -56,7 +56,7 @@ void * shmat (int shmid, const void *shmaddr, int shmflg) /* Provide operations to control over shared memory segments. */ #ifdef __NR_shmctl #define __NR___libc_shmctl __NR_shmctl -static inline _syscall3(int, __libc_shmctl, int, shmid, int, cmd, struct shmid_ds *, buf); +static __inline__ _syscall3(int, __libc_shmctl, int, shmid, int, cmd, struct shmid_ds *, buf); #endif int shmctl(int shmid, int cmd, struct shmid_ds *buf) { diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index b43422ddc..b55cdb267 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -60,7 +60,7 @@ static FILE *tf; static struct ttyent tty; -/* Skip over the current field, removing quotes, and return +/* Skip over the current field, removing quotes, and return * a pointer to the next field. */ #define QUOTED 1 diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 57c3dbffd..9e979c1fb 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -234,7 +234,7 @@ int wctob(wint_t c) /* If we don't have 8-bit locale support, then this is trivial since * anything outside of 0-0x7f is illegal in C/POSIX and UTF-8 locales. */ - + /* TODO: need unsigned version of wint_t... */ /* return (((unsigned int)c) < 0x80) ? c : WEOF; */ return ((c >= 0) && (c < 0x80)) ? c : EOF; @@ -934,109 +934,109 @@ libc_hidden_proto(wcswidth) ( defined(__CTYPE_HAS_8_BIT_LOCALES) || defined(__CTYPE_HAS_UTF_8_LOCALES) ) static const unsigned char new_idx[] = { - 0, 5, 5, 6, 10, 15, 28, 39, - 48, 48, 71, 94, 113, 128, 139, 154, - 175, 186, 188, 188, 188, 188, 188, 188, - 203, 208, 208, 208, 208, 208, 208, 208, - 208, 219, 219, 219, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 224, - 224, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 233, 233, 233, - 233, 233, 233, 233, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 236, 236, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, - 236, 237, 237, 238, 241, 241, 242, 249, - 255, + 0, 5, 5, 6, 10, 15, 28, 39, + 48, 48, 71, 94, 113, 128, 139, 154, + 175, 186, 188, 188, 188, 188, 188, 188, + 203, 208, 208, 208, 208, 208, 208, 208, + 208, 219, 219, 219, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 224, + 224, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 233, 233, 233, + 233, 233, 233, 233, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, + 236, 236, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 236, 236, 236, 236, + 236, 237, 237, 238, 241, 241, 242, 249, + 255, }; static const unsigned char new_tbl[] = { - 0x00, 0x01, 0x20, 0x7f, 0xa0, 0x00, 0x00, 0x50, - 0x60, 0x70, 0x00, 0x83, 0x87, 0x88, 0x8a, 0x00, - 0x91, 0xa2, 0xa3, 0xba, 0xbb, 0xbe, 0xbf, 0xc0, - 0xc1, 0xc3, 0xc4, 0xc5, 0x00, 0x4b, 0x56, 0x70, - 0x71, 0xd6, 0xe5, 0xe7, 0xe9, 0xea, 0xee, 0x00, - 0x0f, 0x10, 0x11, 0x12, 0x30, 0x4b, 0xa6, 0xb1, - 0x00, 0x01, 0x03, 0x3c, 0x3d, 0x41, 0x49, 0x4d, - 0x4e, 0x51, 0x55, 0x62, 0x64, 0x81, 0x82, 0xbc, - 0xbd, 0xc1, 0xc5, 0xcd, 0xce, 0xe2, 0xe4, 0x00, - 0x02, 0x03, 0x3c, 0x3d, 0x41, 0x43, 0x47, 0x49, - 0x4b, 0x4e, 0x70, 0x72, 0x81, 0x83, 0xbc, 0xbd, - 0xc1, 0xc6, 0xc7, 0xc9, 0xcd, 0xce, 0x00, 0x01, - 0x02, 0x3c, 0x3d, 0x3f, 0x40, 0x41, 0x44, 0x4d, - 0x4e, 0x56, 0x57, 0x82, 0x83, 0xc0, 0xc1, 0xcd, - 0xce, 0x00, 0x3e, 0x41, 0x46, 0x49, 0x4a, 0x4e, - 0x55, 0x57, 0xbf, 0xc0, 0xc6, 0xc7, 0xcc, 0xce, - 0x00, 0x41, 0x44, 0x4d, 0x4e, 0xca, 0xcb, 0xd2, - 0xd5, 0xd6, 0xd7, 0x00, 0x31, 0x32, 0x34, 0x3b, - 0x47, 0x4f, 0xb1, 0xb2, 0xb4, 0xba, 0xbb, 0xbd, - 0xc8, 0xce, 0x00, 0x18, 0x1a, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x3a, 0x71, 0x7f, 0x80, 0x85, 0x86, - 0x88, 0x90, 0x98, 0x99, 0xbd, 0xc6, 0xc7, 0x00, - 0x2d, 0x31, 0x32, 0x33, 0x36, 0x38, 0x39, 0x3a, - 0x58, 0x5a, 0x00, 0x60, 0x00, 0x12, 0x15, 0x32, - 0x35, 0x52, 0x54, 0x72, 0x74, 0xb7, 0xbe, 0xc6, - 0xc7, 0xc9, 0xd4, 0x00, 0x0b, 0x0f, 0xa9, 0xaa, - 0x00, 0x0b, 0x10, 0x2a, 0x2f, 0x60, 0x64, 0x6a, - 0x70, 0xd0, 0xeb, 0x00, 0x29, 0x2b, 0x00, 0x80, - 0x00, 0x2a, 0x30, 0x3f, 0x40, 0x99, 0x9b, 0x00, - 0xd0, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, 0x1e, - 0x1f, 0x00, 0x00, 0x10, 0x20, 0x24, 0x30, 0x70, - 0xff, 0x00, 0x61, 0xe0, 0xe7, 0xf9, 0xfc, + 0x00, 0x01, 0x20, 0x7f, 0xa0, 0x00, 0x00, 0x50, + 0x60, 0x70, 0x00, 0x83, 0x87, 0x88, 0x8a, 0x00, + 0x91, 0xa2, 0xa3, 0xba, 0xbb, 0xbe, 0xbf, 0xc0, + 0xc1, 0xc3, 0xc4, 0xc5, 0x00, 0x4b, 0x56, 0x70, + 0x71, 0xd6, 0xe5, 0xe7, 0xe9, 0xea, 0xee, 0x00, + 0x0f, 0x10, 0x11, 0x12, 0x30, 0x4b, 0xa6, 0xb1, + 0x00, 0x01, 0x03, 0x3c, 0x3d, 0x41, 0x49, 0x4d, + 0x4e, 0x51, 0x55, 0x62, 0x64, 0x81, 0x82, 0xbc, + 0xbd, 0xc1, 0xc5, 0xcd, 0xce, 0xe2, 0xe4, 0x00, + 0x02, 0x03, 0x3c, 0x3d, 0x41, 0x43, 0x47, 0x49, + 0x4b, 0x4e, 0x70, 0x72, 0x81, 0x83, 0xbc, 0xbd, + 0xc1, 0xc6, 0xc7, 0xc9, 0xcd, 0xce, 0x00, 0x01, + 0x02, 0x3c, 0x3d, 0x3f, 0x40, 0x41, 0x44, 0x4d, + 0x4e, 0x56, 0x57, 0x82, 0x83, 0xc0, 0xc1, 0xcd, + 0xce, 0x00, 0x3e, 0x41, 0x46, 0x49, 0x4a, 0x4e, + 0x55, 0x57, 0xbf, 0xc0, 0xc6, 0xc7, 0xcc, 0xce, + 0x00, 0x41, 0x44, 0x4d, 0x4e, 0xca, 0xcb, 0xd2, + 0xd5, 0xd6, 0xd7, 0x00, 0x31, 0x32, 0x34, 0x3b, + 0x47, 0x4f, 0xb1, 0xb2, 0xb4, 0xba, 0xbb, 0xbd, + 0xc8, 0xce, 0x00, 0x18, 0x1a, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x71, 0x7f, 0x80, 0x85, 0x86, + 0x88, 0x90, 0x98, 0x99, 0xbd, 0xc6, 0xc7, 0x00, + 0x2d, 0x31, 0x32, 0x33, 0x36, 0x38, 0x39, 0x3a, + 0x58, 0x5a, 0x00, 0x60, 0x00, 0x12, 0x15, 0x32, + 0x35, 0x52, 0x54, 0x72, 0x74, 0xb7, 0xbe, 0xc6, + 0xc7, 0xc9, 0xd4, 0x00, 0x0b, 0x0f, 0xa9, 0xaa, + 0x00, 0x0b, 0x10, 0x2a, 0x2f, 0x60, 0x64, 0x6a, + 0x70, 0xd0, 0xeb, 0x00, 0x29, 0x2b, 0x00, 0x80, + 0x00, 0x2a, 0x30, 0x3f, 0x40, 0x99, 0x9b, 0x00, + 0xd0, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, 0x1e, + 0x1f, 0x00, 0x00, 0x10, 0x20, 0x24, 0x30, 0x70, + 0xff, 0x00, 0x61, 0xe0, 0xe7, 0xf9, 0xfc, }; static const signed char new_wtbl[] = { - 0, -1, 1, -1, 1, 1, 0, 1, - 0, 1, 1, 0, 1, 0, 1, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 0, 1, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 1, - 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 2, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 1, 0, 1, 0, 1, - 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 1, 2, 1, 1, 2, - 2, 0, 2, 1, 2, 0, 2, 2, - 1, 1, 2, 1, 1, 2, 1, 0, - 1, 1, 0, 1, 0, 1, 2, 1, - 0, 2, 1, 2, 1, 0, 1, + 0, -1, 1, -1, 1, 1, 0, 1, + 0, 1, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 2, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 1, 0, 1, 0, 1, + 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 1, 2, 1, 1, 2, + 2, 0, 2, 1, 2, 0, 2, 2, + 1, 1, 2, 1, 1, 2, 1, 0, + 1, 1, 0, 1, 0, 1, 2, 1, + 0, 2, 1, 2, 1, 0, 1, }; libc_hidden_proto(wcsnrtombs) @@ -1049,7 +1049,7 @@ int wcswidth(const wchar_t *pwcs, size_t n) if (ENCODING == __ctype_encoding_7_bit) { size_t i; - + for (i = 0 ; (i < n) && pwcs[i] ; i++) { if (pwcs[i] != (pwcs[i] & 0x7f)) { return -1; @@ -1070,7 +1070,7 @@ int wcswidth(const wchar_t *pwcs, size_t n) /* For stricter handling of allowed unicode values... see comments above. */ else if (ENCODING == __ctype_encoding_utf8) { size_t i; - + for (i = 0 ; (i < n) && pwcs[i] ; i++) { if ( (((__uwchar_t)((pwcs[i]) - 0xfffeU)) < 2) || (((__uwchar_t)((pwcs[i]) - 0xd800U)) < (0xe000U - 0xd800U)) @@ -1507,7 +1507,7 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf, } wc += (wc2 << 16); } else if (px->tocodeset & 1) wc = bswap_16(wc); - } + } (*outbuf)[0] = (char)((unsigned char)(wc)); (*outbuf)[1] = (char)((unsigned char)(wc >> 8)); if (inco == 4) { @@ -1586,10 +1586,10 @@ extern const unsigned char __iconv_codesets[]; char *progname; int hide_errors; -static void error_msg(const char *fmt, ...) +static void error_msg(const char *fmt, ...) __attribute__ ((noreturn, format (printf, 1, 2))); -static void error_msg(const char *fmt, ...) +static void error_msg(const char *fmt, ...) { va_list arg; diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index 358586f75..145c24c79 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -110,14 +110,14 @@ static int parse_dquote(char **word, size_t * word_length, #define W_CHUNK (100) /* Result of w_newword will be ignored if it's the last word. */ -static inline char *w_newword(size_t * actlen, size_t * maxlen) +static __inline__ char *w_newword(size_t * actlen, size_t * maxlen) { *actlen = *maxlen = 0; return NULL; } /* Add a character to the buffer, allocating room for it if needed. */ -static inline char *w_addchar(char *buffer, size_t * actlen, +static __inline__ char *w_addchar(char *buffer, size_t * actlen, size_t * maxlen, char ch) /* (lengths exclude trailing zero) */ { @@ -325,8 +325,8 @@ parse_tilde(char **word, size_t * word_length, size_t * max_length, uid = getuid(); buffer = alloca(buflen); - while ((result = getpwuid_r(uid, &pwd, buffer, buflen, &tpwd)) - != 0 && errno == ERANGE) + while ((result = getpwuid_r(uid, &pwd, buffer, buflen, &tpwd)) + != 0 && errno == ERANGE) { buflen += 1000; buffer = alloca(buflen); @@ -1897,7 +1897,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, return error; } #else -static inline int +static __inline__ int parse_backtick(char **word, size_t * word_length, size_t * max_length, const char *words, size_t * offset, int flags, wordexp_t * pwordexp, const char *ifs, diff --git a/libc/signal/allocrtsig.c b/libc/signal/allocrtsig.c index 87fd9a641..3c7d6211b 100644 --- a/libc/signal/allocrtsig.c +++ b/libc/signal/allocrtsig.c @@ -22,7 +22,7 @@ #include <signal.h> #include <sys/types.h> #include <sys/syscall.h> - + /* Only enable rt signals when it is supported at compile time */ #ifndef __NR_rt_sigaction /* In these variables we keep track of the used variables. If the diff --git a/libc/signal/sigaction.c b/libc/signal/sigaction.c index 50ab640d5..88fb6b7a4 100644 --- a/libc/signal/sigaction.c +++ b/libc/signal/sigaction.c @@ -52,7 +52,7 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) kact.sa_restorer = act->sa_restorer; # endif } - + /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ result = __syscall_rt_sigaction(sig, diff --git a/libc/signal/sigjmp.c b/libc/signal/sigjmp.c index 38892e050..d143e9376 100644 --- a/libc/signal/sigjmp.c +++ b/libc/signal/sigjmp.c @@ -30,7 +30,7 @@ libc_hidden_proto(sigprocmask) int __sigjmp_save (sigjmp_buf env, int savemask) attribute_hidden; int __sigjmp_save (sigjmp_buf env, int savemask) { - env[0].__mask_was_saved = (savemask && + env[0].__mask_was_saved = (savemask && sigprocmask (SIG_BLOCK, (sigset_t *) NULL, &env[0].__saved_mask) == 0); return 0; diff --git a/libc/signal/sigset-cvt-mask.h b/libc/signal/sigset-cvt-mask.h index ca4774dbd..7b2f4cdce 100644 --- a/libc/signal/sigset-cvt-mask.h +++ b/libc/signal/sigset-cvt-mask.h @@ -19,7 +19,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -static inline int __attribute__ ((unused)) +static __inline__ int __attribute__ ((unused)) sigset_set_old_mask (sigset_t *set, int mask) { unsigned long int *ptr; @@ -37,7 +37,7 @@ sigset_set_old_mask (sigset_t *set, int mask) return 0; } -static inline int __attribute__ ((unused)) +static __inline__ int __attribute__ ((unused)) sigset_get_old_mask (const sigset_t *set) { return (unsigned int) set->__val[0]; diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c index 2a63fda9d..b8d93a091 100644 --- a/libc/stdio/_fpmaxtostr.c +++ b/libc/stdio/_fpmaxtostr.c @@ -19,7 +19,7 @@ typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len, /* Copyright (C) 2000, 2001, 2003 Manuel Novoa III * - * Function: + * Function: * * ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, * __fp_outfunc_t fp_outfunc); @@ -185,7 +185,7 @@ static const __fpmax_t exp16_table[] = { #if FPMAX_MAX_EXP >= 16384 0x1.0p16384L #endif -#if FPMAX_MAX_EXP >= 32768 +#if FPMAX_MAX_EXP >= 32768 #error unsupported FPMAX_MAX_EXP. please increase table #endif }; @@ -410,7 +410,7 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, if (mode < 'a') { *exp_buf -= ('a' - 'A'); /* e->E and p->P */ mode += ('a' - 'A'); - } + } o_mode = mode; if ((mode == 'g') && (preci > 0)){ @@ -450,7 +450,7 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, #ifdef __UCLIBC_HAS_HEXADECIMAL_FLOATS__ if ((mode|0x20) == 'a') { char *q; - + for (q = e ; *q ; --q) { if (*q > '9') { *q += (*exp_buf - ('p' - 'a') - '9' - 1); diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c index 7a80371b8..0d25a0a9f 100644 --- a/libc/stdio/_uintmaxtostr.c +++ b/libc/stdio/_uintmaxtostr.c @@ -129,7 +129,7 @@ char attribute_hidden *_uintmaxtostr(register char * __restrict bufend, uintmax_ digit = low % base; low /= base; } - + #ifndef __LOCALE_C_ONLY if (unlikely(outdigit)) { bufend -= __UCLIBC_CURLOCALE_DATA.outdigit_length[digit]; diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index 947b5b077..61a730d75 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -35,7 +35,7 @@ /* April 1, 2002 * Initialize thread locks for fake files in vsnprintf and vdprintf. * reported by Erik Andersen (andersen@codepoet.com) - * Fix an arg promotion handling bug in _do_one_spec for %c. + * Fix an arg promotion handling bug in _do_one_spec for %c. * reported by Ilguiz Latypov <ilatypov@superbt.com> * * May 10, 2002 @@ -241,7 +241,7 @@ enum { FLAG_THOUSANDS = 0x20, FLAG_I18N = 0x40, /* only works for d, i, u */ FLAG_WIDESTREAM = 0x80 -}; +}; /**********************************************************************/ @@ -544,7 +544,7 @@ int attribute_hidden _ppfs_init(register ppfs_t *ppfs, const char *fmt0) #if 1 /* TODO - use memset here since already "paid for"? */ register int *p = ppfs->argtype; - + r = MAX_ARGS; do { *p++ = __PA_NOARG; @@ -637,7 +637,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) *(int *) #endif GET_VA_ARG(p,u,unsigned int,ppfs->arg); - } + } if (ppfs->info.prec == INT_MIN) { ppfs->info.prec = #ifdef __va_arg_ptr @@ -690,7 +690,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) case PA_STRING: case PA_WSTRING: GET_VA_ARG(p,p,void *,ppfs->arg); - break; + break; case __PA_NOARG: continue; } @@ -701,7 +701,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) if (ppfs->info.width == INT_MIN) { ppfs->info.width = (int) GET_ARG_VALUE(p + ppfs->argnumber[0] - 1,u,unsigned int); - } + } if (ppfs->info.prec == INT_MIN) { ppfs->info.prec = (int) GET_ARG_VALUE(p + ppfs->argnumber[1] - 1,u,unsigned int); @@ -750,7 +750,7 @@ libc_hidden_proto(__ctype_b) /* TODO -- rethink this -- perhaps we should set to largest type??? */ -#ifdef _OVERLAPPING_DIFFERENT_ARGS +#ifdef _OVERLAPPING_DIFFERENT_ARGS #define PROMOTED_SIZE_OF(X) ((sizeof(X) + sizeof(int) - 1) / sizeof(X)) @@ -974,7 +974,7 @@ int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs) restart_flags: /* Process flags. */ i = 1; p = spec_flags; - + do { if (*fmt == *p++) { ++fmt; @@ -1100,7 +1100,7 @@ int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs) /* Otherwise error. */ return -1; } - + #if defined(__UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__) || defined(__UCLIBC_HAS_PRINTF_M_SPEC__) DONE: #endif @@ -1212,8 +1212,7 @@ static size_t _charpad(FILE * __restrict stream, int padchar, size_t numpad); #define OUTNSTR _outnstr #define STRLEN strlen #define _PPFS_init _ppfs_init -/* Pulls in fseek: #define OUTPUT(F,S) fputs_unlocked(S,F) */ -#define OUTPUT(F,S) __stdio_fwrite((const unsigned char *)(S),strlen(S),(F)) +#define OUTPUT(F,S) fputs_unlocked(S,F) /* #define _outnstr(stream, string, len) __stdio_fwrite(string, len, stream) */ #define _outnstr(stream, string, len) ((len > 0) ? __stdio_fwrite(string, len, stream) : 0) #define FP_OUT _fp_out_narrow @@ -1260,7 +1259,7 @@ static size_t _outnstr(FILE *stream, const char *s, size_t wclen) mbstate.__mask = 0; todo = wclen; - + while (todo) { r = mbsrtowcs(wbuf, &s, ((todo <= sizeof(wbuf)/sizeof(wbuf[0])) @@ -1364,7 +1363,7 @@ static int _ppwfs_init(register ppfs_t *ppfs, const wchar_t *fmt0) #if 1 /* TODO - use memset here since already "paid for"? */ register int *p = ppfs->argtype; - + r = MAX_ARGS; do { *p++ = __PA_NOARG; @@ -1900,7 +1899,7 @@ int VFPRINTF_internal (FILE * __restrict stream, if (!*format) { /* we're done */ break; } - + if (format[1] != '%') { /* if we get here, *format == '%' */ /* TODO: _do_one_spec needs to know what the output funcs are!!! */ ppfs.fmtpos = (const char *)(++format); @@ -1960,7 +1959,7 @@ int VFPRINTF (FILE * __restrict stream, __STDIO_AUTO_THREADLOCK(stream); - if + if #ifdef L_vfprintf (!__STDIO_STREAM_IS_NARROW_WRITING(stream) && __STDIO_STREAM_TRANS_TO_WRITE(stream, __FLAG_NARROW)) diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c index acf6231b2..635ab803d 100644 --- a/libc/stdio/fdopen.c +++ b/libc/stdio/fdopen.c @@ -15,7 +15,7 @@ FILE *fdopen(int filedes, const char *mode) intptr_t cur_mode; return (((cur_mode = fcntl(filedes, F_GETFL))) != -1) - ? _stdio_fopen(cur_mode, mode, NULL, filedes) + ? _stdio_fopen(cur_mode, mode, NULL, filedes) : NULL; } libc_hidden_def(fdopen) diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c index eb4fa736e..ba194d726 100644 --- a/libc/stdio/fmemopen.c +++ b/libc/stdio/fmemopen.c @@ -142,7 +142,7 @@ FILE *fmemopen(void *s, size_t len, const char *modes) cookie->dynbuf = 1; *cookie->buf = 0; /* If we're appending, treat as empty file. */ } - + #ifndef __BCC__ fp = fopencookie(cookie, modes, _fmo_io_funcs); #else diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c index d8b04f733..4f9c98465 100644 --- a/libc/stdio/fread.c +++ b/libc/stdio/fread.c @@ -56,7 +56,7 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, goto DONE; } } - + /* We need to read from the host environment, so we must * flush all line buffered streams if the stream is not * fully buffered. */ diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c index f63ebad4e..251040231 100644 --- a/libc/stdio/fseeko.c +++ b/libc/stdio/fseeko.c @@ -42,7 +42,7 @@ int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence) if ((!__STDIO_STREAM_IS_WRITING(stream) || !__STDIO_COMMIT_WRITE_BUFFER(stream)) - && ((whence != SEEK_CUR) + && ((whence != SEEK_CUR) || (__stdio_adjust_position(stream, &pos) >= 0)) && (__SEEK(stream, &pos, whence) >= 0) ) { diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c index 85a0967c1..a7ec28d8d 100644 --- a/libc/stdio/old_vfprintf.c +++ b/libc/stdio/old_vfprintf.c @@ -1,7 +1,7 @@ /* * This file based on printf.c from 'Dlibs' on the atari ST (RdeBath) * - * + * * Dale Schumacher 399 Beacon Ave. * (alias: Dalnefre') St. Paul, MN 55104 * dal@syntel.UUCP United States of America @@ -72,7 +72,7 @@ * Fixed precision bug -- when negative set to default. * Added function fnprintf to support __dtostr. * Added floating point support for doubles. Yeah! - * + * * * May 2001 Fixes from Johan Adolfsson (johan.adolfsson@axis.com) * 1) printf("%c",0) returned 0 instead of 1. @@ -401,7 +401,7 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, p++; } } - + if (!flag[FLAG_PLUS]) { flag[FLAG_PLUS] = flag[FLAG_SPACE]; } @@ -584,14 +584,14 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, PRINT_INFO_SET_FLAG(&info,left); } #if 1 - cnt += _fpmaxtostr(op, + cnt += _fpmaxtostr(op, (__fpmax_t) ((dataargtype == (8 << 8)) ? va_arg(ap, long double) : (long double) va_arg(ap, double)), &info, _fp_out_narrow); #else - cnt += _fpmaxtostr(op, + cnt += _fpmaxtostr(op, (__fpmax_t) ((lval > 1) ? va_arg(ap, long double) @@ -658,7 +658,7 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, preci = 0; if (!flag[FLAG_MINUS_LJUSTIFY] /* && flag[FLAG_PLUS] */ - && (flag[FLAG_0_PAD] == '0')) { + && (flag[FLAG_0_PAD] == '0')) { preci = width; width = 0; } diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c index a9327608a..e7b1cf435 100644 --- a/libc/stdio/open_memstream.c +++ b/libc/stdio/open_memstream.c @@ -144,7 +144,7 @@ FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc) *cookie->buf = 0; /* Set nul terminator for buffer. */ *(cookie->bufloc = bufloc) = cookie->buf; *(cookie->sizeloc = sizeloc) = cookie->eof = cookie->pos = 0; - + #ifndef __BCC__ fp = fopencookie(cookie, "w", _oms_io_funcs); #else diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c index 04ab12edb..f322411e4 100644 --- a/libc/stdio/remove.c +++ b/libc/stdio/remove.c @@ -16,7 +16,7 @@ libc_hidden_proto(unlink) /* SUSv3 states: * If path does not name a directory, remove(path) shall be equivalent * to unlink(path). If path names a directory, remove(path) shall be - * equivalent to rmdir(path). + * equivalent to rmdir(path). */ libc_hidden_proto(remove) diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c index 836b79f6c..bf6a4cd30 100644 --- a/libc/stdlib/arc4random.c +++ b/libc/stdlib/arc4random.c @@ -52,13 +52,13 @@ struct arc4_stream { static int rs_initialized; static struct arc4_stream rs; -static inline void arc4_init(struct arc4_stream *); -static inline void arc4_addrandom(struct arc4_stream *, u_char *, int); +static __inline__ void arc4_init(struct arc4_stream *); +static __inline__ void arc4_addrandom(struct arc4_stream *, u_char *, int); static void arc4_stir(struct arc4_stream *); -static inline uint8_t arc4_getbyte(struct arc4_stream *); -static inline uint32_t arc4_getword(struct arc4_stream *); +static __inline__ uint8_t arc4_getbyte(struct arc4_stream *); +static __inline__ uint32_t arc4_getword(struct arc4_stream *); -static inline void +static __inline__ void arc4_init(as) struct arc4_stream *as; { @@ -70,7 +70,7 @@ arc4_init(as) as->j = 0; } -static inline void +static __inline__ void arc4_addrandom(as, dat, datlen) struct arc4_stream *as; u_char *dat; @@ -141,7 +141,7 @@ arc4_stir(as) arc4_getbyte(as); } -static inline uint8_t +static __inline__ uint8_t arc4_getbyte(as) struct arc4_stream *as; { @@ -156,7 +156,7 @@ arc4_getbyte(as) return (as->s[(si + sj) & 0xff]); } -static inline uint32_t +static __inline__ uint32_t arc4_getword(as) struct arc4_stream *as; { diff --git a/libc/stdlib/erand48_r.c b/libc/stdlib/erand48_r.c index 3dd0dfdf0..42db6f74b 100644 --- a/libc/stdlib/erand48_r.c +++ b/libc/stdlib/erand48_r.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <limits.h> -extern int __drand48_iterate(unsigned short xsubi[3], +extern int __drand48_iterate(unsigned short xsubi[3], struct drand48_data *buffer) attribute_hidden; libc_hidden_proto(erand48_r) diff --git a/libc/stdlib/getenv.c b/libc/stdlib/getenv.c index 230ec0051..7b3df7e64 100644 --- a/libc/stdlib/getenv.c +++ b/libc/stdlib/getenv.c @@ -12,7 +12,7 @@ libc_hidden_proto(getenv) /* Experimentally off - libc_hidden_proto(memcmp) */ /* Experimentally off - libc_hidden_proto(strlen) */ -/* IEEE Std 1003.1-2001 says getenv need not be thread safe, so +/* IEEE Std 1003.1-2001 says getenv need not be thread safe, so * don't bother locking access to __environ */ char *getenv(const char *var) { diff --git a/libc/stdlib/grantpt.c b/libc/stdlib/grantpt.c index 2c59cd678..b60ffe7dc 100644 --- a/libc/stdlib/grantpt.c +++ b/libc/stdlib/grantpt.c @@ -58,7 +58,7 @@ grantpt (attribute_unused int fd) if (pts_name (fd, &buf, sizeof (_buf))) return -1; - + if (statfs (buf, &fsbuf) < 0) return -1; diff --git a/libc/stdlib/jrand48_r.c b/libc/stdlib/jrand48_r.c index 912f70c4f..fe77c3c38 100644 --- a/libc/stdlib/jrand48_r.c +++ b/libc/stdlib/jrand48_r.c @@ -19,7 +19,7 @@ #include <stdlib.h> -extern int __drand48_iterate(unsigned short xsubi[3], +extern int __drand48_iterate(unsigned short xsubi[3], struct drand48_data *buffer) attribute_hidden; libc_hidden_proto(jrand48_r) diff --git a/libc/stdlib/malloc-simple/calloc.c b/libc/stdlib/malloc-simple/calloc.c index 75edff86d..b40489644 100644 --- a/libc/stdlib/malloc-simple/calloc.c +++ b/libc/stdlib/malloc-simple/calloc.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-simple/free.c b/libc/stdlib/malloc-simple/free.c index 553a6bfc8..3fc7a969e 100644 --- a/libc/stdlib/malloc-simple/free.c +++ b/libc/stdlib/malloc-simple/free.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-simple/malloc.c b/libc/stdlib/malloc-simple/malloc.c index 61f33d871..1ad8ca2ff 100644 --- a/libc/stdlib/malloc-simple/malloc.c +++ b/libc/stdlib/malloc-simple/malloc.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-simple/memalign.c b/libc/stdlib/malloc-simple/memalign.c index 24b7ab9c5..d7ee35297 100644 --- a/libc/stdlib/malloc-simple/memalign.c +++ b/libc/stdlib/malloc-simple/memalign.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-simple/realloc.c b/libc/stdlib/malloc-simple/realloc.c index de9675d59..b116ab112 100644 --- a/libc/stdlib/malloc-simple/realloc.c +++ b/libc/stdlib/malloc-simple/realloc.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index 85f9e2125..e87d34758 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -629,7 +629,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ as a malloc_chunk. This avoids special-casing for headers. But to conserve space and improve locality, we allocate only the fd/bk pointers of bins, and then use repositioning tricks - to treat these as the fields of a malloc_chunk*. + to treat these as the fields of a malloc_chunk*. */ typedef struct malloc_chunk* mbinptr; diff --git a/libc/stdlib/malloc/heap.h b/libc/stdlib/malloc/heap.h index 38ec41cbf..6505cd223 100644 --- a/libc/stdlib/malloc/heap.h +++ b/libc/stdlib/malloc/heap.h @@ -141,7 +141,7 @@ extern void __heap_check (struct heap *heap, const char *str); /* Delete the free-area FA from HEAP. */ -static inline void +static __inline__ void __heap_delete (struct heap *heap, struct heap_free_area *fa) { if (fa->next) @@ -156,7 +156,7 @@ __heap_delete (struct heap *heap, struct heap_free_area *fa) /* Link the free-area FA between the existing free-area's PREV and NEXT in HEAP. PREV and NEXT may be 0; if PREV is 0, FA is installed as the first free-area. */ -static inline void +static __inline__ void __heap_link_free_area (struct heap *heap, struct heap_free_area *fa, struct heap_free_area *prev, struct heap_free_area *next) @@ -175,7 +175,7 @@ __heap_link_free_area (struct heap *heap, struct heap_free_area *fa, /* Update the mutual links between the free-areas PREV and FA in HEAP. PREV may be 0, in which case FA is installed as the first free-area (but FA may not be 0). */ -static inline void +static __inline__ void __heap_link_free_area_after (struct heap *heap, struct heap_free_area *fa, struct heap_free_area *prev) @@ -191,7 +191,7 @@ __heap_link_free_area_after (struct heap *heap, free-area's PREV and NEXT in HEAP, and return a pointer to its header. PREV and NEXT may be 0; if PREV is 0, MEM is installed as the first free-area. */ -static inline struct heap_free_area * +static __inline__ struct heap_free_area * __heap_add_free_area (struct heap *heap, void *mem, size_t size, struct heap_free_area *prev, struct heap_free_area *next) @@ -209,7 +209,7 @@ __heap_add_free_area (struct heap *heap, void *mem, size_t size, /* Allocate SIZE bytes from the front of the free-area FA in HEAP, and return the amount actually allocated (which may be more than SIZE). */ -static inline size_t +static __inline__ size_t __heap_free_area_alloc (struct heap *heap, struct heap_free_area *fa, size_t size) { diff --git a/libc/stdlib/malloc/heap_alloc.c b/libc/stdlib/malloc/heap_alloc.c index f8d596506..9f5fd6c1a 100644 --- a/libc/stdlib/malloc/heap_alloc.c +++ b/libc/stdlib/malloc/heap_alloc.c @@ -27,7 +27,7 @@ __heap_alloc (struct heap *heap, size_t *size) void *mem = 0; _size = HEAP_ADJUST_SIZE (_size); - + if (_size < sizeof (struct heap_free_area)) /* Because we sometimes must use a freed block to hold a free-area node, we must make sure that every allocated block can hold one. */ diff --git a/libc/stdlib/malloc/heap_alloc_at.c b/libc/stdlib/malloc/heap_alloc_at.c index 296c6e552..a65140fea 100644 --- a/libc/stdlib/malloc/heap_alloc_at.c +++ b/libc/stdlib/malloc/heap_alloc_at.c @@ -32,7 +32,7 @@ __heap_alloc_at (struct heap *heap, void *mem, size_t size) for (fa = heap->free_areas; fa; fa = fa->next) { void *fa_mem = HEAP_FREE_AREA_START (fa); - if (fa_mem <= mem) + if (fa_mem <= mem) { if (fa_mem == mem && fa->size >= size) /* FA has the right addr, and is big enough! */ diff --git a/libc/stdlib/malloc/heap_free.c b/libc/stdlib/malloc/heap_free.c index 8bc740dd8..1c4634c55 100644 --- a/libc/stdlib/malloc/heap_free.c +++ b/libc/stdlib/malloc/heap_free.c @@ -72,7 +72,7 @@ __heap_free (struct heap *heap, void *mem, size_t size) /* The new descriptor is at the end of the extended block, SIZE bytes later than the old descriptor. */ fa = (struct heap_free_area *)((char *)fa + size); - /* Update links with the neighbors in the list. */ + /* Update links with the neighbors in the list. */ __heap_link_free_area (heap, fa, prev_fa, next_fa); } } diff --git a/libc/stdlib/nrand48_r.c b/libc/stdlib/nrand48_r.c index f45cb1132..63b0ac8ef 100644 --- a/libc/stdlib/nrand48_r.c +++ b/libc/stdlib/nrand48_r.c @@ -19,7 +19,7 @@ #include <stdlib.h> -extern int __drand48_iterate(unsigned short xsubi[3], +extern int __drand48_iterate(unsigned short xsubi[3], struct drand48_data *buffer) attribute_hidden; libc_hidden_proto(nrand48_r) diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c index 1fd516234..bd9c3cab2 100644 --- a/libc/stdlib/ptsname.c +++ b/libc/stdlib/ptsname.c @@ -55,7 +55,7 @@ libc_hidden_proto(stat) terminal devices. As of Linux 2.1.115 these are no longer supported. They have been replaced by major numbers 2 (masters) and 3 (slaves). */ - + /* The are declared in getpt.c. */ extern const char __libc_ptyname1[] attribute_hidden; extern const char __libc_ptyname2[] attribute_hidden; diff --git a/libc/stdlib/random_r.c b/libc/stdlib/random_r.c index e95653545..ca80a7808 100644 --- a/libc/stdlib/random_r.c +++ b/libc/stdlib/random_r.c @@ -121,7 +121,7 @@ static const struct random_poly_info random_poly_info = - + /* If we are using the trivial TYPE_0 R.N.G., just do the old linear congruential bit. Otherwise, we do our fancy trinomial stuff, which is the same in all the other cases due to all the global variables that have been diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index a864dd574..0ebe3b9f9 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -35,7 +35,7 @@ #define _ISOC99_SOURCE /* for ULLONG primarily... */ #include <limits.h> #include <stdint.h> -/* Work around gcc's refusal to create aliases. +/* Work around gcc's refusal to create aliases. * TODO: Add in a define to disable the aliases? */ #if UINT_MAX == ULONG_MAX @@ -267,7 +267,7 @@ strong_alias(llabs,imaxabs) /**********************************************************************/ #ifdef L_atoi -#if INT_MAX < LONG_MAX +#if INT_MAX < LONG_MAX libc_hidden_proto(strtol) diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c index 5b8feacf2..2c55e4ece 100644 --- a/libc/stdlib/system.c +++ b/libc/stdlib/system.c @@ -27,7 +27,7 @@ libc_hidden_proto(vfork) /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */ #include <sys/syscall.h> #ifndef __NR_vfork -# define vfork fork +# define vfork fork libc_hidden_proto(fork) #endif diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c index 001115261..ff41192e5 100644 --- a/libc/string/__xpg_strerror_r.c +++ b/libc/string/__xpg_strerror_r.c @@ -149,7 +149,7 @@ static const unsigned char estridx[] = { EISNAM, EREMOTEIO, #if EDQUOT > 200 /* mips has an outrageous value for this... */ - 0, + 0, #else EDQUOT, #endif diff --git a/libc/string/cris/memcopy.h b/libc/string/cris/memcopy.h index 0eae998da..449c75641 100644 --- a/libc/string/cris/memcopy.h +++ b/libc/string/cris/memcopy.h @@ -23,7 +23,7 @@ /* We override the word-copying macros, partly because misalignment in one pointer isn't cause for a special function, partly because we want to - get rid of all the static functions in generic/memcopy.c; these macros + get rid of all the static functions in generic/memcopy.c; these macros are only used in memmove.c since we have arch-specific mempcpy, memcpy and memset. */ diff --git a/libc/string/cris/memcpy.c b/libc/string/cris/memcpy.c index 0cce37a30..cc14188b8 100644 --- a/libc/string/cris/memcpy.c +++ b/libc/string/cris/memcpy.c @@ -88,8 +88,8 @@ void *memcpy(void *pdst, register char *dst __asm__ ("r13") = pdst; register char *src __asm__ ("r11") = (char *) psrc; register int n __asm__ ("r12") = pn; - - + + /* When src is aligned but not dst, this makes a few extra needless cycles. I believe it would take as many to check that the re-alignment was unnecessary. */ @@ -162,12 +162,12 @@ void *memcpy(void *pdst, ;; Restore registers from stack \n\ movem [sp+],r10" - /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n) + /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n) /* Inputs */ : "0" (dst), "1" (src), "2" (n)); } /* Either we directly starts copying, using dword copying - in a loop, or we copy as much as possible with 'movem' + in a loop, or we copy as much as possible with 'movem' and then the last block (<44 bytes) is copied here. This will work since 'movem' will have updated src,dst,n. */ diff --git a/libc/string/cris/memmove.c b/libc/string/cris/memmove.c index b6620afe0..fa495eba4 100644 --- a/libc/string/cris/memmove.c +++ b/libc/string/cris/memmove.c @@ -1,4 +1,4 @@ -/* Taken from generic/memmove.c; trivially modified to work with +/* Taken from generic/memmove.c; trivially modified to work with arch-specific memcopy.h for Cris. Copy memory to memory until the specified number of bytes diff --git a/libc/string/cris/memset.c b/libc/string/cris/memset.c index 9cc959a33..b578aac5d 100644 --- a/libc/string/cris/memset.c +++ b/libc/string/cris/memset.c @@ -87,7 +87,7 @@ void *memset(void *pdst, { register char *dst __asm__ ("r13") = pdst; - + if (((unsigned long) pdst & 3) != 0 /* Oops! n=0 must be a legal call, regardless of alignment. */ && n >= 3) @@ -165,15 +165,15 @@ void *memset(void *pdst, addq 12*4,r12 ;; compensate for last loop underflowing n \n\ \n\ ;; Restore registers from stack \n\ - movem [sp+],r10" + movem [sp+],r10" /* Outputs */ : "=r" (dst), "=r" (n) /* Inputs */ : "0" (dst), "1" (n), "r" (lc)); - + } /* Either we directly starts copying, using dword copying - in a loop, or we copy as much as possible with 'movem' + in a loop, or we copy as much as possible with 'movem' and then the last block (<44 bytes) is copied here. This will work since 'movem' will have updated src,dst,n. */ diff --git a/libc/string/ffs.c b/libc/string/ffs.c index f7d94ebf0..241b7456f 100644 --- a/libc/string/ffs.c +++ b/libc/string/ffs.c @@ -48,7 +48,7 @@ int ffs(int i) for (n = 0 ; i ; ++n) { i >>= 1; } - + return n; #endif } diff --git a/libc/string/i386/strncat.c b/libc/string/i386/strncat.c index 5849db3b3..3872679d5 100644 --- a/libc/string/i386/strncat.c +++ b/libc/string/i386/strncat.c @@ -33,7 +33,7 @@ #include <string.h> /* Experimentally off - libc_hidden_proto(strncat) */ -char *strncat(char * dest, +char *strncat(char * dest, const char * src, size_t count) { int d0, d1, d2, d3; diff --git a/libc/string/ia64/softpipe.h b/libc/string/ia64/softpipe.h index cf0eb5355..d71af735e 100644 --- a/libc/string/ia64/softpipe.h +++ b/libc/string/ia64/softpipe.h @@ -18,7 +18,7 @@ /* The latency of a memory load assumed by the assembly implementation of the mem and str functions. Since we don't have any clue about - where the data might be, let's assume it's in the L2 cache. + where the data might be, let's assume it's in the L2 cache. Assuming L3 would be too pessimistic :-) Some functions define MEMLAT as 2, because they expect their data diff --git a/libc/string/memrchr.c b/libc/string/memrchr.c index b2f9001cd..48ec50a4e 100644 --- a/libc/string/memrchr.c +++ b/libc/string/memrchr.c @@ -20,7 +20,7 @@ void *memrchr(const void *s, int c, size_t n) #else #define np n #endif - + r = ((unsigned char *)s) + ((size_t) np); while (np) { diff --git a/libc/string/powerpc/memcpy.c b/libc/string/powerpc/memcpy.c index bcbb806f8..dd39e6f9d 100644 --- a/libc/string/powerpc/memcpy.c +++ b/libc/string/powerpc/memcpy.c @@ -62,7 +62,7 @@ void *memcpy(void *to, const void *from, size_t n) do { *++tmp_to = *++tmp_from; } while (--n); - + return to; align: rem = 4 - rem; diff --git a/libc/string/powerpc/memmove.c b/libc/string/powerpc/memmove.c index 7a4a7e5ff..d307e74a6 100644 --- a/libc/string/powerpc/memmove.c +++ b/libc/string/powerpc/memmove.c @@ -62,7 +62,7 @@ void *memmove(void *to, const void *from, size_t n) do { *--tmp_to = *--tmp_from; } while (--n); - + return to; align: rem = 4 - rem; diff --git a/libc/string/powerpc/memset.c b/libc/string/powerpc/memset.c index d62ec0ee0..59bec87b9 100644 --- a/libc/string/powerpc/memset.c +++ b/libc/string/powerpc/memset.c @@ -23,8 +23,8 @@ /* Experimentally off - libc_hidden_proto(memset) */ -static inline int expand_byte_word(int c){ - /* this does: +static __inline__ int expand_byte_word(int c){ + /* this does: c = c << 8 | c; c = c << 16 | c ; */ @@ -66,7 +66,7 @@ void *memset(void *to, int c, size_t n) do { *++tmp_to = c; } while (--n); - + return to; align: rem = 4 - rem; diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c index 4a95ab882..5477adf3a 100644 --- a/libc/string/strcmp.c +++ b/libc/string/strcmp.c @@ -33,7 +33,7 @@ int Wstrcmp(register const Wchar *s1, register const Wchar *s2) while (((r = ((int)(*((Wuchar *)s1))) - *((Wuchar *)s2++)) == 0) && *s1++); - + return r; #endif } diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c index ea5e494c7..d93561294 100644 --- a/libc/string/strncpy.c +++ b/libc/string/strncpy.c @@ -31,7 +31,7 @@ Wchar *Wstrncpy(Wchar * __restrict s1, register const Wchar * __restrict s2, --n; } #endif - + return s1; } #ifndef WANT_WIDE diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch index ff3e90aa7..1c616ec4a 100644 --- a/libc/sysdeps/linux/Makefile.commonarch +++ b/libc/sysdeps/linux/Makefile.commonarch @@ -20,6 +20,9 @@ libc-y += $(ARCH_OBJS) libc-nomulti-y += $(ARCH_SOBJ) objclean-y += arch_objclean +CFLAGS-crti.S+=$(PICFLAG) +CFLAGS-crtn.S+=$(PICFLAG) + arch_objclean: $(RM) $(ARCH_OUT)/*.{o,os} $(CTOR_TARGETS) $(CRTS) diff --git a/libc/sysdeps/linux/alpha/bits/atomic.h b/libc/sysdeps/linux/alpha/bits/atomic.h index bbfd201b5..5ef091dc0 100644 --- a/libc/sysdeps/linux/alpha/bits/atomic.h +++ b/libc/sysdeps/linux/alpha/bits/atomic.h @@ -348,7 +348,7 @@ typedef uintmax_t uatomic_max_t; : "memory"); \ __ret; }) -/* ??? Barrier semantics for atomic_exchange_and_add appear to be +/* ??? Barrier semantics for atomic_exchange_and_add appear to be undefined. Use full barrier for now, as that's safe. */ #define atomic_exchange_and_add(mem, value) \ __atomic_val_bysize (__arch_exchange_and_add, int, mem, value, __MB, __MB) diff --git a/libc/sysdeps/linux/alpha/bits/kernel_stat.h b/libc/sysdeps/linux/alpha/bits/kernel_stat.h index 9fcbc031a..649257b7e 100644 --- a/libc/sysdeps/linux/alpha/bits/kernel_stat.h +++ b/libc/sysdeps/linux/alpha/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { unsigned int st_dev; diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h index 01d2a8be0..d5574c9b4 100644 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/alpha/bits/syscalls.h b/libc/sysdeps/linux/alpha/bits/syscalls.h index 02b73c5a8..b5e0c1602 100644 --- a/libc/sysdeps/linux/alpha/bits/syscalls.h +++ b/libc/sysdeps/linux/alpha/bits/syscalls.h @@ -126,7 +126,7 @@ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ _sc_ret = _sc_0, _sc_err = _sc_19; \ } \ _syscall_return(type); \ -} +} #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ type5,arg5) \ diff --git a/libc/sysdeps/linux/alpha/sigprocmask.c b/libc/sysdeps/linux/alpha/sigprocmask.c index 1da6f7baf..e9ebe091f 100644 --- a/libc/sysdeps/linux/alpha/sigprocmask.c +++ b/libc/sysdeps/linux/alpha/sigprocmask.c @@ -25,7 +25,7 @@ /* When there is kernel support for more than 64 signals, we'll have to switch to a new system call convention here. */ -static inline _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval); +static __inline__ _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval); libc_hidden_proto(sigprocmask) int diff --git a/libc/sysdeps/linux/arm/bits/endian.h b/libc/sysdeps/linux/arm/bits/endian.h index 27946cdee..6e9967db5 100644 --- a/libc/sysdeps/linux/arm/bits/endian.h +++ b/libc/sysdeps/linux/arm/bits/endian.h @@ -13,7 +13,7 @@ CPU endianness. VFP floating point units use the same endianness as the rest of the system. */ #if defined __VFP_FP__ || defined __MAVERICK__ -# define __FLOAT_WORD_ORDER __BYTE_ORDER +# define __FLOAT_WORD_ORDER __BYTE_ORDER #else # define __FLOAT_WORD_ORDER __BIG_ENDIAN #endif diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h index b686c479a..ebac6f5ff 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_stat.h +++ b/libc/sysdeps/linux/arm/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #define STAT_HAVE_NSEC 1 diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h index d7a1b1530..766a30621 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h index 85c6cbd55..2d2e0f0a4 100644 --- a/libc/sysdeps/linux/arm/bits/syscalls.h +++ b/libc/sysdeps/linux/arm/bits/syscalls.h @@ -5,7 +5,7 @@ #endif /* - Some of the sneaky macros in the code were taken from + Some of the sneaky macros in the code were taken from glibc-2.3.2/sysdeps/unix/sysv/linux/arm/sysdep.h */ @@ -65,7 +65,7 @@ return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \ -} +} #undef _syscall5 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ @@ -145,13 +145,13 @@ return (type) (INLINE_SYSCALL(name, 7, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { \ int _sys_buf[2]; \ register int _a1 __asm__ ("a1"); \ - register int *_v3 asm ("v3") = _sys_buf; \ + register int *_v3 __asm__ ("v3") = _sys_buf; \ *_v3 = (int) (SYS_ify(name)); \ LOAD_ARGS_##nr (args) \ - asm volatile ("str r7, [v3, #4]\n" \ - "\tldr r7, [v3]\n" \ - "\tswi 0 @ syscall " #name "\n" \ - "\tldr r7, [v3, #4]" \ + __asm__ __volatile__ ("str r7, [v3, #4]\n" \ + "\tldr r7, [v3]\n" \ + "\tswi 0 @ syscall " #name "\n" \ + "\tldr r7, [v3, #4]" \ : "=r" (_a1) \ : "r" (_v3) ASM_ARGS_##nr \ : "memory"); \ diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c index 0229f871d..708e8ec49 100644 --- a/libc/sysdeps/linux/arm/ioperm.c +++ b/libc/sysdeps/linux/arm/ioperm.c @@ -117,7 +117,7 @@ init_iosys (void) { char systype[256]; int i, n; - + #if LINUX_VERSION_CODE < 132119 static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE }; static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT }; diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c index 552ba6c67..654a4158f 100644 --- a/libc/sysdeps/linux/arm/iopl.c +++ b/libc/sysdeps/linux/arm/iopl.c @@ -25,7 +25,7 @@ libc_hidden_proto(ioperm) #define MAX_PORT 0x10000 -int iopl(int level) +int iopl(int level) { if (level > 3) { __set_errno(EINVAL); diff --git a/libc/sysdeps/linux/arm/mmap.c b/libc/sysdeps/linux/arm/mmap.c index 440cb17b1..47a29f4ae 100644 --- a/libc/sysdeps/linux/arm/mmap.c +++ b/libc/sysdeps/linux/arm/mmap.c @@ -16,7 +16,7 @@ libc_hidden_proto (mmap) #if defined (__UCLIBC_MMAP_HAS_6_ARGS__) && defined (__NR_mmap) #define __NR__mmap __NR_mmap -static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, +static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) @@ -32,7 +32,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, # define MMAP2_PAGE_SHIFT 12 #endif -static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, +static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) @@ -53,7 +53,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, } #elif defined (__NR_mmap) # define __NR__mmap __NR_mmap -static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer); +static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) { diff --git a/libc/sysdeps/linux/avr32/bits/byteswap.h b/libc/sysdeps/linux/avr32/bits/byteswap.h index 1c030b976..f0bea4cea 100644 --- a/libc/sysdeps/linux/avr32/bits/byteswap.h +++ b/libc/sysdeps/linux/avr32/bits/byteswap.h @@ -18,7 +18,7 @@ # define __bswap_16(x) (__extension__ __builtin_bswap_16(x)) #else /* This is better than nothing. */ -static __inline unsigned short int +static __inline__ unsigned short int __bswap_16 (unsigned short int __bsx) { return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8)); @@ -29,7 +29,7 @@ __bswap_16 (unsigned short int __bsx) #if defined __GNUC__ # define __bswap_32(x) (__extension__ __builtin_bswap_32(x)) #else -static __inline unsigned int +static __inline__ unsigned int __bswap_32 (unsigned int __bsx) { return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) | diff --git a/libc/sysdeps/linux/avr32/bits/syscalls.h b/libc/sysdeps/linux/avr32/bits/syscalls.h index 22ac05960..ff5d1a7be 100644 --- a/libc/sysdeps/linux/avr32/bits/syscalls.h +++ b/libc/sysdeps/linux/avr32/bits/syscalls.h @@ -95,10 +95,10 @@ #undef INTERNAL_SYSCALL #define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ \ - register int _a1 asm ("r12"); \ - register int _scno asm("r8") = SYS_ify(name); \ + register int _a1 __asm__("r12"); \ + register int _scno __asm__("r8") = SYS_ify(name); \ LOAD_ARGS_##nr (args); \ - asm volatile ("scall /* syscall " #name " */" \ + __asm__ __volatile__("scall /* syscall " #name " */" \ : "=r" (_a1) \ : "r"(_scno) ASM_ARGS_##nr \ : "cc", "memory"); \ @@ -119,23 +119,23 @@ LOAD_ARGS_0() #define ASM_ARGS_1 ASM_ARGS_0, "r"(_a1) #define LOAD_ARGS_2(a1, a2) \ - register int _a2 asm("r11") = (int)(a2); \ + register int _a2 __asm__("r11") = (int)(a2); \ LOAD_ARGS_1(a1) #define ASM_ARGS_2 ASM_ARGS_1, "r"(_a2) #define LOAD_ARGS_3(a1, a2, a3) \ - register int _a3 asm("r10") = (int)(a3); \ + register int _a3 __asm__("r10") = (int)(a3); \ LOAD_ARGS_2(a1, a2) #define ASM_ARGS_3 ASM_ARGS_2, "r"(_a3) #define LOAD_ARGS_4(a1, a2, a3, a4) \ - register int _a4 asm("r9") = (int)(a4); \ + register int _a4 __asm__("r9") = (int)(a4); \ LOAD_ARGS_3(a1, a2, a3) #define ASM_ARGS_4 ASM_ARGS_3, "r"(_a4) #define LOAD_ARGS_5(a1, a2, a3, a4, a5) \ - register int _a5 asm("r5") = (int)(a5); \ + register int _a5 __asm__("r5") = (int)(a5); \ LOAD_ARGS_4(a1, a2, a3, a4) #define ASM_ARGS_5 ASM_ARGS_4, "r"(_a5) #define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \ - register int _a6 asm("r3") = (int)(a6); \ + register int _a6 __asm__("r3") = (int)(a6); \ LOAD_ARGS_5(a1, a2, a3, a4, a5) #define ASM_ARGS_6 ASM_ARGS_5, "r"(_a6) diff --git a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h index 0dbb54b4c..905648054 100644 --- a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h +++ b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h @@ -103,7 +103,7 @@ __reloc_pointer (void *p, || (offset == map->segs[c].p_memsz && c + 1 == map->nsegs)) return (char*)map->segs[c].addr + offset; } - + /* We might want to crash instead. */ return (void*)-1; } diff --git a/libc/sysdeps/linux/bfin/bits/kernel_stat.h b/libc/sysdeps/linux/bfin/bits/kernel_stat.h index 2a59d8eea..8c7ba0533 100644 --- a/libc/sysdeps/linux/bfin/bits/kernel_stat.h +++ b/libc/sysdeps/linux/bfin/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/bfin/crtreloc.c b/libc/sysdeps/linux/bfin/crtreloc.c index 4c09f904f..5e038256a 100644 --- a/libc/sysdeps/linux/bfin/crtreloc.c +++ b/libc/sysdeps/linux/bfin/crtreloc.c @@ -93,7 +93,7 @@ __self_reloc (const struct elf32_fdpic_loadmap *map, if (p >= e) return (void*)-1; - + return __reloc_pointer (*p, map); } diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index 4c5495c24..84c2ea2bf 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -16,7 +16,7 @@ extern __typeof(fcntl64) __libc_fcntl64; libc_hidden_proto(__libc_fcntl64) #define __NR___syscall_fcntl64 __NR_fcntl64 -static inline _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); +static __inline__ _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); int __libc_fcntl64(int fd, int cmd, ...) { long arg; diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c index 4614ef9e0..7592e9b45 100644 --- a/libc/sysdeps/linux/common/_exit.c +++ b/libc/sysdeps/linux/common/_exit.c @@ -22,7 +22,7 @@ libc_hidden_proto(_exit) #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_exit (args) #define __NR___syscall_exit __NR_exit -static inline _syscall1(void, __syscall_exit, int, status); +static __inline__ _syscall1(void, __syscall_exit, int, status); #endif void attribute_noreturn _exit(int status) diff --git a/libc/sysdeps/linux/common/bits/kernel_sigaction.h b/libc/sysdeps/linux/common/bits/kernel_sigaction.h index 7af027735..ede905bb4 100644 --- a/libc/sysdeps/linux/common/bits/kernel_sigaction.h +++ b/libc/sysdeps/linux/common/bits/kernel_sigaction.h @@ -1,7 +1,7 @@ #ifndef _BITS_SIGACTION_STRUCT_H #define _BITS_SIGACTION_STRUCT_H -/* This file provides whatever this particular arch's kernel thinks +/* This file provides whatever this particular arch's kernel thinks * the sigaction struct should look like... */ #undef NO_OLD_SIGACTION diff --git a/libc/sysdeps/linux/common/bits/kernel_types.h b/libc/sysdeps/linux/common/bits/kernel_types.h index 4567827b3..1c23ebfe7 100644 --- a/libc/sysdeps/linux/common/bits/kernel_types.h +++ b/libc/sysdeps/linux/common/bits/kernel_types.h @@ -6,7 +6,7 @@ * arches have broken headers that introduce tons of gratuitous * conflicts with uClibc's namespace. See bits/kernel_types.h * for i386, arm, etc for examples... */ -#warning You really should include a proper bits/kernel_types.h for your architecture +#warning You really should include a proper bits/kernel_types.h for your architecture #ifndef __GLIBC__ #define __GLIBC__ 2 diff --git a/libc/sysdeps/linux/common/bits/stdio_lim.h b/libc/sysdeps/linux/common/bits/stdio_lim.h index ea6d693f5..c35ee601b 100644 --- a/libc/sysdeps/linux/common/bits/stdio_lim.h +++ b/libc/sysdeps/linux/common/bits/stdio_lim.h @@ -23,7 +23,7 @@ #ifdef _STDIO_H # define L_tmpnam 20 # define TMP_MAX 238328 -# define FILENAME_MAX 4095 +# define FILENAME_MAX 4095 # ifdef __USE_POSIX # define L_ctermid 9 @@ -37,5 +37,5 @@ #endif #if defined __need_IOV_MAX && !defined IOV_MAX -# define IOV_MAX 1024 +# define IOV_MAX 1024 #endif diff --git a/libc/sysdeps/linux/common/bits/syscalls.h b/libc/sysdeps/linux/common/bits/syscalls.h index 4895c4fa0..ceba568e5 100644 --- a/libc/sysdeps/linux/common/bits/syscalls.h +++ b/libc/sysdeps/linux/common/bits/syscalls.h @@ -2,7 +2,7 @@ * this file must be able to cope with PIC and non-PIC code. For some arches * there is no difference. For x86 (which has far too few registers) there is * a difference. Regardless, including asm/unistd.h is hereby officially - * forbidden. Don't do it. It is bad for you. - */ + * forbidden. Don't do it. It is bad for you. + */ #error You have not provided architecture specific _syscall[0-6] macros diff --git a/libc/sysdeps/linux/common/bits/uClibc_ctype.h b/libc/sysdeps/linux/common/bits/uClibc_ctype.h index dd723c77c..0b02c5dbf 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_ctype.h +++ b/libc/sysdeps/linux/common/bits/uClibc_ctype.h @@ -78,7 +78,7 @@ enum { #define __CTYPE_ispunct(D) (D == __CTYPE_punct) #define __CTYPE_isspace(D) (((unsigned int)(D - __CTYPE_print_space_nonblank)) <= 5) #define __CTYPE_isupper(D) (((unsigned int)(D - __CTYPE_alpha_upper_lower)) <= 1) -/* #define __CTYPE_isxdigit(D) -- isxdigit is untestable this way. +/* #define __CTYPE_isxdigit(D) -- isxdigit is untestable this way. * But that's ok as isxdigit() (and isdigit() too) are locale-invariant. */ #else /* __UCLIBC_GEN_LOCALE *****************************************/ diff --git a/libc/sysdeps/linux/common/bits/uClibc_locale.h b/libc/sysdeps/linux/common/bits/uClibc_locale.h index 1de735a25..a6b381c95 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_locale.h +++ b/libc/sysdeps/linux/common/bits/uClibc_locale.h @@ -39,7 +39,7 @@ #else /* __UCLIBC_HAS_LOCALE__ */ -#define __LOCALE_C_ONLY +#define __LOCALE_C_ONLY #define __XL_NPP(N) N #define __LOCALE_PARAM diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c index d67fa0c9c..95a825eb7 100644 --- a/libc/sysdeps/linux/common/chdir.c +++ b/libc/sysdeps/linux/common/chdir.c @@ -15,7 +15,7 @@ libc_hidden_proto(chdir) #define __NR___syscall_chdir __NR_chdir -static inline _syscall1(int, __syscall_chdir, const char *, path); +static __inline__ _syscall1(int, __syscall_chdir, const char *, path); int chdir(const char *path) { return __syscall_chdir(path); diff --git a/libc/sysdeps/linux/common/chmod.c b/libc/sysdeps/linux/common/chmod.c index 0b9e89426..34a30a4b0 100644 --- a/libc/sysdeps/linux/common/chmod.c +++ b/libc/sysdeps/linux/common/chmod.c @@ -13,7 +13,7 @@ libc_hidden_proto(chmod) #define __NR___syscall_chmod __NR_chmod -static inline _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode); +static __inline__ _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode); int chmod(const char *path, mode_t mode) { diff --git a/libc/sysdeps/linux/common/chown.c b/libc/sysdeps/linux/common/chown.c index 169ea3aea..27b89a3f4 100644 --- a/libc/sysdeps/linux/common/chown.c +++ b/libc/sysdeps/linux/common/chown.c @@ -24,7 +24,7 @@ _syscall3(int, chown, const char *, path, uid_t, owner, gid_t, group); #else # define __NR___syscall_chown __NR_chown -static inline _syscall3(int, __syscall_chown, const char *, path, +static __inline__ _syscall3(int, __syscall_chown, const char *, path, __kernel_uid_t, owner, __kernel_gid_t, group); int chown(const char *path, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/chroot.c b/libc/sysdeps/linux/common/chroot.c index 5ea76ab0d..12d09bbbe 100644 --- a/libc/sysdeps/linux/common/chroot.c +++ b/libc/sysdeps/linux/common/chroot.c @@ -14,7 +14,7 @@ #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K) #define __NR___syscall_chroot __NR_chroot -static inline _syscall1(int, __syscall_chroot, const char *, path); +static __inline__ _syscall1(int, __syscall_chroot, const char *, path); int chroot(const char *path) { diff --git a/libc/sysdeps/linux/common/create_module.c b/libc/sysdeps/linux/common/create_module.c index f15bb18c5..95ff900e0 100644 --- a/libc/sysdeps/linux/common/create_module.c +++ b/libc/sysdeps/linux/common/create_module.c @@ -19,7 +19,7 @@ unsigned long create_module(const char *name, size_t size); #if defined(__UCLIBC_BROKEN_CREATE_MODULE__) # define __NR___create_module __NR_create_module -static inline _syscall2(long, __create_module, const char *, name, size_t, size); +static __inline__ _syscall2(long, __create_module, const char *, name, size_t, size); /* By checking the value of errno, we know if we have been fooled * by the syscall2 macro making a very high address look like a * negative, so we we fix it up here. */ @@ -38,7 +38,7 @@ unsigned long create_module(const char *name, size_t size) # define __NR___create_module __NR_create_module /* Alpha doesn't have the same problem, exactly, but a bug in older kernels fails to clear the error flag. Clear it here explicitly. */ -static inline _syscall4(unsigned long, __create_module, const char *, name, +static __inline__ _syscall4(unsigned long, __create_module, const char *, name, size_t, size, size_t, dummy, size_t, err); unsigned long create_module(const char *name, size_t size) { diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h index cd791306e..5155322e0 100644 --- a/libc/sysdeps/linux/common/dl-osinfo.h +++ b/libc/sysdeps/linux/common/dl-osinfo.h @@ -54,7 +54,7 @@ static __always_inline uintptr_t _dl_setup_stack_chk_guard(void) /* Start with the "terminator canary". */ ret = 0xFF0A0D00UL; - /* Everything failed? Or we are using a weakened model of the + /* Everything failed? Or we are using a weakened model of the * terminator canary */ { struct timeval tv; diff --git a/libc/sysdeps/linux/common/fchmod.c b/libc/sysdeps/linux/common/fchmod.c index 72ec37a89..cb0058133 100644 --- a/libc/sysdeps/linux/common/fchmod.c +++ b/libc/sysdeps/linux/common/fchmod.c @@ -11,7 +11,7 @@ #include <sys/stat.h> #define __NR___syscall_fchmod __NR_fchmod -static inline _syscall2(int, __syscall_fchmod, +static __inline__ _syscall2(int, __syscall_fchmod, int, fildes, __kernel_mode_t, mode); int fchmod(int fildes, mode_t mode) diff --git a/libc/sysdeps/linux/common/fchown.c b/libc/sysdeps/linux/common/fchown.c index e8d6eee48..31111ca54 100644 --- a/libc/sysdeps/linux/common/fchown.c +++ b/libc/sysdeps/linux/common/fchown.c @@ -22,7 +22,7 @@ _syscall3(int, fchown, int, fd, uid_t, owner, gid_t, group); #else # define __NR___syscall_fchown __NR_fchown -static inline _syscall3(int, __syscall_fchown, int, fd, +static __inline__ _syscall3(int, __syscall_fchown, int, fd, __kernel_uid_t, owner, __kernel_gid_t, group); int fchown(int fd, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/flock.c b/libc/sysdeps/linux/common/flock.c index 8a4aa895d..9b275d031 100644 --- a/libc/sysdeps/linux/common/flock.c +++ b/libc/sysdeps/linux/common/flock.c @@ -11,7 +11,7 @@ #include <sys/file.h> #define __NR___syscall_flock __NR_flock -static inline _syscall2(int, __syscall_flock, int, fd, int, operation); +static __inline__ _syscall2(int, __syscall_flock, int, fd, int, operation); int flock(int fd, int operation) { diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c index 437c2d16b..fee750aa4 100644 --- a/libc/sysdeps/linux/common/fstat.c +++ b/libc/sysdeps/linux/common/fstat.c @@ -21,7 +21,7 @@ libc_hidden_proto(fstat) #define __NR___syscall_fstat __NR_fstat -static inline _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf); +static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf); int fstat(int fd, struct stat *buf) { diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 215868d89..67c519a8b 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -17,7 +17,7 @@ libc_hidden_proto(fstat64) #define __NR___syscall_fstat64 __NR_fstat64 -static inline _syscall2(int, __syscall_fstat64, +static __inline__ _syscall2(int, __syscall_fstat64, int, filedes, struct kernel_stat64 *, buf); int fstat64(int fd, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/fstatfs.c b/libc/sysdeps/linux/common/fstatfs.c index 830de8103..8a471d36f 100644 --- a/libc/sysdeps/linux/common/fstatfs.c +++ b/libc/sysdeps/linux/common/fstatfs.c @@ -10,7 +10,6 @@ #include <sys/syscall.h> #include <sys/vfs.h> -#if !defined __UCLIBC_LINUX_SPECIFIC__ #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) __THROW __nonnull ((2)); @@ -22,7 +21,7 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf), # define fstatfs fstatfs64 # endif #endif -#endif + extern __typeof(fstatfs) __libc_fstatfs; libc_hidden_proto(__libc_fstatfs) #define __NR___libc_fstatfs __NR_fstatfs diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c index cea9bc1bc..04cdc0a99 100644 --- a/libc/sysdeps/linux/common/ftruncate64.c +++ b/libc/sysdeps/linux/common/ftruncate64.c @@ -5,7 +5,7 @@ * * ftruncate64 syscall. Copes with 64 bit and 32 bit machines * and on 32 bit machines this sends things into the kernel as - * two 32-bit arguments (high and low 32 bits of length) that + * two 32-bit arguments (high and low 32 bits of length) that * are ordered based on endianess. It turns out endian.h has * just the macro we need to order things, __LONG_LONG_PAIR. */ @@ -36,10 +36,10 @@ _syscall2(int, ftruncate64, int, fd, __off64_t, length); # define INLINE_SYSCALL(name, nr, args...) __syscall_ftruncate64 (args) # define __NR___syscall_ftruncate64 __NR_ftruncate64 # if defined(__UCLIBC_TRUNCATE64_HAS_4_ARGS__) -static inline _syscall4(int, __syscall_ftruncate64, int, fd, uint32_t, pad, +static __inline__ _syscall4(int, __syscall_ftruncate64, int, fd, uint32_t, pad, unsigned long, high_length, unsigned long, low_length); # else -static inline _syscall3(int, __syscall_ftruncate64, int, fd, +static __inline__ _syscall3(int, __syscall_ftruncate64, int, fd, unsigned long, high_length, unsigned long, low_length); # endif # endif diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c index 2328df29e..e695b969c 100644 --- a/libc/sysdeps/linux/common/getdents64.c +++ b/libc/sysdeps/linux/common/getdents64.c @@ -27,7 +27,7 @@ libc_hidden_proto(lseek64) # define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) # endif -struct kernel_dirent64 +struct kernel_dirent64 { uint64_t d_ino; int64_t d_off; @@ -38,7 +38,7 @@ struct kernel_dirent64 # define __NR___syscall_getdents64 __NR_getdents64 -static inline _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); +static __inline__ _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); ssize_t __getdents64 (int fd, char *buf, size_t nbytes) attribute_hidden; ssize_t __getdents64 (int fd, char *buf, size_t nbytes) @@ -51,8 +51,8 @@ ssize_t __getdents64 (int fd, char *buf, size_t nbytes) const size_t size_diff = (offsetof (struct dirent64, d_name) - offsetof (struct kernel_dirent64, d_name)); - red_nbytes = MIN (nbytes - ((nbytes / - (offsetof (struct dirent64, d_name) + 14)) * size_diff), + red_nbytes = MIN (nbytes - ((nbytes / + (offsetof (struct dirent64, d_name) + 14)) * size_diff), nbytes - size_diff); dp = (struct dirent64 *) buf; diff --git a/libc/sysdeps/linux/common/getegid.c b/libc/sysdeps/linux/common/getegid.c index 7c34b6c09..eaa708f15 100644 --- a/libc/sysdeps/linux/common/getegid.c +++ b/libc/sysdeps/linux/common/getegid.c @@ -19,7 +19,7 @@ _syscall0(gid_t, getegid); #elif defined(__NR_getegid) # define __NR___syscall_getegid __NR_getegid -static inline _syscall0(int, __syscall_getegid); +static __inline__ _syscall0(int, __syscall_getegid); gid_t getegid(void) { return (__syscall_getegid()); diff --git a/libc/sysdeps/linux/common/geteuid.c b/libc/sysdeps/linux/common/geteuid.c index d10c350e4..60151214d 100644 --- a/libc/sysdeps/linux/common/geteuid.c +++ b/libc/sysdeps/linux/common/geteuid.c @@ -19,7 +19,7 @@ _syscall0(uid_t, geteuid); #elif defined(__NR_geteuid) # define __NR___syscall_geteuid __NR_geteuid -static inline _syscall0(int, __syscall_geteuid); +static __inline__ _syscall0(int, __syscall_geteuid); uid_t geteuid(void) { return (__syscall_geteuid()); diff --git a/libc/sysdeps/linux/common/getgroups.c b/libc/sysdeps/linux/common/getgroups.c index 10da03ddd..7e1604294 100644 --- a/libc/sysdeps/linux/common/getgroups.c +++ b/libc/sysdeps/linux/common/getgroups.c @@ -28,7 +28,7 @@ libc_hidden_proto(sysconf) #define MIN(a,b) (((a)<(b))?(a):(b)) #define __NR___syscall_getgroups __NR_getgroups -static inline _syscall2(int, __syscall_getgroups, +static __inline__ _syscall2(int, __syscall_getgroups, int, size, __kernel_gid_t *, list); int getgroups(int size, gid_t groups[]) diff --git a/libc/sysdeps/linux/common/getpgid.c b/libc/sysdeps/linux/common/getpgid.c index 49f780adf..25ff12907 100644 --- a/libc/sysdeps/linux/common/getpgid.c +++ b/libc/sysdeps/linux/common/getpgid.c @@ -13,7 +13,7 @@ #include <unistd.h> #define __NR___syscall_getpgid __NR_getpgid -static inline _syscall1(__kernel_pid_t, __syscall_getpgid, __kernel_pid_t, pid); +static __inline__ _syscall1(__kernel_pid_t, __syscall_getpgid, __kernel_pid_t, pid); pid_t getpgid(pid_t pid) { diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c index b66b1ea15..bdfc723e6 100644 --- a/libc/sysdeps/linux/common/getpriority.c +++ b/libc/sysdeps/linux/common/getpriority.c @@ -13,7 +13,7 @@ libc_hidden_proto(getpriority) #define __NR___syscall_getpriority __NR_getpriority -static inline _syscall2(int, __syscall_getpriority, +static __inline__ _syscall2(int, __syscall_getpriority, __priority_which_t, which, id_t, who); /* The return value of __syscall_getpriority is biased by this value diff --git a/libc/sysdeps/linux/common/getresgid.c b/libc/sysdeps/linux/common/getresgid.c index 9c2d13ba9..922874a3d 100644 --- a/libc/sysdeps/linux/common/getresgid.c +++ b/libc/sysdeps/linux/common/getresgid.c @@ -18,7 +18,7 @@ _syscall3(int, getresgid, gid_t *, rgid, gid_t *, egid, gid_t *, sgid) #elif defined(__NR_getresgid) # define __NR___syscall_getresgid __NR_getresgid -static inline _syscall3(int, __syscall_getresgid, __kernel_gid_t *, rgid, +static __inline__ _syscall3(int, __syscall_getresgid, __kernel_gid_t *, rgid, __kernel_gid_t *, egid, __kernel_gid_t *, sgid); int getresgid(gid_t * rgid, gid_t * egid, gid_t * sgid) diff --git a/libc/sysdeps/linux/common/getresuid.c b/libc/sysdeps/linux/common/getresuid.c index dbc8df903..5a070cc42 100644 --- a/libc/sysdeps/linux/common/getresuid.c +++ b/libc/sysdeps/linux/common/getresuid.c @@ -18,7 +18,7 @@ _syscall3(int, getresuid, uid_t *, ruid, uid_t *, euid, uid_t *, suid) #elif defined(__NR_getresuid) # define __NR___syscall_getresuid __NR_getresuid -static inline _syscall3(int, __syscall_getresuid, __kernel_uid_t *, ruid, +static __inline__ _syscall3(int, __syscall_getresuid, __kernel_uid_t *, ruid, __kernel_uid_t *, euid, __kernel_uid_t *, suid); int getresuid(uid_t * ruid, uid_t * euid, uid_t * suid) diff --git a/libc/sysdeps/linux/common/getsid.c b/libc/sysdeps/linux/common/getsid.c index 398851873..9743a976f 100644 --- a/libc/sysdeps/linux/common/getsid.c +++ b/libc/sysdeps/linux/common/getsid.c @@ -14,7 +14,7 @@ libc_hidden_proto(getsid) #define __NR___syscall_getsid __NR_getsid -static inline _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid); +static __inline__ _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid); pid_t getsid(pid_t pid) { diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c index 46eabf0c9..c7729113b 100644 --- a/libc/sysdeps/linux/common/kill.c +++ b/libc/sysdeps/linux/common/kill.c @@ -13,7 +13,7 @@ libc_hidden_proto(kill) #define __NR___syscall_kill __NR_kill -static inline _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig); +static __inline__ _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig); int kill(pid_t pid, int sig) { diff --git a/libc/sysdeps/linux/common/klogctl.c b/libc/sysdeps/linux/common/klogctl.c index 81451022e..e378e3e67 100644 --- a/libc/sysdeps/linux/common/klogctl.c +++ b/libc/sysdeps/linux/common/klogctl.c @@ -11,7 +11,7 @@ #include <unistd.h> #include <sys/klog.h> #define __NR__syslog __NR_syslog -static inline _syscall3(int, _syslog, int, type, char *, buf, int, len); +static __inline__ _syscall3(int, _syslog, int, type, char *, buf, int, len); int klogctl(int type, char *buf, int len) { return (_syslog(type, buf, len)); diff --git a/libc/sysdeps/linux/common/lchown.c b/libc/sysdeps/linux/common/lchown.c index 8095c941e..08c686fd6 100644 --- a/libc/sysdeps/linux/common/lchown.c +++ b/libc/sysdeps/linux/common/lchown.c @@ -22,7 +22,7 @@ _syscall3(int, lchown, const char *, path, uid_t, owner, gid_t, group); #else # define __NR___syscall_lchown __NR_lchown -static inline _syscall3(int, __syscall_lchown, const char *, path, +static __inline__ _syscall3(int, __syscall_lchown, const char *, path, __kernel_uid_t, owner, __kernel_gid_t, group); int lchown(const char *path, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c index ea72dc4f3..35365d8ae 100644 --- a/libc/sysdeps/linux/common/llseek.c +++ b/libc/sysdeps/linux/common/llseek.c @@ -18,14 +18,14 @@ extern __typeof(lseek64) __libc_lseek64; # ifndef INLINE_SYSCALL # define INLINE_SYSCALL(name, nr, args...) __syscall_llseek (args) # define __NR___syscall_llseek __NR__llseek -static inline _syscall5(int, __syscall_llseek, int, fd, off_t, offset_hi, +static __inline__ _syscall5(int, __syscall_llseek, int, fd, off_t, offset_hi, off_t, offset_lo, loff_t *, result, int, whence); # endif loff_t __libc_lseek64(int fd, loff_t offset, int whence) { loff_t result; - return(loff_t)(INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), + return(loff_t)(INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), (off_t) (offset & 0xffffffff), &result, whence) ?: result); } #else diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c index 379ffd30d..4707dfc7c 100644 --- a/libc/sysdeps/linux/common/lstat.c +++ b/libc/sysdeps/linux/common/lstat.c @@ -21,7 +21,7 @@ libc_hidden_proto(lstat) #define __NR___syscall_lstat __NR_lstat -static inline _syscall2(int, __syscall_lstat, +static __inline__ _syscall2(int, __syscall_lstat, const char *, file_name, struct kernel_stat *, buf); int lstat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c index 1c392636f..6777dff6a 100644 --- a/libc/sysdeps/linux/common/lstat64.c +++ b/libc/sysdeps/linux/common/lstat64.c @@ -17,7 +17,7 @@ libc_hidden_proto(lstat64) # define __NR___syscall_lstat64 __NR_lstat64 -static inline _syscall2(int, __syscall_lstat64, const char *, file_name, +static __inline__ _syscall2(int, __syscall_lstat64, const char *, file_name, struct kernel_stat64 *, buf); int lstat64(const char *file_name, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/mkdir.c b/libc/sysdeps/linux/common/mkdir.c index 1d7238456..ab3cbfee5 100644 --- a/libc/sysdeps/linux/common/mkdir.c +++ b/libc/sysdeps/linux/common/mkdir.c @@ -13,7 +13,7 @@ libc_hidden_proto(mkdir) #define __NR___syscall_mkdir __NR_mkdir -static inline _syscall2(int, __syscall_mkdir, const char *, pathname, +static __inline__ _syscall2(int, __syscall_mkdir, const char *, pathname, __kernel_mode_t, mode); int mkdir(const char *pathname, mode_t mode) diff --git a/libc/sysdeps/linux/common/mknod.c b/libc/sysdeps/linux/common/mknod.c index 02b3822f8..75aff70c8 100644 --- a/libc/sysdeps/linux/common/mknod.c +++ b/libc/sysdeps/linux/common/mknod.c @@ -14,7 +14,7 @@ libc_hidden_proto(mknod) #define __NR___syscall_mknod __NR_mknod -static inline _syscall3(int, __syscall_mknod, const char *, path, +static __inline__ _syscall3(int, __syscall_mknod, const char *, path, __kernel_mode_t, mode, __kernel_dev_t, dev); int mknod(const char *path, mode_t mode, dev_t dev) diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c index f40554ebb..7645565a2 100644 --- a/libc/sysdeps/linux/common/mmap.c +++ b/libc/sysdeps/linux/common/mmap.c @@ -24,7 +24,7 @@ _syscall6(void *, mmap, void *, start, size_t, length, #else # define __NR__mmap __NR_mmap -static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer); +static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) { @@ -48,7 +48,7 @@ libc_hidden_def(mmap) libc_hidden_proto(mmap) #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Some architectures always use 12 as page shift for mmap2() eventhough the diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c index 8c0518d1d..a1aa19fb8 100644 --- a/libc/sysdeps/linux/common/mmap64.c +++ b/libc/sysdeps/linux/common/mmap64.c @@ -41,7 +41,7 @@ __ptr_t mmap64(__ptr_t addr, size_t len, int prot, int flags, int fd, __off64_t # else # define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Some architectures always use 12 as page shift for mmap2() eventhough the diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c index 393ffef4e..8ced60915 100644 --- a/libc/sysdeps/linux/common/nice.c +++ b/libc/sysdeps/linux/common/nice.c @@ -17,7 +17,7 @@ libc_hidden_proto(getpriority) #ifdef __NR_nice # define __NR___syscall_nice __NR_nice -static inline _syscall1(int, __syscall_nice, int, incr); +static __inline__ _syscall1(int, __syscall_nice, int, incr); #else @@ -25,7 +25,7 @@ static inline _syscall1(int, __syscall_nice, int, incr); libc_hidden_proto(setpriority) -static inline int int_add_no_wrap(int a, int b) +static __inline__ int int_add_no_wrap(int a, int b) { int s = a + b; @@ -38,7 +38,7 @@ static inline int int_add_no_wrap(int a, int b) return s; } -static inline int __syscall_nice(int incr) +static __inline__ int __syscall_nice(int incr) { int old_priority; # if 1 diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c index b4bef3c63..7c0566b46 100644 --- a/libc/sysdeps/linux/common/open.c +++ b/libc/sysdeps/linux/common/open.c @@ -18,7 +18,7 @@ extern __typeof(open) __libc_open; extern __typeof(creat) __libc_creat; #define __NR___syscall_open __NR_open -static inline _syscall3(int, __syscall_open, const char *, file, +static __inline__ _syscall3(int, __syscall_open, const char *, file, int, flags, __kernel_mode_t, mode); libc_hidden_proto(__libc_open) diff --git a/libc/sysdeps/linux/common/pause.c b/libc/sysdeps/linux/common/pause.c index 22a039b4f..31d3563fb 100644 --- a/libc/sysdeps/linux/common/pause.c +++ b/libc/sysdeps/linux/common/pause.c @@ -10,19 +10,23 @@ #define __UCLIBC_HIDE_DEPRECATED__ #include <sys/syscall.h> #include <unistd.h> +#include <sysdep-cancel.h> -extern __typeof(pause) __libc_pause; -#ifdef __NR_pause -#define __NR___libc_pause __NR_pause -_syscall0(int, __libc_pause); -#else -#include <signal.h> -libc_hidden_proto(__sigpause) -libc_hidden_proto(sigblock) - -int __libc_pause(void) +/* Suspend the process until a signal arrives. + This always returns -1 and sets errno to EINTR. */ +int +__libc_pause (void) { - return (__sigpause(sigblock(0), 0)); + sigset_t set; + + __sigemptyset (&set); + sigprocmask (SIG_BLOCK, NULL, &set); + + /* pause is a cancellation point, but so is sigsuspend. + So no need for anything special here. */ + + return sigsuspend (&set); } -#endif -weak_alias(__libc_pause,pause) +weak_alias (__libc_pause, pause) + +LIBC_CANCEL_HANDLED (); /* sigsuspend handles our cancellation. */ diff --git a/libc/sysdeps/linux/common/posix_fadvise64.c b/libc/sysdeps/linux/common/posix_fadvise64.c index 7944c4985..5d8ed65b6 100644 --- a/libc/sysdeps/linux/common/posix_fadvise64.c +++ b/libc/sysdeps/linux/common/posix_fadvise64.c @@ -49,7 +49,7 @@ _syscall4(int, posix_fadvise64, int, fd, __off64_t, offset, #ifdef _syscall6 /* workaround until everyone has _syscall6() */ #define __NR___syscall_fadvise64_64 __NR_fadvise64_64 -static inline _syscall6(int, __syscall_fadvise64_64, int, fd, +static __inline__ _syscall6(int, __syscall_fadvise64_64, int, fd, unsigned long, high_offset, unsigned long, low_offset, unsigned long, high_len, unsigned long, low_len, int, advice); diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c index 3c0df19a3..b2aaa2a1d 100644 --- a/libc/sysdeps/linux/common/pread_write.c +++ b/libc/sysdeps/linux/common/pread_write.c @@ -30,7 +30,7 @@ extern __typeof(pwrite64) __libc_pwrite64; #ifdef __NR_pread # define __NR___syscall_pread __NR_pread -static inline _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -54,7 +54,7 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/common/ptrace.c b/libc/sysdeps/linux/common/ptrace.c index 9d6767374..4f11260b8 100644 --- a/libc/sysdeps/linux/common/ptrace.c +++ b/libc/sysdeps/linux/common/ptrace.c @@ -12,7 +12,7 @@ #if defined __NR_ptrace && defined __USE_BSD && defined __USE_MISC #define __NR___syscall_ptrace __NR_ptrace -static inline _syscall4(long, __syscall_ptrace, enum __ptrace_request, request, +static __inline__ _syscall4(long, __syscall_ptrace, enum __ptrace_request, request, __kernel_pid_t, pid, void*, addr, void*, data); long int diff --git a/libc/sysdeps/linux/common/readahead.c b/libc/sysdeps/linux/common/readahead.c index ae7a57c44..94e2481cf 100644 --- a/libc/sysdeps/linux/common/readahead.c +++ b/libc/sysdeps/linux/common/readahead.c @@ -33,7 +33,7 @@ # if __WORDSIZE == 64 -static inline _syscall3(ssize_t, __readahead, int, fd, +static __inline__ _syscall3(ssize_t, __readahead, int, fd, off_t, offset, size_t, count); ssize_t readahead(int fd, off_t offset, size_t count) @@ -43,7 +43,7 @@ ssize_t readahead(int fd, off_t offset, size_t count) # else -static inline _syscall4(ssize_t, __readahead, int, fd, +static __inline__ _syscall4(ssize_t, __readahead, int, fd, off_t, high_offset, off_t, low_offset, size_t, count); ssize_t readahead(int fd, off64_t offset, size_t count) diff --git a/libc/sysdeps/linux/common/reboot.c b/libc/sysdeps/linux/common/reboot.c index 44828ce64..9ce57b1ec 100644 --- a/libc/sysdeps/linux/common/reboot.c +++ b/libc/sysdeps/linux/common/reboot.c @@ -10,7 +10,7 @@ #include <sys/syscall.h> #include <sys/reboot.h> #define __NR__reboot __NR_reboot -static inline _syscall3(int, _reboot, int, magic, int, magic2, int, flag); +static __inline__ _syscall3(int, _reboot, int, magic, int, magic2, int, flag); int reboot(int flag) { return (_reboot((int) 0xfee1dead, 672274793, flag)); diff --git a/libc/sysdeps/linux/common/rename.c b/libc/sysdeps/linux/common/rename.c index 7e88bf346..fd7318f02 100644 --- a/libc/sysdeps/linux/common/rename.c +++ b/libc/sysdeps/linux/common/rename.c @@ -14,7 +14,7 @@ #include <stdio.h> #define __NR___syscall_rename __NR_rename -static inline _syscall2(int, __syscall_rename, const char *, oldpath, +static __inline__ _syscall2(int, __syscall_rename, const char *, oldpath, const char *, newpath); int rename(const char * oldpath, const char * newpath) diff --git a/libc/sysdeps/linux/common/sched_getaffinity.c b/libc/sysdeps/linux/common/sched_getaffinity.c index b876cf932..5c801c68f 100644 --- a/libc/sysdeps/linux/common/sched_getaffinity.c +++ b/libc/sysdeps/linux/common/sched_getaffinity.c @@ -30,7 +30,7 @@ /* Experimentally off - libc_hidden_proto(memset) */ #define __NR___syscall_sched_getaffinity __NR_sched_getaffinity -static inline _syscall3(int, __syscall_sched_getaffinity, __kernel_pid_t, pid, +static __inline__ _syscall3(int, __syscall_sched_getaffinity, __kernel_pid_t, pid, size_t, cpusetsize, cpu_set_t *, cpuset); int sched_getaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *cpuset) diff --git a/libc/sysdeps/linux/common/sched_getparam.c b/libc/sysdeps/linux/common/sched_getparam.c index 117c6baa2..af5ba6071 100644 --- a/libc/sysdeps/linux/common/sched_getparam.c +++ b/libc/sysdeps/linux/common/sched_getparam.c @@ -12,7 +12,7 @@ #include <sys/syscall.h> #define __NR___syscall_sched_getparam __NR_sched_getparam -static inline _syscall2(int, __syscall_sched_getparam, +static __inline__ _syscall2(int, __syscall_sched_getparam, __kernel_pid_t, pid, struct sched_param *, p); int sched_getparam(pid_t pid, struct sched_param *p) diff --git a/libc/sysdeps/linux/common/sched_getscheduler.c b/libc/sysdeps/linux/common/sched_getscheduler.c index 89ecdf911..9564da7fd 100644 --- a/libc/sysdeps/linux/common/sched_getscheduler.c +++ b/libc/sysdeps/linux/common/sched_getscheduler.c @@ -12,7 +12,7 @@ #include <sys/syscall.h> #define __NR___syscall_sched_getscheduler __NR_sched_getscheduler -static inline _syscall1(int, __syscall_sched_getscheduler, __kernel_pid_t, pid); +static __inline__ _syscall1(int, __syscall_sched_getscheduler, __kernel_pid_t, pid); int sched_getscheduler(pid_t pid) { diff --git a/libc/sysdeps/linux/common/sched_rr_get_interval.c b/libc/sysdeps/linux/common/sched_rr_get_interval.c index a87d27fd2..c59812d94 100644 --- a/libc/sysdeps/linux/common/sched_rr_get_interval.c +++ b/libc/sysdeps/linux/common/sched_rr_get_interval.c @@ -12,7 +12,7 @@ #include <sys/syscall.h> #define __NR___syscall_sched_rr_get_interval __NR_sched_rr_get_interval -static inline _syscall2(int, __syscall_sched_rr_get_interval, +static __inline__ _syscall2(int, __syscall_sched_rr_get_interval, __kernel_pid_t, pid, struct timespec *, tp); int sched_rr_get_interval(pid_t pid, struct timespec *tp) diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c index a25fbe356..c687970f1 100644 --- a/libc/sysdeps/linux/common/sched_setaffinity.c +++ b/libc/sysdeps/linux/common/sched_setaffinity.c @@ -34,7 +34,7 @@ libc_hidden_proto(getpid) #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity -static inline _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid, +static __inline__ _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid, size_t, cpusetsize, cpu_set_t *, cpuset); static size_t __kernel_cpumask_size; diff --git a/libc/sysdeps/linux/common/sched_setparam.c b/libc/sysdeps/linux/common/sched_setparam.c index 94a3cee54..1e1f8cf2d 100644 --- a/libc/sysdeps/linux/common/sched_setparam.c +++ b/libc/sysdeps/linux/common/sched_setparam.c @@ -12,7 +12,7 @@ #include <sys/syscall.h> #define __NR___syscall_sched_setparam __NR_sched_setparam -static inline _syscall2(int, __syscall_sched_setparam, +static __inline__ _syscall2(int, __syscall_sched_setparam, __kernel_pid_t, pid, const struct sched_param *, p); int sched_setparam(pid_t pid, const struct sched_param *p) diff --git a/libc/sysdeps/linux/common/sched_setscheduler.c b/libc/sysdeps/linux/common/sched_setscheduler.c index 05ada79e5..fe2630871 100644 --- a/libc/sysdeps/linux/common/sched_setscheduler.c +++ b/libc/sysdeps/linux/common/sched_setscheduler.c @@ -12,7 +12,7 @@ #include <sys/syscall.h> #define __NR___syscall_sched_setscheduler __NR_sched_setscheduler -static inline _syscall3(int, __syscall_sched_setscheduler, +static __inline__ _syscall3(int, __syscall_sched_setscheduler, __kernel_pid_t, pid, int, policy, const struct sched_param *, p); int sched_setscheduler(pid_t pid, int policy, const struct sched_param *p) diff --git a/libc/sysdeps/linux/common/sendfile64.c b/libc/sysdeps/linux/common/sendfile64.c index ccaa8d202..29cff5ec5 100644 --- a/libc/sysdeps/linux/common/sendfile64.c +++ b/libc/sysdeps/linux/common/sendfile64.c @@ -5,7 +5,7 @@ */ /* sendfile64 syscall. Copes with 64 bit and 32 bit machines * and on 32 bit machines this sends things into the kernel as - * two 32-bit arguments (high and low 32 bits of length) that + * two 32-bit arguments (high and low 32 bits of length) that * are ordered based on endianess. It turns out endian.h has * just the macro we need to order things, __LONG_LONG_PAIR. */ diff --git a/libc/sysdeps/linux/common/setfsgid.c b/libc/sysdeps/linux/common/setfsgid.c index b35006306..de005e28d 100644 --- a/libc/sysdeps/linux/common/setfsgid.c +++ b/libc/sysdeps/linux/common/setfsgid.c @@ -22,7 +22,7 @@ _syscall1(int, setfsgid, gid_t, gid); #else # define __NR___syscall_setfsgid __NR_setfsgid -static inline _syscall1(int, __syscall_setfsgid, __kernel_gid_t, gid); +static __inline__ _syscall1(int, __syscall_setfsgid, __kernel_gid_t, gid); int setfsgid(gid_t gid) { diff --git a/libc/sysdeps/linux/common/setfsuid.c b/libc/sysdeps/linux/common/setfsuid.c index d302ad48c..698117a1a 100644 --- a/libc/sysdeps/linux/common/setfsuid.c +++ b/libc/sysdeps/linux/common/setfsuid.c @@ -22,7 +22,7 @@ _syscall1(int, setfsuid, uid_t, uid); #else # define __NR___syscall_setfsuid __NR_setfsuid -static inline _syscall1(int, __syscall_setfsuid, __kernel_uid_t, uid); +static __inline__ _syscall1(int, __syscall_setfsuid, __kernel_uid_t, uid); int setfsuid(uid_t uid) { diff --git a/libc/sysdeps/linux/common/setgid.c b/libc/sysdeps/linux/common/setgid.c index 4a924a047..37175cd7c 100644 --- a/libc/sysdeps/linux/common/setgid.c +++ b/libc/sysdeps/linux/common/setgid.c @@ -22,7 +22,7 @@ _syscall1(int, setgid, gid_t, gid); #else # define __NR___syscall_setgid __NR_setgid -static inline _syscall1(int, __syscall_setgid, __kernel_gid_t, gid); +static __inline__ _syscall1(int, __syscall_setgid, __kernel_gid_t, gid); int setgid(gid_t gid) { diff --git a/libc/sysdeps/linux/common/setgroups.c b/libc/sysdeps/linux/common/setgroups.c index eb5245d59..3c77250d0 100644 --- a/libc/sysdeps/linux/common/setgroups.c +++ b/libc/sysdeps/linux/common/setgroups.c @@ -29,7 +29,7 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list); libc_hidden_proto(sysconf) #define __NR___syscall_setgroups __NR_setgroups -static inline _syscall2(int, __syscall_setgroups, +static __inline__ _syscall2(int, __syscall_setgroups, size_t, size, const __kernel_gid_t *, list); int setgroups(size_t size, const gid_t *groups) diff --git a/libc/sysdeps/linux/common/setpgid.c b/libc/sysdeps/linux/common/setpgid.c index 3447b999d..f91908ded 100644 --- a/libc/sysdeps/linux/common/setpgid.c +++ b/libc/sysdeps/linux/common/setpgid.c @@ -15,7 +15,7 @@ libc_hidden_proto(setpgid) #define __NR___syscall_setpgid __NR_setpgid -static inline _syscall2(int, __syscall_setpgid, +static __inline__ _syscall2(int, __syscall_setpgid, __kernel_pid_t, pid, __kernel_pid_t, pgid); int setpgid(pid_t pid, pid_t pgid) diff --git a/libc/sysdeps/linux/common/setregid.c b/libc/sysdeps/linux/common/setregid.c index d56c01f64..3fe95d9d0 100644 --- a/libc/sysdeps/linux/common/setregid.c +++ b/libc/sysdeps/linux/common/setregid.c @@ -24,7 +24,7 @@ _syscall2(int, setregid, gid_t, rgid, gid_t, egid); #else # define __NR___syscall_setregid __NR_setregid -static inline _syscall2(int, __syscall_setregid, +static __inline__ _syscall2(int, __syscall_setregid, __kernel_gid_t, rgid, __kernel_gid_t, egid); int setregid(gid_t rgid, gid_t egid) diff --git a/libc/sysdeps/linux/common/setresgid.c b/libc/sysdeps/linux/common/setresgid.c index 3bb54e3aa..13e4b1d6d 100644 --- a/libc/sysdeps/linux/common/setresgid.c +++ b/libc/sysdeps/linux/common/setresgid.c @@ -22,7 +22,7 @@ libc_hidden_def(setresgid) #elif defined(__NR_setresgid) # define __NR___syscall_setresgid __NR_setresgid -static inline _syscall3(int, __syscall_setresgid, +static __inline__ _syscall3(int, __syscall_setresgid, __kernel_gid_t, rgid, __kernel_gid_t, egid, __kernel_gid_t, sgid); libc_hidden_proto(setresgid) diff --git a/libc/sysdeps/linux/common/setresuid.c b/libc/sysdeps/linux/common/setresuid.c index 54b92465c..764b90523 100644 --- a/libc/sysdeps/linux/common/setresuid.c +++ b/libc/sysdeps/linux/common/setresuid.c @@ -22,7 +22,7 @@ libc_hidden_def(setresuid) #elif defined(__NR_setresuid) # define __NR___syscall_setresuid __NR_setresuid -static inline _syscall3(int, __syscall_setresuid, +static __inline__ _syscall3(int, __syscall_setresuid, __kernel_uid_t, rgid, __kernel_uid_t, egid, __kernel_uid_t, sgid); libc_hidden_proto(setresuid) diff --git a/libc/sysdeps/linux/common/setreuid.c b/libc/sysdeps/linux/common/setreuid.c index 7f908a333..bca7f8f43 100644 --- a/libc/sysdeps/linux/common/setreuid.c +++ b/libc/sysdeps/linux/common/setreuid.c @@ -24,7 +24,7 @@ _syscall2(int, setreuid, uid_t, ruid, uid_t, euid); #else # define __NR___syscall_setreuid __NR_setreuid -static inline _syscall2(int, __syscall_setreuid, +static __inline__ _syscall2(int, __syscall_setreuid, __kernel_uid_t, ruid, __kernel_uid_t, euid); int setreuid(uid_t ruid, uid_t euid) diff --git a/libc/sysdeps/linux/common/setuid.c b/libc/sysdeps/linux/common/setuid.c index 4036a3d09..32a4cd79e 100644 --- a/libc/sysdeps/linux/common/setuid.c +++ b/libc/sysdeps/linux/common/setuid.c @@ -22,7 +22,7 @@ _syscall1(int, setuid, uid_t, uid); #else # define __NR___syscall_setuid __NR_setuid -static inline _syscall1(int, __syscall_setuid, __kernel_uid_t, uid); +static __inline__ _syscall1(int, __syscall_setuid, __kernel_uid_t, uid); int setuid(uid_t uid) { diff --git a/libc/sysdeps/linux/common/sigpending.c b/libc/sysdeps/linux/common/sigpending.c index fa272c0f5..0a74afaa4 100644 --- a/libc/sysdeps/linux/common/sigpending.c +++ b/libc/sysdeps/linux/common/sigpending.c @@ -15,7 +15,7 @@ #ifdef __NR_rt_sigpending # define __NR___rt_sigpending __NR_rt_sigpending -static inline _syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size); +static __inline__ _syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size); int sigpending(sigset_t * set) { diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c index 5d8e852fe..2bff597c1 100644 --- a/libc/sysdeps/linux/common/sigqueue.c +++ b/libc/sysdeps/linux/common/sigqueue.c @@ -31,7 +31,7 @@ libc_hidden_proto(getuid) #ifdef __NR_rt_sigqueueinfo # define __NR___libc_rt_sigqueueinfo __NR_rt_sigqueueinfo -static inline _syscall3(int, __libc_rt_sigqueueinfo, pid_t, pid, int, sig, void*, value); +static __inline__ _syscall3(int, __libc_rt_sigqueueinfo, pid_t, pid, int, sig, void*, value); /* Return any pending signal or wait for one for the given time. */ int sigqueue (pid_t pid, int sig, const union sigval val) diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c index bbb070dbe..78211334e 100644 --- a/libc/sysdeps/linux/common/stat.c +++ b/libc/sysdeps/linux/common/stat.c @@ -22,7 +22,7 @@ libc_hidden_proto(stat) #define __NR___syscall_stat __NR_stat #undef stat -static inline _syscall2(int, __syscall_stat, +static __inline__ _syscall2(int, __syscall_stat, const char *, file_name, struct kernel_stat *, buf); int stat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c index 1ef39de4a..1a0865686 100644 --- a/libc/sysdeps/linux/common/stat64.c +++ b/libc/sysdeps/linux/common/stat64.c @@ -18,7 +18,7 @@ libc_hidden_proto(stat64) # include <sys/stat.h> # include "xstatconv.h" -static inline _syscall2(int, __syscall_stat64, +static __inline__ _syscall2(int, __syscall_stat64, const char *, file_name, struct kernel_stat64 *, buf); int stat64(const char *file_name, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/sync.c b/libc/sysdeps/linux/common/sync.c index dd69e335b..d2f81229c 100644 --- a/libc/sysdeps/linux/common/sync.c +++ b/libc/sysdeps/linux/common/sync.c @@ -14,8 +14,8 @@ #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_sync (args) -#define __NR___syscall_sync __NR_sync -static inline _syscall0(void, __syscall_sync); +#define __NR___syscall_sync __NR_sync +static __inline__ _syscall0(void, __syscall_sync); #endif void sync(void) diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c index 53c46fc56..d4a1798fe 100644 --- a/libc/sysdeps/linux/common/truncate64.c +++ b/libc/sysdeps/linux/common/truncate64.c @@ -5,7 +5,7 @@ */ /* truncate64 syscall. Copes with 64 bit and 32 bit machines * and on 32 bit machines this sends things into the kernel as - * two 32-bit arguments (high and low 32 bits of length) that + * two 32-bit arguments (high and low 32 bits of length) that * are ordered based on endianess. It turns out endian.h has * just the macro we need to order things, __LONG_LONG_PAIR. */ @@ -33,10 +33,10 @@ _syscall2(int, truncate64, const char *, path, __off64_t, length); #define INLINE_SYSCALL(name, nr, args...) __syscall_truncate64 (args) #define __NR___syscall_truncate64 __NR_truncate64 #if defined(__UCLIBC_TRUNCATE64_HAS_4_ARGS__) -static inline _syscall4(int, __syscall_truncate64, const char *, path, +static __inline__ _syscall4(int, __syscall_truncate64, const char *, path, uint32_t, pad, unsigned long, high_length, unsigned long, low_length); #else -static inline _syscall3(int, __syscall_truncate64, const char *, path, +static __inline__ _syscall3(int, __syscall_truncate64, const char *, path, unsigned long, high_length, unsigned long, low_length); #endif #endif diff --git a/libc/sysdeps/linux/common/umask.c b/libc/sysdeps/linux/common/umask.c index 24297e07e..01a7b9eb3 100644 --- a/libc/sysdeps/linux/common/umask.c +++ b/libc/sysdeps/linux/common/umask.c @@ -11,7 +11,7 @@ #include <sys/stat.h> #define __NR___syscall_umask __NR_umask -static inline _syscall1(__kernel_mode_t, __syscall_umask, __kernel_mode_t, mode); +static __inline__ _syscall1(__kernel_mode_t, __syscall_umask, __kernel_mode_t, mode); mode_t umask(mode_t mode) { diff --git a/libc/sysdeps/linux/common/umount.c b/libc/sysdeps/linux/common/umount.c index c62f9fb7c..9090696d5 100644 --- a/libc/sysdeps/linux/common/umount.c +++ b/libc/sysdeps/linux/common/umount.c @@ -21,7 +21,7 @@ _syscall1(int, umount, const char *, specialfile); #elif defined __NR_umount2 # define __NR___syscall_umount2 __NR_umount2 -static inline _syscall2(int, __syscall_umount2, const char *, special_file, int, flags); +static __inline__ _syscall2(int, __syscall_umount2, const char *, special_file, int, flags); int umount(const char *special_file) { diff --git a/libc/sysdeps/linux/common/ustat.c b/libc/sysdeps/linux/common/ustat.c index 27cfa95ad..578763cb5 100644 --- a/libc/sysdeps/linux/common/ustat.c +++ b/libc/sysdeps/linux/common/ustat.c @@ -12,7 +12,7 @@ #include <sys/sysmacros.h> #define __NR___syscall_ustat __NR_ustat -static inline _syscall2(int, __syscall_ustat, +static __inline__ _syscall2(int, __syscall_ustat, unsigned short int, kdev_t, struct ustat *, ubuf); int ustat(dev_t dev, struct ustat *ubuf) diff --git a/libc/sysdeps/linux/common/wait4.c b/libc/sysdeps/linux/common/wait4.c index ff3b82645..5c51116fa 100644 --- a/libc/sysdeps/linux/common/wait4.c +++ b/libc/sysdeps/linux/common/wait4.c @@ -15,7 +15,7 @@ libc_hidden_proto(wait4) #define __NR___syscall_wait4 __NR_wait4 -static inline _syscall4(int, __syscall_wait4, __kernel_pid_t, pid, +static __inline__ _syscall4(int, __syscall_wait4, __kernel_pid_t, pid, int *, status, int, opts, struct rusage *, rusage); pid_t wait4(pid_t pid, int *status, int opts, struct rusage *rusage) diff --git a/libc/sysdeps/linux/common/xattr.c b/libc/sysdeps/linux/common/xattr.c index 0ba17cde7..5b4c2f5bf 100644 --- a/libc/sysdeps/linux/common/xattr.c +++ b/libc/sysdeps/linux/common/xattr.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2004 <solar@gentoo.org> * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * diff --git a/libc/sysdeps/linux/cris/bits/syscalls.h b/libc/sysdeps/linux/cris/bits/syscalls.h index d44e79ca2..93e7cf2d9 100644 --- a/libc/sysdeps/linux/cris/bits/syscalls.h +++ b/libc/sysdeps/linux/cris/bits/syscalls.h @@ -44,7 +44,7 @@ return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \ -} +} #undef _syscall5 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ diff --git a/libc/sysdeps/linux/e1/bits/fenv.h b/libc/sysdeps/linux/e1/bits/fenv.h index dde6aceaa..beeea3d51 100644 --- a/libc/sysdeps/linux/e1/bits/fenv.h +++ b/libc/sysdeps/linux/e1/bits/fenv.h @@ -36,7 +36,7 @@ enum #define FE_OVERFLOW FE_OVERFLOW FE_DIVBYZERO = (1 << 11), #define FE_DIVBYZERO FE_DIVBYZERO - FE_INVALID = (1 << 12) + FE_INVALID = (1 << 12) #define FE_INVALID FE_INVALID }; diff --git a/libc/sysdeps/linux/e1/bits/fenvinline.h b/libc/sysdeps/linux/e1/bits/fenvinline.h index cce266131..a16fc0fb2 100644 --- a/libc/sysdeps/linux/e1/bits/fenvinline.h +++ b/libc/sysdeps/linux/e1/bits/fenvinline.h @@ -1,4 +1,4 @@ -/* +/* Inline floating-point environment handling functions for Hyperstone e1-32X. Copyright (C) 2002-2003, George Thanos <george.thanos@gdt.gr> Yannis Mitsos <yannis.mitsos@gdt.gr> @@ -22,9 +22,9 @@ #if defined __GNUC__ && !defined _SOFT_FLOAT && !defined __NO_MATH_INLINES -/********************************************************** +/********************************************************** * --- A small description of the E1-16/32X FP unit. --- - * FP exceptions can be enabled and disabled through + * FP exceptions can be enabled and disabled through * <feenableexcept>, <fedisableexcept>. * * - When an enabled exception takes place a SIGFPE signal @@ -37,7 +37,7 @@ * a trap. The user can check if any exception took place after * an FP instruction by issuing an <fetestexcept> command. * User should first clear the G2 register by issuing an - * <feclearexcept> function. + * <feclearexcept> function. * The following program is a typical example of how the user * should check for exceptions that did not generate a SIGFPE * signal : @@ -49,7 +49,7 @@ * raised = fetestexcept (FE_OVERFLOW | FE_INVALID); * if (raised & FE_OVERFLOW) { ... } * if (raised & FE_INVALID) { ... } - * ... + * ... * } ***********************************************************/ @@ -92,7 +92,7 @@ /* The following functions test for accrued exceptions. * No trap is generated on an FP exception. */ -static inline feclearexcept(int __excepts) +static __inline__ feclearexcept(int __excepts) { unsigned int enabled_excepts, disabled_excepts; @@ -102,7 +102,7 @@ static inline feclearexcept(int __excepts) __asm__ __volatile__("mov %0, SR" :"=l"(enabled_excepts) - :/*no input*/ ); + :/*no input*/ ); enabled_excepts &= 0x1F00; disabled_excepts = ~enabled_excepts; @@ -123,9 +123,9 @@ static inline feclearexcept(int __excepts) /* fetestexcepts tests both for actual and accrued * excepts. You can test for an exception either after * an FP instruction or within a SIGFPE handler - */ + */ inline int fetestexcept(int __excepts) -{ +{ unsigned int G2, G2en, G2dis; unsigned int enabled_excepts, disabled_excepts; @@ -135,7 +135,7 @@ inline int fetestexcept(int __excepts) __asm__ __volatile__("mov %0, SR" :"=l"(enabled_excepts) - :/*no input*/ ); + :/*no input*/ ); enabled_excepts &= 0x1F00; disabled_excepts = ~enabled_excepts; @@ -152,7 +152,7 @@ inline int fetestexcept(int __excepts) return ( G2en | (G2dis << 8) ); } -static inline int feraiseexcept(int __excepts) +static __inline__ int feraiseexcept(int __excepts) { __asm__ __volatile__("or G2, %0" :/*no output*/ @@ -218,7 +218,7 @@ static inline int feraiseexcept(int __excepts) (__retval); \ }) -static inline int fegetexcept(int excepts) +static __inline__ int fegetexcept(int excepts) { unsigned int tmp; __asm__ __volatile__("mov %0, SR" @@ -228,7 +228,7 @@ static inline int fegetexcept(int excepts) return tmp; } -static inline int fegetenv(fenv_t *envp) +static __inline__ int fegetenv(fenv_t *envp) { __asm__ __volatile__("mov %0, SR\n\t mov %1, SR\n\t @@ -273,7 +273,7 @@ static inline int fegetenv(fenv_t *envp) :"l"( envp->actual_except ) ); \ (0); /* return 0 */ \ }) - + #define feupdateenv(envp) \ ({ \ /* Clear FRM & FTE field of SR */ \ @@ -292,7 +292,7 @@ static inline int fegetenv(fenv_t *envp) :"l"( envp->actual_except ) ); \ (0); /* return 0 */ \ }) - + #endif /* __GNUC__ && !_SOFT_FLOAT */ diff --git a/libc/sysdeps/linux/e1/bits/kernel_stat.h b/libc/sysdeps/linux/e1/bits/kernel_stat.h index 908a153d8..9be9d115d 100644 --- a/libc/sysdeps/linux/e1/bits/kernel_stat.h +++ b/libc/sysdeps/linux/e1/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h index 513009d8f..8017d8578 100644 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/e1/longjmp.c b/libc/sysdeps/linux/e1/longjmp.c index fbd5103a4..9f04e7b5c 100644 --- a/libc/sysdeps/linux/e1/longjmp.c +++ b/libc/sysdeps/linux/e1/longjmp.c @@ -12,7 +12,7 @@ #include <signal.h> #define __NR_e1newSP 224 -static inline _syscall1(int, e1newSP, unsigned long, SavedSP ) +static __inline__ _syscall1(int, e1newSP, unsigned long, SavedSP ) unsigned long jmpbuf_ptr; @@ -23,7 +23,7 @@ void longjmp(jmp_buf state, int value ) else state->__jmpbuf->ReturnValue = value; - jmpbuf_ptr = (unsigned long)state; + jmpbuf_ptr = (unsigned long)state; e1newSP(state->__jmpbuf->SavedSP); #define _state_ ((struct __jmp_buf_tag*)jmpbuf_ptr) @@ -55,9 +55,9 @@ void siglongjmp(sigjmp_buf state, int value ) else state->__jmpbuf->ReturnValue = value; - jmpbuf_ptr = (unsigned long)state; + jmpbuf_ptr = (unsigned long)state; e1newSP(state->__jmpbuf->SavedSP); - + #define _state_ ((struct __jmp_buf_tag*)jmpbuf_ptr) __asm__ __volatile__("mov L0, %0\n\t" diff --git a/libc/sysdeps/linux/e1/setjmp.c b/libc/sysdeps/linux/e1/setjmp.c index 3a3f3b7e8..bda18b13a 100644 --- a/libc/sysdeps/linux/e1/setjmp.c +++ b/libc/sysdeps/linux/e1/setjmp.c @@ -11,11 +11,11 @@ libc_hidden_proto(sigprocmask) int setjmp( jmp_buf state) { - __asm__ __volatile__( "mov %0, G3\n\t" - "mov %1, G4\n\t" - :"=l"(state->__jmpbuf->G3), - "=l"(state->__jmpbuf->G4) - :/*no input*/ + __asm__ __volatile__( "mov %0, G3\n\t" + "mov %1, G4\n\t" + :"=l"(state->__jmpbuf->G3), + "=l"(state->__jmpbuf->G4) + :/*no input*/ :"%G3", "%G4" ); __asm__ __volatile__( "setadr %0\n\t" @@ -38,11 +38,11 @@ int sigsetjmp( sigjmp_buf state , int savesigs) } else state->__mask_was_saved = 0; - __asm__ __volatile__( "mov %0, G3\n\t" - "mov %1, G4\n\t" - :"=l"(state->__jmpbuf->G3), - "=l"(state->__jmpbuf->G4) - :/*no input*/ + __asm__ __volatile__( "mov %0, G3\n\t" + "mov %1, G4\n\t" + :"=l"(state->__jmpbuf->G3), + "=l"(state->__jmpbuf->G4) + :/*no input*/ :"%G3", "%G4" ); __asm__ __volatile__( "setadr %0\n\t" diff --git a/libc/sysdeps/linux/frv/bits/elf-fdpic.h b/libc/sysdeps/linux/frv/bits/elf-fdpic.h index 0dbb54b4c..905648054 100644 --- a/libc/sysdeps/linux/frv/bits/elf-fdpic.h +++ b/libc/sysdeps/linux/frv/bits/elf-fdpic.h @@ -103,7 +103,7 @@ __reloc_pointer (void *p, || (offset == map->segs[c].p_memsz && c + 1 == map->nsegs)) return (char*)map->segs[c].addr + offset; } - + /* We might want to crash instead. */ return (void*)-1; } diff --git a/libc/sysdeps/linux/frv/bits/kernel_stat.h b/libc/sysdeps/linux/frv/bits/kernel_stat.h index 51cb57eda..8b80a2608 100644 --- a/libc/sysdeps/linux/frv/bits/kernel_stat.h +++ b/libc/sysdeps/linux/frv/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/frv/bits/kernel_types.h b/libc/sysdeps/linux/frv/bits/kernel_types.h index 3d3f6304c..8403fd3e8 100644 --- a/libc/sysdeps/linux/frv/bits/kernel_types.h +++ b/libc/sysdeps/linux/frv/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/frv/crtreloc.c b/libc/sysdeps/linux/frv/crtreloc.c index 1a86728a3..e025b619f 100644 --- a/libc/sysdeps/linux/frv/crtreloc.c +++ b/libc/sysdeps/linux/frv/crtreloc.c @@ -70,7 +70,7 @@ __self_reloc (const struct elf32_fdpic_loadmap *map, if (p >= e) return (void*)-1; - + return __reloc_pointer (*p, map); } diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c index d4cfcb062..f251babbb 100644 --- a/libc/sysdeps/linux/frv/mmap.c +++ b/libc/sysdeps/linux/frv/mmap.c @@ -32,7 +32,7 @@ libc_hidden_proto(mmap) #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* This is always 12, even on architectures where PAGE_SHIFT != 12. */ diff --git a/libc/sysdeps/linux/h8300/bits/kernel_stat.h b/libc/sysdeps/linux/h8300/bits/kernel_stat.h index f589b1f66..9468292e5 100644 --- a/libc/sysdeps/linux/h8300/bits/kernel_stat.h +++ b/libc/sysdeps/linux/h8300/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/h8300/bits/syscalls.h b/libc/sysdeps/linux/h8300/bits/syscalls.h index 8ef399fd7..5867ed608 100644 --- a/libc/sysdeps/linux/h8300/bits/syscalls.h +++ b/libc/sysdeps/linux/h8300/bits/syscalls.h @@ -2,8 +2,8 @@ * this file must be able to cope with PIC and non-PIC code. For some arches * there is no difference. For x86 (which has far too few registers) there is * a difference. Regardless, including asm/unistd.h is hereby officially - * forbidden. Don't do it. It is bad for you. - */ + * forbidden. Don't do it. It is bad for you. + */ #ifndef _SYSCALL_H # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead." #endif diff --git a/libc/sysdeps/linux/hppa/bits/kernel_stat.h b/libc/sysdeps/linux/hppa/bits/kernel_stat.h index 51b5b0748..e4d784e91 100644 --- a/libc/sysdeps/linux/hppa/bits/kernel_stat.h +++ b/libc/sysdeps/linux/hppa/bits/kernel_stat.h @@ -1,4 +1,4 @@ -/* Ripped from linux/include/asm-parisc/stat.h +/* Ripped from linux/include/asm-parisc/stat.h * and renamed 'struct stat' to 'struct kernel_stat' */ #ifndef _PARISC_STAT_H diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h index cf219dce1..4441f9b29 100644 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/hppa/syscall.c b/libc/sysdeps/linux/hppa/syscall.c index 04e80b2b2..cd11e084e 100644 --- a/libc/sysdeps/linux/hppa/syscall.c +++ b/libc/sysdeps/linux/hppa/syscall.c @@ -26,8 +26,8 @@ INTERNAL_SYSCALL, and all the generated pure assembly syscall wrappers. How often the function is used is unknown. */ -long int -syscall (long int __sysno, ...) +long int +syscall (long int __sysno, ...) { /* FIXME: Keep this matching INLINE_SYSCALL for hppa */ va_list args; @@ -43,7 +43,7 @@ syscall (long int __sysno, ...) arg4 = va_arg (args, long int); arg5 = va_arg (args, long int); va_end (args); - + { register unsigned long int __res __asm__("r28"); K_LOAD_ARGS_6 (arg0, arg1, arg2, arg3, arg4, arg5) diff --git a/libc/sysdeps/linux/i386/bits/atomic.h b/libc/sysdeps/linux/i386/bits/atomic.h index 33279af5f..a20f424f8 100644 --- a/libc/sysdeps/linux/i386/bits/atomic.h +++ b/libc/sysdeps/linux/i386/bits/atomic.h @@ -60,21 +60,21 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgb %b2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgb %b2, %1" \ : "=a" (ret), "=m" (*mem) \ : "q" (newval), "m" (*mem), "0" (oldval)); \ ret; }) #define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgw %w2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgw %w2, %1" \ : "=a" (ret), "=m" (*mem) \ : "r" (newval), "m" (*mem), "0" (oldval)); \ ret; }) #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (*mem) \ : "r" (newval), "m" (*mem), "0" (oldval)); \ ret; }) @@ -92,7 +92,7 @@ typedef uintmax_t uatomic_max_t; # ifdef __PIC__ # define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile ("xchgl %2, %%ebx\n\t" \ + __asm__ __volatile__ ("xchgl %2, %%ebx\n\t" \ LOCK_PREFIX "cmpxchg8b %1\n\t" \ "xchgl %2, %%ebx" \ : "=A" (ret), "=m" (*mem) \ @@ -106,7 +106,7 @@ typedef uintmax_t uatomic_max_t; # else # define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchg8b %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchg8b %1" \ : "=A" (ret), "=m" (*mem) \ : "b" (((unsigned long long int) (newval)) \ & 0xffffffff), \ @@ -123,15 +123,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ - __asm __volatile ("xchgb %b0, %1" \ + __asm__ __volatile__ ("xchgb %b0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile ("xchgw %w0, %1" \ + __asm__ __volatile__ ("xchgw %w0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile ("xchgl %0, %1" \ + __asm__ __volatile__ ("xchgl %0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else \ @@ -146,15 +146,15 @@ typedef uintmax_t uatomic_max_t; ({ __typeof (*mem) __result; \ __typeof (value) __addval = (value); \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "xaddb %b0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddb %b0, %1" \ : "=r" (__result), "=m" (*mem) \ : "0" (__addval), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "xaddw %w0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddw %w0, %1" \ : "=r" (__result), "=m" (*mem) \ : "0" (__addval), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "xaddl %0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddl %0, %1" \ : "=r" (__result), "=m" (*mem) \ : "0" (__addval), "m" (*mem)); \ else \ @@ -176,15 +176,15 @@ typedef uintmax_t uatomic_max_t; else if (__builtin_constant_p (value) && (value) == -1) \ atomic_decrement (mem); \ else if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else \ @@ -204,15 +204,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_add_negative(mem, value) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "iq" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else \ @@ -223,15 +223,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_add_zero(mem, value) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else \ @@ -241,15 +241,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_increment(mem) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "incb %b0" \ + __asm__ __volatile__ (LOCK_PREFIX "incb %b0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "incw %w0" \ + __asm__ __volatile__ (LOCK_PREFIX "incw %w0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "incl %0" \ + __asm__ __volatile__ (LOCK_PREFIX "incl %0" \ : "=m" (*mem) \ : "m" (*mem)); \ else \ @@ -268,15 +268,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_increment_and_test(mem) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "incb %0; sete %b1" \ + __asm__ __volatile__ (LOCK_PREFIX "incb %0; sete %b1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "incw %0; sete %w1" \ + __asm__ __volatile__ (LOCK_PREFIX "incw %0; sete %w1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "incl %0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "incl %0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else \ @@ -286,15 +286,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_decrement(mem) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "decb %b0" \ + __asm__ __volatile__ (LOCK_PREFIX "decb %b0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "decw %w0" \ + __asm__ __volatile__ (LOCK_PREFIX "decw %w0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "decl %0" \ + __asm__ __volatile__ (LOCK_PREFIX "decl %0" \ : "=m" (*mem) \ : "m" (*mem)); \ else \ @@ -313,15 +313,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_decrement_and_test(mem) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "decb %b0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decb %b0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "decw %w0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decw %w0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "decl %0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decl %0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else \ @@ -331,15 +331,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_bit_set(mem, bit) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "orb %b2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orb %b2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1 << (bit))); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "orw %w2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orw %w2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1 << (bit))); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "orl %2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orl %2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1 << (bit))); \ else \ @@ -350,15 +350,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_bit_test_set(mem, bit) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "btsb %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsb %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "btsw %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsw %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "btsl %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsl %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else \ diff --git a/libc/sysdeps/linux/i386/bits/kernel_stat.h b/libc/sysdeps/linux/i386/bits/kernel_stat.h index 9f659a47e..20eb6d2ef 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_stat.h +++ b/libc/sysdeps/linux/i386/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h index deb615f53..6609dd312 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/i386/bits/mathinline.h b/libc/sysdeps/linux/i386/bits/mathinline.h index e04ce9509..879b76b40 100644 --- a/libc/sysdeps/linux/i386/bits/mathinline.h +++ b/libc/sysdeps/linux/i386/bits/mathinline.h @@ -206,7 +206,7 @@ __NTH (__signbitl (long double __x)) __MATH_INLINE float_type __NTH (func (float_type __x)) \ { \ register float_type __result; \ - __asm __volatile__ (op : "=t" (__result) : params); \ + __asm__ __volatile__ (op : "=t" (__result) : params); \ return __result; \ } @@ -531,22 +531,22 @@ __inline_mathcodeNP (floor, __x, \ register long double __value; \ __volatile unsigned short int __cw; \ __volatile unsigned short int __cwtmp; \ - __asm __volatile ("fnstcw %0" : "=m" (__cw)); \ + __asm__ __volatile__ ("fnstcw %0" : "=m" (__cw)); \ __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ \ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); \ - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); \ - __asm __volatile ("fldcw %0" : : "m" (__cw)); \ + __asm__ __volatile__ ("fldcw %0" : : "m" (__cwtmp)); \ + __asm__ __volatile__ ("frndint" : "=t" (__value) : "0" (__x)); \ + __asm__ __volatile__ ("fldcw %0" : : "m" (__cw)); \ return __value) __inline_mathcodeNP (ceil, __x, \ register long double __value; \ __volatile unsigned short int __cw; \ __volatile unsigned short int __cwtmp; \ - __asm __volatile ("fnstcw %0" : "=m" (__cw)); \ + __asm__ __volatile__ ("fnstcw %0" : "=m" (__cw)); \ __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ \ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); \ - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); \ - __asm __volatile ("fldcw %0" : : "m" (__cw)); \ + __asm__ __volatile__ ("fldcw %0" : : "m" (__cwtmp)); \ + __asm__ __volatile__ ("frndint" : "=t" (__value) : "0" (__x)); \ + __asm__ __volatile__ ("fldcw %0" : : "m" (__cw)); \ return __value) #ifdef __FAST_MATH__ @@ -746,7 +746,7 @@ __inline_mathcode (__acosh1p, __x, \ __inline_mathop (__ieee754_sqrt, "fsqrt") __inline_mathcode2 (__ieee754_atan2, __y, __x, register long double __value; - __asm __volatile__ ("fpatan\n\t" + __asm__ __volatile__ ("fpatan\n\t" : "=t" (__value) : "0" (__x), "u" (__y) : "st(1)"); return __value;) diff --git a/libc/sysdeps/linux/i386/bits/sigcontextinfo.h b/libc/sysdeps/linux/i386/bits/sigcontextinfo.h index 6530ba6f3..b7367bac6 100644 --- a/libc/sysdeps/linux/i386/bits/sigcontextinfo.h +++ b/libc/sysdeps/linux/i386/bits/sigcontextinfo.h @@ -25,7 +25,7 @@ #define CALL_SIGHANDLER(handler, signo, ctx) \ do { \ int __tmp1, __tmp2, __tmp3, __tmp4; \ - __asm __volatile ("movl\t%%esp, %%edi\n\t" \ + __asm__ __volatile__ ("movl\t%%esp, %%edi\n\t" \ "andl\t$-16, %%esp\n\t" \ "subl\t%8, %%esp\n\t" \ "movl\t%%edi, %c8-4(%%esp)\n\t" \ diff --git a/libc/sysdeps/linux/i386/sigaction.c b/libc/sysdeps/linux/i386/sigaction.c index fbd5014e7..e8729647f 100644 --- a/libc/sysdeps/linux/i386/sigaction.c +++ b/libc/sysdeps/linux/i386/sigaction.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Boston, MA 02111-1307, USA. Totally hacked up for uClibc by Erik Andersen <andersen@codepoet.org> */ diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h index 6449b5e27..c8ef86d77 100644 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/ia64/bits/syscalls.h b/libc/sysdeps/linux/ia64/bits/syscalls.h index 4e8a305ea..0c3d6ca3a 100644 --- a/libc/sysdeps/linux/ia64/bits/syscalls.h +++ b/libc/sysdeps/linux/ia64/bits/syscalls.h @@ -45,7 +45,7 @@ register long _r15 __asm__ ("r15") = SYS_ify(name); \ long _retval; \ LOAD_REGS_##nr \ - __asm __volatile ("break " ___IA64_BREAK_SYSCALL ";;\n\t" \ + __asm__ __volatile__ ("break " ___IA64_BREAK_SYSCALL ";;\n\t" \ : "=r" (_r8), "=r" (_r10), "=r" (_r15) ASM_OUTARGS_##nr \ : "2" (_r15) ASM_ARGS_##nr \ : "memory" ASM_CLOBBERS_##nr); \ diff --git a/libc/sysdeps/linux/m68k/bits/kernel_stat.h b/libc/sysdeps/linux/m68k/bits/kernel_stat.h index 5f0514843..e60362b54 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_stat.h +++ b/libc/sysdeps/linux/m68k/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h index 166b33fe6..0a77a8f46 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/m68k/bits/mathinline.h b/libc/sysdeps/linux/m68k/bits/mathinline.h index 567dbed89..f3166000d 100644 --- a/libc/sysdeps/linux/m68k/bits/mathinline.h +++ b/libc/sysdeps/linux/m68k/bits/mathinline.h @@ -179,14 +179,14 @@ __m81_defun (float_type, __CONCAT(__floor,s), (float_type __x)) \ { \ float_type __result; \ unsigned long int __ctrl_reg; \ - __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ + __asm__ __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ /* Set rounding towards negative infinity. */ \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" ((__ctrl_reg & ~0x10) | 0x20)); \ /* Convert X to an integer, using -Inf rounding. */ \ - __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + __asm__ __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ /* Restore the previous rounding mode. */ \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" (__ctrl_reg)); \ return __result; \ } \ @@ -195,14 +195,14 @@ __m81_defun (float_type, __CONCAT(__ceil,s), (float_type __x)) \ { \ float_type __result; \ unsigned long int __ctrl_reg; \ - __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ + __asm__ __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ /* Set rounding towards positive infinity. */ \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" (__ctrl_reg | 0x30)); \ /* Convert X to an integer, using +Inf rounding. */ \ - __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + __asm__ __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ /* Restore the previous rounding mode. */ \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" (__ctrl_reg)); \ return __result; \ } @@ -295,12 +295,12 @@ __m81_defun (float_type, __CONCAT(__nearbyint,s), (float_type __x)) \ { \ float_type __result; \ unsigned long int __ctrl_reg; \ - __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ + __asm__ __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); \ /* Temporarily disable the inexact exception. */ \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" (__ctrl_reg & ~0x200)); \ - __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ - __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ + __asm__ __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); \ + __asm__ __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ \ : "dmi" (__ctrl_reg)); \ return __result; \ } \ @@ -351,14 +351,14 @@ __inline_functions (long double,l) /* Note that there must be no whitespace before the argument passed for NAME, to make token pasting work correctly with -traditional. */ # define __inline_forward_c(rettype, name, args1, args2) \ -__extern_inline rettype __attribute__((__const__)) \ +extern __inline rettype __attribute__((__const__)) \ name args1 \ { \ return __CONCAT(__,name) args2; \ } # define __inline_forward(rettype, name, args1, args2) \ -__extern_inline rettype name args1 \ +extern __inline rettype name args1 \ { \ return __CONCAT(__,name) args2; \ } diff --git a/libc/sysdeps/linux/microblaze/bits/endian.h b/libc/sysdeps/linux/microblaze/bits/endian.h index a1012a3f1..8a4f6efcc 100644 --- a/libc/sysdeps/linux/microblaze/bits/endian.h +++ b/libc/sysdeps/linux/microblaze/bits/endian.h @@ -8,7 +8,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> * Microblaze port by John Williams */ diff --git a/libc/sysdeps/linux/microblaze/bits/setjmp.h b/libc/sysdeps/linux/microblaze/bits/setjmp.h index c3e218955..d966efd2b 100644 --- a/libc/sysdeps/linux/microblaze/bits/setjmp.h +++ b/libc/sysdeps/linux/microblaze/bits/setjmp.h @@ -8,7 +8,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/microblaze/clinkage.h b/libc/sysdeps/linux/microblaze/clinkage.h index cf5c34b54..a9beffc96 100644 --- a/libc/sysdeps/linux/microblaze/clinkage.h +++ b/libc/sysdeps/linux/microblaze/clinkage.h @@ -8,7 +8,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/microblaze/clone.c b/libc/sysdeps/linux/microblaze/clone.c index 887e2c8ac..a47ee8c68 100644 --- a/libc/sysdeps/linux/microblaze/clone.c +++ b/libc/sysdeps/linux/microblaze/clone.c @@ -31,7 +31,7 @@ clone (int (*fn)(void *arg), void *child_stack, int flags, void *arg) arg0 = flags; arg1 = (unsigned long)child_stack; syscall = __NR_clone; - __asm__ __volatile__ ("bralid r17, trap;nop;" + __asm__ __volatile__ ("bralid r17, trap;nop;" : "=r" (rval), "=r" (syscall) : "1" (syscall), "r" (arg0), "r" (arg1) : SYSCALL_CLOBBERS); @@ -41,7 +41,7 @@ clone (int (*fn)(void *arg), void *child_stack, int flags, void *arg) { arg0 = (*fn) (arg); syscall = __NR_exit; - __asm__ __volatile__ ("bralid r17, trap;nop;" + __asm__ __volatile__ ("bralid r17, trap;nop;" : "=r" (rval), "=r" (syscall) : "1" (syscall), "r" (arg0) : SYSCALL_CLOBBERS); diff --git a/libc/sysdeps/linux/microblaze/syscall.c b/libc/sysdeps/linux/microblaze/syscall.c index a7fd3ae7b..0e07e4595 100644 --- a/libc/sysdeps/linux/microblaze/syscall.c +++ b/libc/sysdeps/linux/microblaze/syscall.c @@ -8,7 +8,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ @@ -37,11 +37,11 @@ syscall (long num, arg_t a1, arg_t a2, arg_t a3, arg_t a4, arg_t a5, arg_t a6) unsigned long ret_sav; *((unsigned long *)0xFFFF4004) = (unsigned int)('+'); - __asm__ ("brlid r17, 08x; nop;" + __asm__ ("brlid r17, 08x; nop;" : "=r" (ret) : "r" (syscall), "r" (a), "r" (b), "r" (c), "r" (d), "r" (e), "r" (f) : SYSCALL_CLOBBERS); - + ret_sav=ret; *((unsigned long *)0xFFFF4004) = (unsigned int)('-'); diff --git a/libc/sysdeps/linux/mips/bits/atomic.h b/libc/sysdeps/linux/mips/bits/atomic.h index 167d9a59c..ca53d3842 100644 --- a/libc/sysdeps/linux/mips/bits/atomic.h +++ b/libc/sysdeps/linux/mips/bits/atomic.h @@ -285,7 +285,7 @@ typedef uintmax_t uatomic_max_t; __prev; }) #endif -/* ??? Barrier semantics for atomic_exchange_and_add appear to be +/* ??? Barrier semantics for atomic_exchange_and_add appear to be undefined. Use full barrier for now, as that's safe. */ #define atomic_exchange_and_add(mem, value) \ __atomic_val_bysize (__arch_exchange_and_add, int, mem, value, \ diff --git a/libc/sysdeps/linux/mips/bits/kernel_stat.h b/libc/sysdeps/linux/mips/bits/kernel_stat.h index 13c23d359..3161562ea 100644 --- a/libc/sysdeps/linux/mips/bits/kernel_stat.h +++ b/libc/sysdeps/linux/mips/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #include <sgidefs.h> diff --git a/libc/sysdeps/linux/mips/bits/syscalls.h b/libc/sysdeps/linux/mips/bits/syscalls.h index 324d75d9f..fa8b876d7 100644 --- a/libc/sysdeps/linux/mips/bits/syscalls.h +++ b/libc/sysdeps/linux/mips/bits/syscalls.h @@ -45,7 +45,7 @@ return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \ -} +} #undef _syscall5 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ diff --git a/libc/sysdeps/linux/mips/pread_write.c b/libc/sysdeps/linux/mips/pread_write.c index 553864531..0939e17b6 100644 --- a/libc/sysdeps/linux/mips/pread_write.c +++ b/libc/sysdeps/linux/mips/pread_write.c @@ -49,7 +49,7 @@ weak_alias (__libc_pread64, pread64) # endif /* __UCLIBC_HAS_LFS__ */ # else /* O32 || N32 */ # define __NR___syscall_pread __NR_pread -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -93,7 +93,7 @@ weak_alias (__libc_pwrite64, pwrite64) # endif /* __UCLIBC_HAS_LFS__ */ # else /* O32 || N32 */ # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c index 0135481ae..d03371f5a 100644 --- a/libc/sysdeps/linux/mips/sigaction.c +++ b/libc/sysdeps/linux/mips/sigaction.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Boston, MA 02111-1307, USA. Totally hacked up for uClibc by Erik Andersen <andersen@codepoet.org> */ diff --git a/libc/sysdeps/linux/nios/bits/kernel_types.h b/libc/sysdeps/linux/nios/bits/kernel_types.h index acbb0c592..e66f42d7a 100644 --- a/libc/sysdeps/linux/nios/bits/kernel_types.h +++ b/libc/sysdeps/linux/nios/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/nios/crtbegin.c b/libc/sysdeps/linux/nios/crtbegin.c index c52999027..ac3f23f84 100644 --- a/libc/sysdeps/linux/nios/crtbegin.c +++ b/libc/sysdeps/linux/nios/crtbegin.c @@ -33,5 +33,5 @@ dummy_fini(void) __asm__ __volatile__ (".section .fini"); (*call__dtors)(); __asm__ __volatile__ (".section .trash"); - + } diff --git a/libc/sysdeps/linux/nios/crtend.c b/libc/sysdeps/linux/nios/crtend.c index 29af728a9..775eb0f9d 100644 --- a/libc/sysdeps/linux/nios/crtend.c +++ b/libc/sysdeps/linux/nios/crtend.c @@ -34,7 +34,7 @@ dummy_init(void) */ /* prevent function pointer constant propagation */ __asm__ __volatile__ (".section .init"); - + if (!initialized) { initialized = 1; (*call__ctors)(); diff --git a/libc/sysdeps/linux/nios2/bits/kernel_stat.h b/libc/sysdeps/linux/nios2/bits/kernel_stat.h index 908a153d8..9be9d115d 100644 --- a/libc/sysdeps/linux/nios2/bits/kernel_stat.h +++ b/libc/sysdeps/linux/nios2/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ struct kernel_stat { diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h index 1fd1c4aaa..3fcd1af05 100644 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/nios2/bits/setjmp.h b/libc/sysdeps/linux/nios2/bits/setjmp.h index 5d33caa98..fcff0316d 100644 --- a/libc/sysdeps/linux/nios2/bits/setjmp.h +++ b/libc/sysdeps/linux/nios2/bits/setjmp.h @@ -45,7 +45,7 @@ typedef struct /* floating point regs, if any */ #if defined __HAVE_FPU__ unsigned long __fpregs[64]; -#endif +#endif } __jmp_buf[1]; #endif diff --git a/libc/sysdeps/linux/nios2/syscall.c b/libc/sysdeps/linux/nios2/syscall.c index df925fde8..c3eb0022c 100644 --- a/libc/sysdeps/linux/nios2/syscall.c +++ b/libc/sysdeps/linux/nios2/syscall.c @@ -1,4 +1,4 @@ -/* +/* * libc/sysdeps/linux/nios2/syscall.c -- generic syscall function for linux/nios2 * * Copyright (C) 2004 Microtronix Datacom Ltd. @@ -28,7 +28,7 @@ long syscall(long sysnum, long a, long b, long c, long d, long e, long f) { register long _r2 __asm__("r2")=(long)TRAP_ID_SYSCALL; register long _r3 __asm__("r3")=(long)sysnum; - + register long _r4 __asm__("r4")=(long)(a); register long _r5 __asm__("r5")=(long)(b); register long _r6 __asm__("r6")=(long)(c); diff --git a/libc/sysdeps/linux/powerpc/bits/atomic.h b/libc/sysdeps/linux/powerpc/bits/atomic.h index 977bda72f..d8a4ed33e 100644 --- a/libc/sysdeps/linux/powerpc/bits/atomic.h +++ b/libc/sysdeps/linux/powerpc/bits/atomic.h @@ -50,7 +50,7 @@ # define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ ({ \ unsigned int __tmp, __tmp2; \ - __asm __volatile (" clrldi %1,%1,32\n" \ + __asm__ __volatile__ (" clrldi %1,%1,32\n" \ "1: lwarx %0,0,%2\n" \ " subf. %0,%1,%0\n" \ " bne 2f\n" \ @@ -66,7 +66,7 @@ # define __arch_compare_and_exchange_bool_32_rel(mem, newval, oldval) \ ({ \ unsigned int __tmp, __tmp2; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ " clrldi %1,%1,32\n" \ "1: lwarx %0,0,%2\n" \ " subf. %0,%1,%0\n" \ @@ -88,7 +88,7 @@ # define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \ ({ \ unsigned long __tmp; \ - __asm __volatile ( \ + __asm__ __volatile__ ( \ "1: ldarx %0,0,%1\n" \ " subf. %0,%2,%0\n" \ " bne 2f\n" \ @@ -104,7 +104,7 @@ # define __arch_compare_and_exchange_bool_64_rel(mem, newval, oldval) \ ({ \ unsigned long __tmp; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: ldarx %0,0,%1\n" \ " subf. %0,%2,%0\n" \ " bne 2f\n" \ @@ -121,7 +121,7 @@ ({ \ __typeof (*(mem)) __tmp; \ __typeof (mem) __memp = (mem); \ - __asm __volatile ( \ + __asm__ __volatile__ ( \ "1: ldarx %0,0,%1\n" \ " cmpd %0,%2\n" \ " bne 2f\n" \ @@ -138,7 +138,7 @@ ({ \ __typeof (*(mem)) __tmp; \ __typeof (mem) __memp = (mem); \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: ldarx %0,0,%1\n" \ " cmpd %0,%2\n" \ " bne 2f\n" \ @@ -154,7 +154,7 @@ # define __arch_atomic_exchange_64_acq(mem, value) \ ({ \ __typeof (*mem) __val; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: ldarx %0,0,%2\n" \ " stdcx. %3,0,%2\n" \ " bne- 1b\n" \ @@ -168,7 +168,7 @@ # define __arch_atomic_exchange_64_rel(mem, value) \ ({ \ __typeof (*mem) __val; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: ldarx %0,0,%2\n" \ " stdcx. %3,0,%2\n" \ " bne- 1b" \ @@ -181,7 +181,7 @@ # define __arch_atomic_exchange_and_add_64(mem, value) \ ({ \ __typeof (*mem) __val, __tmp; \ - __asm __volatile ("1: ldarx %0,0,%3\n" \ + __asm__ __volatile__ ("1: ldarx %0,0,%3\n" \ " add %1,%0,%4\n" \ " stdcx. %1,0,%3\n" \ " bne- 1b" \ @@ -194,7 +194,7 @@ # define __arch_atomic_increment_val_64(mem) \ ({ \ __typeof (*(mem)) __val; \ - __asm __volatile ("1: ldarx %0,0,%2\n" \ + __asm__ __volatile__ ("1: ldarx %0,0,%2\n" \ " addi %0,%0,1\n" \ " stdcx. %0,0,%2\n" \ " bne- 1b" \ @@ -207,7 +207,7 @@ # define __arch_atomic_decrement_val_64(mem) \ ({ \ __typeof (*(mem)) __val; \ - __asm __volatile ("1: ldarx %0,0,%2\n" \ + __asm__ __volatile__ ("1: ldarx %0,0,%2\n" \ " subi %0,%0,1\n" \ " stdcx. %0,0,%2\n" \ " bne- 1b" \ @@ -219,7 +219,7 @@ # define __arch_atomic_decrement_if_positive_64(mem) \ ({ int __val, __tmp; \ - __asm __volatile ("1: ldarx %0,0,%3\n" \ + __asm__ __volatile__ ("1: ldarx %0,0,%3\n" \ " cmpdi 0,%0,0\n" \ " addi %1,%0,-1\n" \ " ble 2f\n" \ @@ -273,7 +273,7 @@ # define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ ({ \ unsigned int __tmp; \ - __asm __volatile ( \ + __asm__ __volatile__ ( \ "1: lwarx %0,0,%1\n" \ " subf. %0,%2,%0\n" \ " bne 2f\n" \ @@ -289,7 +289,7 @@ # define __arch_compare_and_exchange_bool_32_rel(mem, newval, oldval) \ ({ \ unsigned int __tmp; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: lwarx %0,0,%1\n" \ " subf. %0,%2,%0\n" \ " bne 2f\n" \ @@ -394,7 +394,7 @@ typedef uintmax_t uatomic_max_t; ({ \ __typeof (*(mem)) __tmp; \ __typeof (mem) __memp = (mem); \ - __asm __volatile ( \ + __asm__ __volatile__ ( \ "1: lwarx %0,0,%1\n" \ " cmpw %0,%2\n" \ " bne 2f\n" \ @@ -411,7 +411,7 @@ typedef uintmax_t uatomic_max_t; ({ \ __typeof (*(mem)) __tmp; \ __typeof (mem) __memp = (mem); \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: lwarx %0,0,%1\n" \ " cmpw %0,%2\n" \ " bne 2f\n" \ @@ -427,7 +427,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_exchange_32_acq(mem, value) \ ({ \ __typeof (*mem) __val; \ - __asm __volatile ( \ + __asm__ __volatile__ ( \ "1: lwarx %0,0,%2\n" \ " stwcx. %3,0,%2\n" \ " bne- 1b\n" \ @@ -441,7 +441,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_exchange_32_rel(mem, value) \ ({ \ __typeof (*mem) __val; \ - __asm __volatile (__ARCH_REL_INSTR "\n" \ + __asm__ __volatile__ (__ARCH_REL_INSTR "\n" \ "1: lwarx %0,0,%2\n" \ " stwcx. %3,0,%2\n" \ " bne- 1b" \ @@ -454,7 +454,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_exchange_and_add_32(mem, value) \ ({ \ __typeof (*mem) __val, __tmp; \ - __asm __volatile ("1: lwarx %0,0,%3\n" \ + __asm__ __volatile__ ("1: lwarx %0,0,%3\n" \ " add %1,%0,%4\n" \ " stwcx. %1,0,%3\n" \ " bne- 1b" \ @@ -467,7 +467,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_increment_val_32(mem) \ ({ \ __typeof (*(mem)) __val; \ - __asm __volatile ("1: lwarx %0,0,%2\n" \ + __asm__ __volatile__ ("1: lwarx %0,0,%2\n" \ " addi %0,%0,1\n" \ " stwcx. %0,0,%2\n" \ " bne- 1b" \ @@ -480,7 +480,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_decrement_val_32(mem) \ ({ \ __typeof (*(mem)) __val; \ - __asm __volatile ("1: lwarx %0,0,%2\n" \ + __asm__ __volatile__ ("1: lwarx %0,0,%2\n" \ " subi %0,%0,1\n" \ " stwcx. %0,0,%2\n" \ " bne- 1b" \ @@ -492,7 +492,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_atomic_decrement_if_positive_32(mem) \ ({ int __val, __tmp; \ - __asm __volatile ("1: lwarx %0,0,%3\n" \ + __asm__ __volatile__ ("1: lwarx %0,0,%3\n" \ " cmpwi 0,%0,0\n" \ " addi %1,%0,-1\n" \ " ble 2f\n" \ diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h index d3c3f911c..bfa67229d 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #if __WORDSIZE == 64 #define kernel_stat kernel_stat64 diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h index 223037545..3f3b93377 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/powerpc/bits/mathinline.h b/libc/sysdeps/linux/powerpc/bits/mathinline.h index e2536a3cc..d1b05f388 100644 --- a/libc/sysdeps/linux/powerpc/bits/mathinline.h +++ b/libc/sysdeps/linux/powerpc/bits/mathinline.h @@ -148,7 +148,7 @@ __NTH (__ieee754_sqrt (double __x)) { /* Volatile is required to prevent the compiler from moving the fsqrt instruction above the branch. */ - __asm __volatile ( + __asm__ __volatile__ ( " fsqrt %0,%1\n" : "=f" (__z) : "f" (__x)); @@ -170,7 +170,7 @@ __NTH (__ieee754_sqrtf (float __x)) { /* Volatile is required to prevent the compiler from moving the fsqrts instruction above the branch. */ - __asm __volatile ( + __asm__ __volatile__ ( " fsqrts %0,%1\n" : "=f" (__z) : "f" (__x)); diff --git a/libc/sysdeps/linux/powerpc/bits/sem.h b/libc/sysdeps/linux/powerpc/bits/sem.h index 1c648cd19..92a7a9043 100644 --- a/libc/sysdeps/linux/powerpc/bits/sem.h +++ b/libc/sysdeps/linux/powerpc/bits/sem.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002 +/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c index e9f8cbef8..cdbadfdf3 100644 --- a/libc/sysdeps/linux/powerpc/pread_write.c +++ b/libc/sysdeps/linux/powerpc/pread_write.c @@ -6,7 +6,7 @@ */ /* Based in part on the files * ./sysdeps/unix/sysv/linux/pwrite.c, - * ./sysdeps/unix/sysv/linux/pread.c, + * ./sysdeps/unix/sysv/linux/pread.c, * sysdeps/posix/pread.c * sysdeps/posix/pwrite.c * from GNU libc 2.2.5, but reworked considerably... @@ -15,26 +15,26 @@ #include <sys/syscall.h> #include <unistd.h> -#ifndef __UCLIBC_HAS_LFS__ +#ifndef __UCLIBC_HAS_LFS__ # define off64_t off_t #endif #ifdef __NR_pread extern __typeof(pread) __libc_pread; -# define __NR___syscall_pread __NR_pread -static inline _syscall4(ssize_t, __syscall_pread, int, fd, +# define __NR___syscall_pread __NR_pread +static __inline__ _syscall4(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, off64_t, offset); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) -{ +{ return(__syscall_pread(fd, buf, count, (off64_t)offset)); } weak_alias(__libc_pread,pread) -# ifdef __UCLIBC_HAS_LFS__ +# ifdef __UCLIBC_HAS_LFS__ extern __typeof(pread64) __libc_pread64; ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) -{ +{ return(__syscall_pread(fd, buf, count, offset)); } weak_alias(__libc_pread64,pread64) @@ -44,20 +44,20 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite extern __typeof(pwrite) __libc_pwrite; -# define __NR___syscall_pwrite __NR_pwrite -static inline _syscall4(ssize_t, __syscall_pwrite, int, fd, +# define __NR___syscall_pwrite __NR_pwrite +static __inline__ _syscall4(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off64_t, offset); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) -{ +{ return(__syscall_pwrite(fd, buf, count, (off64_t)offset)); } weak_alias(__libc_pwrite,pwrite) -# ifdef __UCLIBC_HAS_LFS__ +# ifdef __UCLIBC_HAS_LFS__ extern __typeof(pwrite64) __libc_pwrite64; ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) -{ +{ return(__syscall_pwrite(fd, buf, count, offset)); } weak_alias(__libc_pwrite64,pwrite64) @@ -71,14 +71,14 @@ libc_hidden_proto(read) libc_hidden_proto(write) libc_hidden_proto(lseek) -static ssize_t __fake_pread_write(int fd, void *buf, +static ssize_t __fake_pread_write(int fd, void *buf, size_t count, off_t offset, int do_pwrite) { int save_errno; ssize_t result; off_t old_offset; - /* Since we must not change the file pointer preserve the + /* Since we must not change the file pointer preserve the * value so that we can restore it later. */ if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1) return -1; @@ -95,7 +95,7 @@ static ssize_t __fake_pread_write(int fd, void *buf, result = read(fd, buf, count); } - /* Now we have to restore the position. If this fails we + /* Now we have to restore the position. If this fails we * have to return this as an error. */ save_errno = errno; if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1) @@ -108,24 +108,24 @@ static ssize_t __fake_pread_write(int fd, void *buf, return(result); } -# ifdef __UCLIBC_HAS_LFS__ +# ifdef __UCLIBC_HAS_LFS__ libc_hidden_proto(lseek64) -static ssize_t __fake_pread_write64(int fd, void *buf, +static ssize_t __fake_pread_write64(int fd, void *buf, size_t count, off64_t offset, int do_pwrite) { int save_errno; ssize_t result; off64_t old_offset; - /* Since we must not change the file pointer preserve the + /* Since we must not change the file pointer preserve the * value so that we can restore it later. */ if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1) return -1; /* Set to wanted position. */ - if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1) - return -1; + if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1) + return -1; if (do_pwrite==1) { /* Write the data. */ @@ -155,9 +155,9 @@ ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) } weak_alias(__libc_pread,pread) -# ifdef __UCLIBC_HAS_LFS__ +# ifdef __UCLIBC_HAS_LFS__ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) -{ +{ return(__fake_pread_write64(fd, buf, count, offset, 0)); } weak_alias(__libc_pread64,pread64) @@ -172,9 +172,9 @@ ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) } weak_alias(__libc_pwrite,pwrite) -# ifdef __UCLIBC_HAS_LFS__ +# ifdef __UCLIBC_HAS_LFS__ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) -{ +{ return(__fake_pread_write64(fd, (void*)buf, count, offset, 1)); } weak_alias(__libc_pwrite64,pwrite64) diff --git a/libc/sysdeps/linux/powerpc/sys/procfs.h b/libc/sysdeps/linux/powerpc/sys/procfs.h index d2d597241..118463649 100644 --- a/libc/sysdeps/linux/powerpc/sys/procfs.h +++ b/libc/sysdeps/linux/powerpc/sys/procfs.h @@ -32,9 +32,9 @@ __BEGIN_DECLS -/* These definitions are normally provided by ucontext.h via - asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define - them here. */ +/* These definitions are normally provided by ucontext.h via + asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define + them here. */ #ifndef __PPC64_ELF_H #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ #define ELF_NFPREG 33 /* includes fpscr */ diff --git a/libc/sysdeps/linux/powerpc/sys/ucontext.h b/libc/sysdeps/linux/powerpc/sys/ucontext.h index 9eb50aa96..737512afc 100644 --- a/libc/sysdeps/linux/powerpc/sys/ucontext.h +++ b/libc/sysdeps/linux/powerpc/sys/ucontext.h @@ -62,14 +62,14 @@ typedef struct #else -/* For 64-bit kernels with Altivec support, a machine context is exactly - * a sigcontext. For older kernel (without Altivec) the sigcontext matches - * the mcontext upto but not including the v_regs field. For kernels that - * don't AT_HWCAP or return AT_HWCAP without PPC_FEATURE_HAS_ALTIVEC the +/* For 64-bit kernels with Altivec support, a machine context is exactly + * a sigcontext. For older kernel (without Altivec) the sigcontext matches + * the mcontext upto but not including the v_regs field. For kernels that + * don't AT_HWCAP or return AT_HWCAP without PPC_FEATURE_HAS_ALTIVEC the * v_regs field may not exit and should not be referenced. The v_regd field * can be refernced safely only after verifying that PPC_FEATURE_HAS_ALTIVEC * is set in AT_HWCAP. */ - + /* Number of general registers. */ # define NGREG 48 /* includes r0-r31, nip, msr, lr, etc. */ # define NFPREG 33 /* includes fp0-fp31 &fpscr. */ @@ -79,7 +79,7 @@ typedef unsigned long gregset_t[NGREG]; typedef double fpregset_t[NFPREG]; /* Container for Altivec/VMX Vector Status and Control Register. Only 32-bits - but can only be copied to/from a 128-bit vector register. So we allocated + but can only be copied to/from a 128-bit vector register. So we allocated a whole quadword speedup save/restore. */ typedef struct _libc_vscr { @@ -107,22 +107,22 @@ typedef struct { gregset_t gp_regs; fpregset_t fp_regs; /* - * To maintain compatibility with current implementations the sigcontext is - * extended by appending a pointer (v_regs) to a quadword type (elf_vrreg_t) - * followed by an unstructured (vmx_reserve) field of 69 doublewords. This - * allows the array of vector registers to be quadword aligned independent of - * the alignment of the containing sigcontext or ucontext. It is the - * responsibility of the code setting the sigcontext to set this pointer to - * either NULL (if this processor does not support the VMX feature) or the + * To maintain compatibility with current implementations the sigcontext is + * extended by appending a pointer (v_regs) to a quadword type (elf_vrreg_t) + * followed by an unstructured (vmx_reserve) field of 69 doublewords. This + * allows the array of vector registers to be quadword aligned independent of + * the alignment of the containing sigcontext or ucontext. It is the + * responsibility of the code setting the sigcontext to set this pointer to + * either NULL (if this processor does not support the VMX feature) or the * address of the first quadword within the allocated (vmx_reserve) area. * - * The pointer (v_regs) of vector type (elf_vrreg_t) is essentually - * an array of 34 quadword entries. The entries with - * indexes 0-31 contain the corresponding vector registers. The entry with - * index 32 contains the vscr as the last word (offset 12) within the - * quadword. This allows the vscr to be stored as either a quadword (since - * it must be copied via a vector register to/from storage) or as a word. - * The entry with index 33 contains the vrsave as the first word (offset 0) + * The pointer (v_regs) of vector type (elf_vrreg_t) is essentually + * an array of 34 quadword entries. The entries with + * indexes 0-31 contain the corresponding vector registers. The entry with + * index 32 contains the vscr as the last word (offset 12) within the + * quadword. This allows the vscr to be stored as either a quadword (since + * it must be copied via a vector register to/from storage) or as a word. + * The entry with index 33 contains the vrsave as the first word (offset 0) * within the quadword. */ vrregset_t *v_regs; diff --git a/libc/sysdeps/linux/sh/bits/kernel_stat.h b/libc/sysdeps/linux/sh/bits/kernel_stat.h index 8a29b3f5f..2e88dad82 100644 --- a/libc/sysdeps/linux/sh/bits/kernel_stat.h +++ b/libc/sysdeps/linux/sh/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #include <endian.h> diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h index baccd305e..7d55cf510 100644 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/sh/pread_write.c b/libc/sysdeps/linux/sh/pread_write.c index d043ae651..16c9c6d8a 100644 --- a/libc/sysdeps/linux/sh/pread_write.c +++ b/libc/sysdeps/linux/sh/pread_write.c @@ -35,7 +35,7 @@ #ifdef __NR_pread extern __typeof(pread) __libc_pread; # define __NR___syscall_pread __NR_pread -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -85,7 +85,7 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite extern __typeof(pwrite) __libc_pwrite; # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h index 2e160fcac..671cc8345 100644 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h @@ -9,10 +9,10 @@ * directory of this archive for more details. */ -/* +/* * Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/sh64/sys/ucontext.h b/libc/sysdeps/linux/sh64/sys/ucontext.h index 16feb49a5..74407841a 100644 --- a/libc/sysdeps/linux/sh64/sys/ucontext.h +++ b/libc/sysdeps/linux/sh64/sys/ucontext.h @@ -189,7 +189,7 @@ typedef struct unsigned long long sc_pc; unsigned long long sc_sr; unsigned long long sc_fpscr; - + } mcontext_t; /* Userlevel context. */ diff --git a/libc/sysdeps/linux/sparc/bits/kernel_stat.h b/libc/sysdeps/linux/sparc/bits/kernel_stat.h index ac167fadd..ab85be257 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #if __WORDSIZE == 64 #define kernel_stat kernel_stat64 diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h index 3db603fc7..1b2452446 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h index 9065b0042..fdaa4dee1 100644 --- a/libc/sysdeps/linux/sparc/bits/syscalls.h +++ b/libc/sysdeps/linux/sparc/bits/syscalls.h @@ -110,7 +110,7 @@ __asm__ __volatile__ (__SYSCALL_STRING \ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ : "cc"); \ __SYSCALL_RETURN(type) \ -} +} #undef _syscall5 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ diff --git a/libc/sysdeps/linux/v850/bits/endian.h b/libc/sysdeps/linux/v850/bits/endian.h index 8fdd95520..ae78da373 100644 --- a/libc/sysdeps/linux/v850/bits/endian.h +++ b/libc/sysdeps/linux/v850/bits/endian.h @@ -7,7 +7,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/v850/bits/setjmp.h b/libc/sysdeps/linux/v850/bits/setjmp.h index 93395ade4..c94373787 100644 --- a/libc/sysdeps/linux/v850/bits/setjmp.h +++ b/libc/sysdeps/linux/v850/bits/setjmp.h @@ -7,7 +7,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/v850/clinkage.h b/libc/sysdeps/linux/v850/clinkage.h index 7aef23529..e85d39fb8 100644 --- a/libc/sysdeps/linux/v850/clinkage.h +++ b/libc/sysdeps/linux/v850/clinkage.h @@ -7,7 +7,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/v850/syscall.c b/libc/sysdeps/linux/v850/syscall.c index 614d874f5..dbcc87cec 100644 --- a/libc/sysdeps/linux/v850/syscall.c +++ b/libc/sysdeps/linux/v850/syscall.c @@ -7,7 +7,7 @@ * This file is subject to the terms and conditions of the GNU Lesser * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. - * + * * Written by Miles Bader <miles@gnu.org> */ diff --git a/libc/sysdeps/linux/x86_64/bits/atomic.h b/libc/sysdeps/linux/x86_64/bits/atomic.h index 67a512568..04870cbf5 100644 --- a/libc/sysdeps/linux/x86_64/bits/atomic.h +++ b/libc/sysdeps/linux/x86_64/bits/atomic.h @@ -57,28 +57,28 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgb %b2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgb %b2, %1" \ : "=a" (ret), "=m" (*mem) \ : "q" (newval), "m" (*mem), "0" (oldval)); \ ret; }) #define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgw %w2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgw %w2, %1" \ : "=a" (ret), "=m" (*mem) \ : "r" (newval), "m" (*mem), "0" (oldval)); \ ret; }) #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (*mem) \ : "r" (newval), "m" (*mem), "0" (oldval)); \ ret; }) #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ ({ __typeof (*mem) ret; \ - __asm __volatile (LOCK_PREFIX "cmpxchgq %q2, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "cmpxchgq %q2, %1" \ : "=a" (ret), "=m" (*mem) \ : "r" ((long) (newval)), "m" (*mem), \ "0" ((long) (oldval))); \ @@ -89,19 +89,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ - __asm __volatile ("xchgb %b0, %1" \ + __asm__ __volatile__ ("xchgb %b0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile ("xchgw %w0, %1" \ + __asm__ __volatile__ ("xchgw %w0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile ("xchgl %0, %1" \ + __asm__ __volatile__ ("xchgl %0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else \ - __asm __volatile ("xchgq %q0, %1" \ + __asm__ __volatile__ ("xchgq %q0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" ((long) (newvalue)), "m" (*mem)); \ result; }) @@ -110,19 +110,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_exchange_and_add(mem, value) \ ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "xaddb %b0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddb %b0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "xaddw %w0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddw %w0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "xaddl %0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddl %0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" (value), "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "xaddq %q0, %1" \ + __asm__ __volatile__ (LOCK_PREFIX "xaddq %q0, %1" \ : "=r" (result), "=m" (*mem) \ : "0" ((long) (value)), "m" (*mem)); \ result; }) @@ -134,19 +134,19 @@ typedef uintmax_t uatomic_max_t; else if (__builtin_constant_p (value) && (value) == 1) \ atomic_decrement (mem); \ else if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %1, %0" \ : "=m" (*mem) \ : "ir" (value), "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "addq %q1, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "addq %q1, %0" \ : "=m" (*mem) \ : "ir" ((long) (value)), "m" (*mem)); \ }) @@ -155,19 +155,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_add_negative(mem, value) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "addq %q2, %0; sets %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addq %q2, %0; sets %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" ((long) (value)), "m" (*mem)); \ __result; }) @@ -176,19 +176,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_add_zero(mem, value) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addb %b2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addw %w2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "addl %2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addl %2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" (value), "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "addq %q2, %0; setz %1" \ + __asm__ __volatile__ (LOCK_PREFIX "addq %q2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ : "ir" ((long) (value)), "m" (*mem)); \ __result; }) @@ -196,19 +196,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_increment(mem) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "incb %b0" \ + __asm__ __volatile__ (LOCK_PREFIX "incb %b0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "incw %w0" \ + __asm__ __volatile__ (LOCK_PREFIX "incw %w0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "incl %0" \ + __asm__ __volatile__ (LOCK_PREFIX "incl %0" \ : "=m" (*mem) \ : "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "incq %q0" \ + __asm__ __volatile__ (LOCK_PREFIX "incq %q0" \ : "=m" (*mem) \ : "m" (*mem)); \ }) @@ -217,19 +217,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_increment_and_test(mem) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "incb %b0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "incb %b0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "incw %w0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "incw %w0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "incl %0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "incl %0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "incq %q0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "incq %q0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ __result; }) @@ -237,19 +237,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_decrement(mem) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "decb %b0" \ + __asm__ __volatile__ (LOCK_PREFIX "decb %b0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "decw %w0" \ + __asm__ __volatile__ (LOCK_PREFIX "decw %w0" \ : "=m" (*mem) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "decl %0" \ + __asm__ __volatile__ (LOCK_PREFIX "decl %0" \ : "=m" (*mem) \ : "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "decq %q0" \ + __asm__ __volatile__ (LOCK_PREFIX "decq %q0" \ : "=m" (*mem) \ : "m" (*mem)); \ }) @@ -258,19 +258,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_decrement_and_test(mem) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "decb %b0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decb %b0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "decw %w0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decw %w0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "decl %0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decl %0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ else \ - __asm __volatile (LOCK_PREFIX "decq %q0; sete %1" \ + __asm__ __volatile__ (LOCK_PREFIX "decq %q0; sete %1" \ : "=m" (*mem), "=qm" (__result) \ : "m" (*mem)); \ __result; }) @@ -278,23 +278,23 @@ typedef uintmax_t uatomic_max_t; #define atomic_bit_set(mem, bit) \ (void) ({ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "orb %b2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orb %b2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1L << (bit))); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "orw %w2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orw %w2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1L << (bit))); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "orl %2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orl %2, %0" \ : "=m" (*mem) \ : "m" (*mem), "ir" (1L << (bit))); \ else if (__builtin_constant_p (bit) && (bit) < 32) \ - __asm __volatile (LOCK_PREFIX "orq %2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orq %2, %0" \ : "=m" (*mem) \ : "m" (*mem), "i" (1L << (bit))); \ else \ - __asm __volatile (LOCK_PREFIX "orq %q2, %0" \ + __asm__ __volatile__ (LOCK_PREFIX "orq %q2, %0" \ : "=m" (*mem) \ : "m" (*mem), "r" (1UL << (bit))); \ }) @@ -303,19 +303,19 @@ typedef uintmax_t uatomic_max_t; #define atomic_bit_test_set(mem, bit) \ ({ unsigned char __result; \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "btsb %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsb %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "btsw %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsw %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else if (sizeof (*mem) == 4) \ - __asm __volatile (LOCK_PREFIX "btsl %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsl %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ else \ - __asm __volatile (LOCK_PREFIX "btsq %3, %1; setc %0" \ + __asm__ __volatile__ (LOCK_PREFIX "btsq %3, %1; setc %0" \ : "=q" (__result), "=m" (*mem) \ : "m" (*mem), "ir" (bit)); \ __result; }) diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h b/libc/sysdeps/linux/x86_64/bits/kernel_stat.h index a2af2cd37..7dca5ffbb 100644 --- a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h +++ b/libc/sysdeps/linux/x86_64/bits/kernel_stat.h @@ -1,4 +1,4 @@ -/* Ripped from linux/include/asm-x86_64/stat.h +/* Ripped from linux/include/asm-x86_64/stat.h * and renamed 'struct stat' to 'struct kernel_stat' */ #ifndef _ASM_X86_64_STAT_H diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h index 060660cf9..73f6ffb54 100644 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/x86_64/bits/syscalls.h b/libc/sysdeps/linux/x86_64/bits/syscalls.h index 7431d6d7f..80f42596a 100644 --- a/libc/sysdeps/linux/x86_64/bits/syscalls.h +++ b/libc/sysdeps/linux/x86_64/bits/syscalls.h @@ -5,7 +5,7 @@ #endif /* - Some of the sneaky macros in the code were taken from + Some of the sneaky macros in the code were taken from glibc-2.2.5/sysdeps/unix/sysv/linux/x86_64/sysdep.h */ @@ -48,7 +48,7 @@ return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \ -} +} #undef _syscall5 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h index 6afb3a697..26da9281b 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h @@ -5,8 +5,8 @@ #error bits/kernel_stat.h is for internal uClibc use only! #endif -/* This file provides whatever this particular arch's kernel thinks - * struct kernel_stat should look like... It turns out each arch has a +/* This file provides whatever this particular arch's kernel thinks + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ #define STAT_HAVE_NSEC 1 diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h index f392ba755..44f1075f7 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h @@ -1,6 +1,6 @@ /* Note that we use the exact same include guard #define names - * as asm/posix_types.h. This will avoid gratuitous conflicts - * with the posix_types.h kernel header, and will ensure that + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that * our private content, and not the kernel header, will win. * -Erik */ diff --git a/libc/sysdeps/linux/xtensa/bits/syscalls.h b/libc/sysdeps/linux/xtensa/bits/syscalls.h index e0506e4cc..a59a8052a 100644 --- a/libc/sysdeps/linux/xtensa/bits/syscalls.h +++ b/libc/sysdeps/linux/xtensa/bits/syscalls.h @@ -5,7 +5,7 @@ #endif /* - Some of the sneaky macros in the code were taken from + Some of the sneaky macros in the code were taken from glibc .../sysdeps/unix/sysv/linux/xtensa/sysdep.h */ @@ -123,7 +123,7 @@ #define C_DECL_ARGS_5(t, v, args...) t v, C_DECL_ARGS_4(args) #define C_DECL_ARGS_6(t, v, args...) t v, C_DECL_ARGS_5(args) -#define C_ARGS_0() +#define C_ARGS_0() #define C_ARGS_1(t, v) v #define C_ARGS_2(t, v, args...) v, C_ARGS_1 (args) #define C_ARGS_3(t, v, args...) v, C_ARGS_2 (args) diff --git a/libc/sysdeps/linux/xtensa/fork.c b/libc/sysdeps/linux/xtensa/fork.c index 034844122..b06d934fb 100644 --- a/libc/sysdeps/linux/xtensa/fork.c +++ b/libc/sysdeps/linux/xtensa/fork.c @@ -5,7 +5,7 @@ * Copyright (C) 2007 Tensilica Inc. * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ + */ #include <unistd.h> #include <sys/syscall.h> diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c index 9e8813210..40d0f0324 100644 --- a/libc/sysdeps/linux/xtensa/pread_write.c +++ b/libc/sysdeps/linux/xtensa/pread_write.c @@ -31,7 +31,7 @@ extern __typeof(pwrite64) __libc_pwrite64; # define __NR___syscall_pread __NR_pread /* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -56,7 +56,7 @@ weak_alias(__libc_pread64,pread64) # define __NR___syscall_pwrite __NR_pwrite /* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/xtensa/sigaction.c b/libc/sysdeps/linux/xtensa/sigaction.c index 60d915c56..790a8f21f 100644 --- a/libc/sysdeps/linux/xtensa/sigaction.c +++ b/libc/sysdeps/linux/xtensa/sigaction.c @@ -5,7 +5,7 @@ * Copyright (C) 2007, 2008 Tensilica Inc. * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ + */ #include <errno.h> #include <signal.h> @@ -13,13 +13,13 @@ #include <string.h> #include <bits/kernel_sigaction.h> -#define SA_RESTORER 0x04000000 +#define SA_RESTORER 0x04000000 extern void __default_sa_restorer (void); /* Experimentally off - libc_hidden_proto(memcpy) */ -int __libc_sigaction (int signum, const struct sigaction *act, +int __libc_sigaction (int signum, const struct sigaction *act, struct sigaction *oldact) { struct kernel_sigaction kact, koldact; diff --git a/libc/termios/tcgetattr.c b/libc/termios/tcgetattr.c index a5a5df6b5..26554b6e5 100644 --- a/libc/termios/tcgetattr.c +++ b/libc/termios/tcgetattr.c @@ -61,9 +61,9 @@ int tcgetattr (int fd, struct termios *termios_p) memset (mempcpy (&termios_p->c_cc[0], &k_termios.c_cc[0], __KERNEL_NCCS * sizeof (cc_t)), _POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t)); -#if 0 +#if 0 memset ( (memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0], - __KERNEL_NCCS * sizeof (cc_t)) + (__KERNEL_NCCS * sizeof (cc_t))) , + __KERNEL_NCCS * sizeof (cc_t)) + (__KERNEL_NCCS * sizeof (cc_t))) , _POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t)); #endif } else { diff --git a/libc/unistd/daemon.c b/libc/unistd/daemon.c index 895e8fca0..4af0690b2 100644 --- a/libc/unistd/daemon.c +++ b/libc/unistd/daemon.c @@ -13,8 +13,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> + * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> * * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/libc/unistd/fpathconf.c b/libc/unistd/fpathconf.c index f3e2ffe83..d7378630d 100644 --- a/libc/unistd/fpathconf.c +++ b/libc/unistd/fpathconf.c @@ -32,7 +32,7 @@ //#include "linux_fsinfo.h" libc_hidden_proto(fstat) -#if !defined __UCLIBC_LINUX_SPECIFIC__ + #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) __THROW __nonnull ((2)); @@ -44,7 +44,7 @@ extern int fstatfs (int __fildes, struct statfs *__buf) # define fstatfs fstatfs64 # endif #endif -#endif + extern __typeof(fstatfs) __libc_fstatfs; libc_hidden_proto(__libc_fstatfs) @@ -54,12 +54,12 @@ libc_hidden_proto(__libc_fstatfs) /* Get file-specific information about descriptor FD. */ long int fpathconf(int fd, int name) -{ +{ if (fd < 0) { __set_errno (EBADF); return -1; - } + } if (name == _PC_LINK_MAX) { @@ -211,7 +211,7 @@ long int fpathconf(int fd, int name) #endif case _PC_ASYNC_IO: -#if defined _POSIX_ASYNC_IO && defined __UCLIBC_HAS_LFS__ +#if defined _POSIX_ASYNC_IO && defined __UCLIBC_HAS_LFS__ { /* AIO is only allowed on regular files and block devices. */ struct stat st; diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c index 73d7a7e38..c22dd9ffb 100644 --- a/libc/unistd/getopt-susv3.c +++ b/libc/unistd/getopt-susv3.c @@ -84,7 +84,7 @@ int getopt(int argc, char * const argv[], const char *optstring) retval = '?'; goto BAD; } - + if (s[1] == ':') { /* Option takes an arg? */ if (o[1]) { /* No space between option and arg? */ optarg = (char *)(o + 1); diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c index 754e86f25..ac005e4f8 100644 --- a/libc/unistd/getopt.c +++ b/libc/unistd/getopt.c @@ -25,7 +25,7 @@ * Modified for uClibc by Manuel Novoa III on 1/5/01. * Modified once again for uClibc by Erik Andersen 8/7/02 */ - + /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. Ditto for AIX 3.2 and <stdlib.h>. */ #ifndef _NO_PROTO @@ -166,7 +166,7 @@ int optopt = '?'; static struct _getopt_data getopt_data; - + #ifndef __GNU_LIBRARY__ /* Avoid depending on library functions or files @@ -177,7 +177,7 @@ extern char *getenv (); #endif #endif /* not __GNU_LIBRARY__ */ - + #ifdef _LIBC /* Stored original parameters. XXX This is no good solution. We should rather copy the args so @@ -359,7 +359,7 @@ _getopt_initialize (attribute_unused int argc, attribute_unused char *const *arg return optstring; } - + /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. diff --git a/libc/unistd/getopt_int.h b/libc/unistd/getopt_int.h index 5637c109f..a871785d1 100644 --- a/libc/unistd/getopt_int.h +++ b/libc/unistd/getopt_int.h @@ -26,7 +26,7 @@ extern int _getopt_internal (int ___argc, char *const *___argv, const struct option *__longopts, int *__longind, int __long_only) attribute_hidden; - + /* Reentrant versions which can handle parsing multiple argument vectors at the same time. */ diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c index 5f5b787c2..1bf143daf 100644 --- a/libc/unistd/usershell.c +++ b/libc/unistd/usershell.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * This version has been hevily modified for use with uClibc - * November 2002, Erik Andersen <andersen@codepoet.org> + * November 2002, Erik Andersen <andersen@codepoet.org> */ #include <sys/param.h> diff --git a/libcrypt/des.c b/libcrypt/des.c index 502dc2819..eb1e13fec 100644 --- a/libcrypt/des.c +++ b/libcrypt/des.c @@ -82,8 +82,8 @@ static u_int32_t old_salt; static u_int32_t old_rawkey0, old_rawkey1; -/* Static stuff that stays resident and doesn't change after - * being initialized, and therefore doesn't need to be made +/* Static stuff that stays resident and doesn't change after + * being initialized, and therefore doesn't need to be made * reentrant. */ static u_char init_perm[64], final_perm[64]; static u_char m_sbox[4][4096]; @@ -195,7 +195,7 @@ static const u_int32_t bits32[32] = static const u_char bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; -static int +static int ascii_to_bin(char ch) { if (ch > 'z') @@ -699,7 +699,7 @@ char *__des_crypt(const unsigned char *key, const unsigned char *setting) */ output[9] = '\0'; p = (u_char *)output + strlen(output); - } else + } else #endif { /* diff --git a/libcrypt/md5.c b/libcrypt/md5.c index f7ddc77cc..ab5548c0a 100644 --- a/libcrypt/md5.c +++ b/libcrypt/md5.c @@ -188,7 +188,7 @@ static void __md5_Init (struct MD5Context *context) context->state[3] = 0x10325476; } -/* +/* * MD5 block update operation. Continues an MD5 message-digest * operation, processing another message block, and updating the * context. diff --git a/libm/powerpc/e500/fpu/fedisblxcpt.c b/libm/powerpc/e500/fpu/fedisblxcpt.c index d2c5caba7..aeca87bc6 100644 --- a/libm/powerpc/e500/fpu/fedisblxcpt.c +++ b/libm/powerpc/e500/fpu/fedisblxcpt.c @@ -31,15 +31,15 @@ fedisableexcept (int excepts) INTERNAL_SYSCALL (prctl, err, 2, PR_GET_FPEXC, &pflags); /* Save old enable bits. */ - if (pflags & PR_FP_EXC_OVF) + if (pflags & PR_FP_EXC_OVF) result |= FE_OVERFLOW; - if (pflags & PR_FP_EXC_UND) + if (pflags & PR_FP_EXC_UND) result |= FE_UNDERFLOW; - if (pflags & PR_FP_EXC_INV) + if (pflags & PR_FP_EXC_INV) result |= FE_INVALID; - if (pflags & PR_FP_EXC_DIV) + if (pflags & PR_FP_EXC_DIV) result |= FE_DIVBYZERO; - if (pflags & PR_FP_EXC_RES) + if (pflags & PR_FP_EXC_RES) result |= FE_INEXACT; if (excepts & FE_INEXACT) diff --git a/libm/powerpc/e500/fpu/feenablxcpt.c b/libm/powerpc/e500/fpu/feenablxcpt.c index 4f00a918d..999fdd734 100644 --- a/libm/powerpc/e500/fpu/feenablxcpt.c +++ b/libm/powerpc/e500/fpu/feenablxcpt.c @@ -31,15 +31,15 @@ feenableexcept (int excepts) INTERNAL_SYSCALL (prctl, err, 2, PR_GET_FPEXC, &pflags); /* Save old enable bits. */ - if (pflags & PR_FP_EXC_OVF) + if (pflags & PR_FP_EXC_OVF) result |= FE_OVERFLOW; - if (pflags & PR_FP_EXC_UND) + if (pflags & PR_FP_EXC_UND) result |= FE_UNDERFLOW; - if (pflags & PR_FP_EXC_INV) + if (pflags & PR_FP_EXC_INV) result |= FE_INVALID; - if (pflags & PR_FP_EXC_DIV) + if (pflags & PR_FP_EXC_DIV) result |= FE_DIVBYZERO; - if (pflags & PR_FP_EXC_RES) + if (pflags & PR_FP_EXC_RES) result |= FE_INEXACT; if (excepts & FE_INEXACT) diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c index 79409675f..239b821f1 100644 --- a/libpthread/linuxthreads.old/cancel.c +++ b/libpthread/linuxthreads.old/cancel.c @@ -101,7 +101,7 @@ int pthread_cancel(pthread_t thread) /* If the thread has registered an extrication interface, then invoke the interface. If it returns 1, then we succeeded in dequeuing the thread from whatever waiting object it was enqueued - with. In that case, it is our responsibility to wake it up. + with. In that case, it is our responsibility to wake it up. And also to set the p_woken_by_cancel flag so the woken thread can tell that it was woken by cancellation. */ @@ -122,7 +122,7 @@ int pthread_cancel(pthread_t thread) if (dorestart) restart(th); - else + else kill(pid, __pthread_sig_cancel); return 0; diff --git a/libpthread/linuxthreads.old/debug.h b/libpthread/linuxthreads.old/debug.h index 94b7c084b..76779dad9 100644 --- a/libpthread/linuxthreads.old/debug.h +++ b/libpthread/linuxthreads.old/debug.h @@ -8,15 +8,15 @@ ** debugging on, add -DDEBUG_PT to CFLAGS. It was added to the original ** distribution of linuxthreads. ** -** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU Library General Public License -** as published by the Free Software Foundation; either version 2 -** of the License, or (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU Library General Public License for more details. +** This program is free software; you can redistribute it and/or +** modify it under the terms of the GNU Library General Public License +** as published by the Free Software Foundation; either version 2 +** of the License, or (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU Library General Public License for more details. ** ****************************************************************************/ diff --git a/libpthread/linuxthreads.old/internals.h b/libpthread/linuxthreads.old/internals.h index ab227d6cc..38290a5fe 100644 --- a/libpthread/linuxthreads.old/internals.h +++ b/libpthread/linuxthreads.old/internals.h @@ -34,7 +34,7 @@ #include <bits/uClibc_locale.h> #endif /* __UCLIBC_HAS_XLOCALE__ */ -/* Use a funky version in a probably vein attempt at preventing gdb +/* Use a funky version in a probably vein attempt at preventing gdb * from dlopen()'ing glibc's libthread_db library... */ #define STRINGIFY(s) STRINGIFY2 (s) #define STRINGIFY2(s) #s @@ -305,14 +305,14 @@ extern volatile pthread_descr __pthread_last_event; /* Return the handle corresponding to a thread id */ -static inline pthread_handle thread_handle(pthread_t id) +static __inline__ pthread_handle thread_handle(pthread_t id) { return &__pthread_handles[id % PTHREAD_THREADS_MAX]; } /* Validate a thread handle. Must have acquired h->h_spinlock before. */ -static inline int invalid_handle(pthread_handle h, pthread_t id) +static __inline__ int invalid_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id; } @@ -381,8 +381,8 @@ extern size_t __pagesize; extern pthread_descr __pthread_find_self (void) __attribute__ ((const)); -static inline pthread_descr thread_self (void) __attribute__ ((const)); -static inline pthread_descr thread_self (void) +static __inline__ pthread_descr thread_self (void) __attribute__ ((const)); +static __inline__ pthread_descr thread_self (void) { #ifdef THREAD_SELF return THREAD_SELF; diff --git a/libpthread/linuxthreads.old/join.c b/libpthread/linuxthreads.old/join.c index 250b47166..a46d0b68d 100644 --- a/libpthread/linuxthreads.old/join.c +++ b/libpthread/linuxthreads.old/join.c @@ -151,7 +151,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) /* If not terminated yet, suspend ourselves. */ if (! th->p_terminated) { /* Register extrication interface */ - __pthread_set_own_extricate_if(self, &extr); + __pthread_set_own_extricate_if(self, &extr); if (!(THREAD_GETMEM(self, p_canceled) && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)) th->p_joining = self; @@ -160,7 +160,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) __pthread_unlock(&handle->h_lock); if (already_canceled) { - __pthread_set_own_extricate_if(self, 0); + __pthread_set_own_extricate_if(self, 0); __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } @@ -168,7 +168,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) suspend(self); PDEBUG("after suspend\n"); /* Deregister extrication interface */ - __pthread_set_own_extricate_if(self, 0); + __pthread_set_own_extricate_if(self, 0); /* This is a cancellation point */ if (THREAD_GETMEM(self, p_woken_by_cancel) diff --git a/libpthread/linuxthreads.old/manager.c b/libpthread/linuxthreads.old/manager.c index fc39b1e25..69fdd1cb5 100644 --- a/libpthread/linuxthreads.old/manager.c +++ b/libpthread/linuxthreads.old/manager.c @@ -76,7 +76,7 @@ volatile pthread_descr __pthread_last_event; /* Stack segment numbers are also indices into the __pthread_handles array. */ /* Stack segment number 0 is reserved for the initial thread. */ -static inline pthread_descr thread_segment(int seg) +static __inline__ pthread_descr thread_segment(int seg) { return (pthread_descr)(THREAD_STACK_START_ADDRESS - (seg - 1) * STACK_SIZE) - 1; @@ -206,7 +206,7 @@ int attribute_noreturn __pthread_manager(void *arg) pthread_handle_free(request.req_args.free.thread_id); break; case REQ_PROCESS_EXIT: - PDEBUG("got REQ_PROCESS_EXIT from %d, exit code = %d\n", + PDEBUG("got REQ_PROCESS_EXIT from %d, exit code = %d\n", request.req_thread, request.req_args.exit.code); pthread_handle_exit(request.req_thread, request.req_args.exit.code); @@ -414,7 +414,7 @@ static int pthread_allocate_stack(const pthread_attr_t *attr, { stacksize = attr->__stacksize; } - + /* malloc a stack - memory from the bottom up */ if ((new_thread_bottom = malloc(stacksize)) == NULL) { @@ -430,7 +430,7 @@ static int pthread_allocate_stack(const pthread_attr_t *attr, * * ^ +------------------------+ * | | pthread_descr struct | - * | +------------------------+ <- new_thread + * | +------------------------+ <- new_thread * malloc block | | | * | | thread stack | * | | | @@ -443,18 +443,18 @@ static int pthread_allocate_stack(const pthread_attr_t *attr, new_thread = ((pthread_descr) ((int)(new_thread_bottom + stacksize) & -sizeof(void*))) - 1; guardaddr = NULL; guardsize = 0; - + PDEBUG("thread stack: bos=%p, tos=%p\n", new_thread_bottom, new_thread); - + /* check the initial thread stack boundaries so they don't overlap */ NOMMU_INITIAL_THREAD_BOUNDS((char *) new_thread, (char *) new_thread_bottom); - - PDEBUG("initial stack: bos=%p, tos=%p\n", __pthread_initial_thread_bos, + + PDEBUG("initial stack: bos=%p, tos=%p\n", __pthread_initial_thread_bos, __pthread_initial_thread_tos); - + /* on non-MMU systems we always have non-standard stack frames */ __pthread_nonstandard_stacks = 1; - + #endif /* __ARCH_USE_MMU__ */ } @@ -567,7 +567,7 @@ static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr, /* ******************************************************** */ /* This code was moved from below to cope with running threads * on uClinux systems. See comment below... - * Insert new thread in doubly linked list of active threads */ + * Insert new thread in doubly linked list of active threads */ new_thread->p_prevlive = __pthread_main_thread; new_thread->p_nextlive = __pthread_main_thread->p_nextlive; __pthread_main_thread->p_nextlive->p_prevlive = new_thread; @@ -640,9 +640,9 @@ static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr, } /* Check if cloning succeeded */ if (pid == -1) { - /******************************************************** + /******************************************************** * Code inserted to remove the thread from our list of active - * threads in case of failure (needed to cope with uClinux), + * threads in case of failure (needed to cope with uClinux), * See comment below. */ new_thread->p_nextlive->p_prevlive = new_thread->p_prevlive; new_thread->p_prevlive->p_nextlive = new_thread->p_nextlive; diff --git a/libpthread/linuxthreads.old/oldsemaphore.c b/libpthread/linuxthreads.old/oldsemaphore.c index 178affa1b..2a7b40acc 100644 --- a/libpthread/linuxthreads.old/oldsemaphore.c +++ b/libpthread/linuxthreads.old/oldsemaphore.c @@ -35,7 +35,7 @@ typedef struct { /* Maximum value the semaphore can have. */ #define SEM_VALUE_MAX ((int) ((~0u) >> 1)) -static inline int sem_compare_and_swap(old_sem_t *sem, long oldval, long newval) +static __inline__ int sem_compare_and_swap(old_sem_t *sem, long oldval, long newval) { return compare_and_swap(&sem->sem_status, oldval, newval, &sem->sem_spinlock); } @@ -92,7 +92,7 @@ int __old_sem_wait(old_sem_t * sem) while (1) { /* Register extrication interface */ - __pthread_set_own_extricate_if(self, &extr); + __pthread_set_own_extricate_if(self, &extr); do { oldstatus = sem->sem_status; if ((oldstatus & 1) && (oldstatus != 1)) @@ -105,12 +105,12 @@ int __old_sem_wait(old_sem_t * sem) while (! sem_compare_and_swap(sem, oldstatus, newstatus)); if (newstatus & 1) { /* We got the semaphore. */ - __pthread_set_own_extricate_if(self, 0); + __pthread_set_own_extricate_if(self, 0); return 0; } /* Wait for sem_post or cancellation */ suspend(self); - __pthread_set_own_extricate_if(self, 0); + __pthread_set_own_extricate_if(self, 0); /* This is a cancellation point */ if (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE) { diff --git a/libpthread/linuxthreads.old/ptfork.c b/libpthread/linuxthreads.old/ptfork.c index 184508a3d..c34ea8104 100644 --- a/libpthread/linuxthreads.old/ptfork.c +++ b/libpthread/linuxthreads.old/ptfork.c @@ -73,7 +73,7 @@ int pthread_atfork(void (*prepare)(void), } //strong_alias (__pthread_atfork, pthread_atfork) -static inline void pthread_call_handlers(struct handler_list * list) +static __inline__ void pthread_call_handlers(struct handler_list * list) { for (/*nothing*/; list != NULL; list = list->next) (list->handler)(); } diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c index 53b531465..35de4b731 100644 --- a/libpthread/linuxthreads.old/pthread.c +++ b/libpthread/linuxthreads.old/pthread.c @@ -386,7 +386,7 @@ static int *__libc_multiple_threads_ptr; startup of the C library. */ void __pthread_initialize_minimal(void) { - /* If we have special thread_self processing, initialize + /* If we have special thread_self processing, initialize * that for the main thread now. */ #ifdef INIT_THREAD_SELF INIT_THREAD_SELF(&__pthread_initial_thread, 0); @@ -434,7 +434,7 @@ static void pthread_initialize(void) { /* uClibc-specific stdio initialization for threads. */ FILE *fp; - + _stdio_user_locking = 0; /* 2 if threading not initialized */ for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) { if (fp->__user_locking != 1) { @@ -458,7 +458,7 @@ static void pthread_initialize(void) } #else /* For non-MMU assume __pthread_initial_thread_tos at upper page boundary, and - * __pthread_initial_thread_bos at address 0. These bounds are refined as we + * __pthread_initial_thread_bos at address 0. These bounds are refined as we * malloc other stack frames such that they don't overlap. -StS */ __pthread_initial_thread_tos = @@ -674,7 +674,7 @@ pthread_t pthread_self(void) return THREAD_GETMEM(self, p_tid); } libpthread_hidden_def (pthread_self) - + int pthread_equal(pthread_t thread1, pthread_t thread2) { return thread1 == thread2; @@ -820,7 +820,7 @@ static void pthread_handle_sigcancel(int sig) { pthread_descr self = thread_self(); sigjmp_buf * jmpbuf; - + if (self == &__pthread_manager_thread) { diff --git a/libpthread/linuxthreads.old/queue.h b/libpthread/linuxthreads.old/queue.h index c7f8471b9..01d18d16e 100644 --- a/libpthread/linuxthreads.old/queue.h +++ b/libpthread/linuxthreads.old/queue.h @@ -18,7 +18,7 @@ linked through their p_nextwaiting field. The lists are kept sorted by decreasing priority, and then decreasing waiting time. */ -static inline void enqueue(pthread_descr * q, pthread_descr th) +static __inline__ void enqueue(pthread_descr * q, pthread_descr th) { int prio = th->p_priority; for (; *q != NULL; q = &((*q)->p_nextwaiting)) { @@ -31,7 +31,7 @@ static inline void enqueue(pthread_descr * q, pthread_descr th) *q = th; } -static inline pthread_descr dequeue(pthread_descr * q) +static __inline__ pthread_descr dequeue(pthread_descr * q) { pthread_descr th; th = *q; @@ -42,7 +42,7 @@ static inline pthread_descr dequeue(pthread_descr * q) return th; } -static inline int remove_from_queue(pthread_descr * q, pthread_descr th) +static __inline__ int remove_from_queue(pthread_descr * q, pthread_descr th) { for (; *q != NULL; q = &((*q)->p_nextwaiting)) { if (*q == th) { @@ -54,7 +54,7 @@ static inline int remove_from_queue(pthread_descr * q, pthread_descr th) return 0; } -static inline int queue_is_empty(pthread_descr * q) +static __inline__ int queue_is_empty(pthread_descr * q) { return *q == NULL; } diff --git a/libpthread/linuxthreads.old/restart.h b/libpthread/linuxthreads.old/restart.h index 687d92fae..7d63a7022 100644 --- a/libpthread/linuxthreads.old/restart.h +++ b/libpthread/linuxthreads.old/restart.h @@ -18,7 +18,7 @@ /* Primitives for controlling thread execution */ -static inline void restart(pthread_descr th) +static __inline__ void restart(pthread_descr th) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -28,7 +28,7 @@ static inline void restart(pthread_descr th) #endif } -static inline void suspend(pthread_descr self) +static __inline__ void suspend(pthread_descr self) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -38,7 +38,7 @@ static inline void suspend(pthread_descr self) #endif } -static inline int timedsuspend(pthread_descr self, +static __inline__ int timedsuspend(pthread_descr self, const struct timespec *abstime) { /* See pthread.c */ diff --git a/libpthread/linuxthreads.old/rwlock.c b/libpthread/linuxthreads.old/rwlock.c index e25ab3ea0..eaf71e77c 100644 --- a/libpthread/linuxthreads.old/rwlock.c +++ b/libpthread/linuxthreads.old/rwlock.c @@ -60,7 +60,7 @@ rwlock_add_to_list(pthread_descr self, pthread_rwlock_t *rwlock) { pthread_readlock_info *info = self->p_readlock_free; - if (info != NULL) + if (info != NULL) self->p_readlock_free = info->pr_next; else info = malloc(sizeof *info); @@ -100,7 +100,7 @@ rwlock_remove_from_list(pthread_descr self, pthread_rwlock_t *rwlock) return info; } } - + return NULL; } @@ -137,7 +137,7 @@ rwlock_can_rdlock(pthread_rwlock_t *rwlock, int have_lock_already) * This function helps support brain-damaged recursive read locking * semantics required by Unix 98, while maintaining write priority. * This basically determines whether this thread already holds a read lock - * already. It returns 1 if so, otherwise it returns 0. + * already. It returns 1 if so, otherwise it returns 0. * * If the thread has any ``untracked read locks'' then it just assumes * that this lock is among them, just to be safe, and returns 1. @@ -259,7 +259,7 @@ pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) else self->p_untracked_readlock_count++; } - + return 0; } @@ -277,7 +277,7 @@ pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) __pthread_lock (&rwlock->__rw_lock, self); /* 0 is passed to here instead of have_lock_already. - This is to meet Single Unix Spec requirements: + This is to meet Single Unix Spec requirements: if writers are waiting, pthread_rwlock_tryrdlock does not acquire a read lock, even if the caller has one or more read locks already. */ @@ -300,7 +300,7 @@ pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) self->p_untracked_readlock_count++; } } - + return retval; } diff --git a/libpthread/linuxthreads.old/spinlock.c b/libpthread/linuxthreads.old/spinlock.c index f5999e4d2..24c81d47e 100644 --- a/libpthread/linuxthreads.old/spinlock.c +++ b/libpthread/linuxthreads.old/spinlock.c @@ -30,11 +30,11 @@ libpthread_hidden_proto(nanosleep) static void __pthread_acquire(int * spinlock); -static inline void __pthread_release(int * spinlock) +static __inline__ void __pthread_release(int * spinlock) { WRITE_MEMORY_BARRIER(); *spinlock = __LT_SPINLOCK_INIT; - __asm __volatile__ ("" : "=m" (*spinlock) : "m" (*spinlock)); + __asm__ __volatile__ ("" : "=m" (*spinlock) : "m" (*spinlock)); } @@ -110,12 +110,12 @@ void internal_function __pthread_lock(struct _pthread_fastlock * lock, #ifdef BUSY_WAIT_NOP BUSY_WAIT_NOP; #endif - __asm __volatile ("" : "=m" (lock->__status) : "m" (lock->__status)); + __asm__ __volatile__ ("" : "=m" (lock->__status) : "m" (lock->__status)); } lock->__spinlock += (spin_count - lock->__spinlock) / 8; } -#endif +#endif again: diff --git a/libpthread/linuxthreads.old/spinlock.h b/libpthread/linuxthreads.old/spinlock.h index 0ec40c57c..7117898f7 100644 --- a/libpthread/linuxthreads.old/spinlock.h +++ b/libpthread/linuxthreads.old/spinlock.h @@ -39,7 +39,7 @@ extern int __pthread_has_cas; extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { if (__builtin_expect (__pthread_has_cas, 1)) @@ -56,7 +56,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, #ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS -static inline int +static __inline__ int compare_and_swap_with_release_semantics (long * ptr, long oldval, long newval, int * spinlock) { @@ -66,7 +66,7 @@ compare_and_swap_with_release_semantics (long * ptr, long oldval, #endif -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __compare_and_swap(ptr, oldval, newval); @@ -77,7 +77,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __pthread_compare_and_swap(ptr, oldval, newval, spinlock); @@ -96,13 +96,13 @@ extern void internal_function __pthread_lock(struct _pthread_fastlock * lock, pthread_descr self); extern int __pthread_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -133,13 +133,13 @@ extern int __pthread_alt_timedlock(struct _pthread_fastlock * lock, extern void __pthread_alt_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_alt_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_alt_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) /* Operations on pthread_atomic, which is defined in internals.h */ -static inline long atomic_increment(struct pthread_atomic *pa) +static __inline__ long atomic_increment(struct pthread_atomic *pa) { long oldval; @@ -184,7 +184,7 @@ static inline long atomic_increment(struct pthread_atomic *pa) } -static inline long atomic_decrement(struct pthread_atomic *pa) +static __inline__ long atomic_decrement(struct pthread_atomic *pa) { long oldval; @@ -196,7 +196,7 @@ static inline long atomic_decrement(struct pthread_atomic *pa) } -static inline void +static __inline__ void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. diff --git a/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h index 638952846..fb1cc0e6d 100644 --- a/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h @@ -33,7 +33,7 @@ /* Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Maciej W. Rozycki <macro@ds2.pg.gda.pl>, 2000. */ -static inline int +static __inline__ int __NTH (_test_and_set (int *p, int v)) { int r, t; diff --git a/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c index ea4881322..bd2c401fc 100644 --- a/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c +++ b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c @@ -26,7 +26,7 @@ /* Spinlock implementation; required. */ -/* The SH5 does not have a suitable test-and-set instruction (SWAP only +/* The SH5 does not have a suitable test-and-set instruction (SWAP only operates on an aligned quad word). So we use the SH4 version instead. This must be seperately compiled in SHcompact mode, so it cannot be inline. */ diff --git a/libpthread/linuxthreads.old_db/thread_dbP.h b/libpthread/linuxthreads.old_db/thread_dbP.h index f08c43206..b120c42b3 100644 --- a/libpthread/linuxthreads.old_db/thread_dbP.h +++ b/libpthread/linuxthreads.old_db/thread_dbP.h @@ -89,7 +89,7 @@ struct agent_list extern struct agent_list *__td_agent_list attribute_hidden; /* Function used to test for correct thread agent pointer. */ -static inline int +static __inline__ int ta_ok (const td_thragent_t *ta) { struct agent_list *runp = __td_agent_list; diff --git a/libpthread/linuxthreads/descr.h b/libpthread/linuxthreads/descr.h index 0f50d4deb..24ec30b41 100644 --- a/libpthread/linuxthreads/descr.h +++ b/libpthread/linuxthreads/descr.h @@ -244,8 +244,8 @@ extern int __pthread_nonstandard_stacks; extern pthread_descr __pthread_find_self (void) __attribute__ ((pure)); -static inline pthread_descr thread_self (void) __attribute__ ((pure)); -static inline pthread_descr thread_self (void) +static __inline__ pthread_descr thread_self (void) __attribute__ ((pure)); +static __inline__ pthread_descr thread_self (void) { #ifdef THREAD_SELF return THREAD_SELF; diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h index 8e270e37a..ecb7b03dd 100644 --- a/libpthread/linuxthreads/internals.h +++ b/libpthread/linuxthreads/internals.h @@ -174,19 +174,19 @@ extern int __pthread_smp_kernel; /* Return the handle corresponding to a thread id */ -static inline pthread_handle thread_handle(pthread_t id) +static __inline__ pthread_handle thread_handle(pthread_t id) { return &__pthread_handles[id % PTHREAD_THREADS_MAX]; } /* Validate a thread handle. Must have acquired h->h_spinlock before. */ -static inline int invalid_handle(pthread_handle h, pthread_t id) +static __inline__ int invalid_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id || h->h_descr->p_terminated; } -static inline int nonexisting_handle(pthread_handle h, pthread_t id) +static __inline__ int nonexisting_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id; } diff --git a/libpthread/linuxthreads/manager.c b/libpthread/linuxthreads/manager.c index bbdbd59a0..b0a2a3712 100644 --- a/libpthread/linuxthreads/manager.c +++ b/libpthread/linuxthreads/manager.c @@ -68,7 +68,7 @@ static pthread_descr manager_thread; #if FLOATING_STACKS # define thread_segment(seq) NULL #else -static inline pthread_descr thread_segment(int seg) +static __inline__ pthread_descr thread_segment(int seg) { # ifdef _STACK_GROWS_UP return (pthread_descr)(THREAD_STACK_START_ADDRESS + (seg - 1) * STACK_SIZE) diff --git a/libpthread/linuxthreads/ptcleanup.c b/libpthread/linuxthreads/ptcleanup.c index fa44ea142..6213b56f3 100644 --- a/libpthread/linuxthreads/ptcleanup.c +++ b/libpthread/linuxthreads/ptcleanup.c @@ -28,7 +28,7 @@ #endif #ifndef NO_PTR_DEMANGLE -static inline uintptr_t +static __inline__ uintptr_t demangle_ptr (uintptr_t x) { #ifdef PTR_DEMANGLE diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c index 64aad7cc1..4c44252ab 100644 --- a/libpthread/linuxthreads/pthread.c +++ b/libpthread/linuxthreads/pthread.c @@ -468,7 +468,7 @@ __libc_dl_error_tsd (void) #endif #ifdef USE_TLS -static inline void __attribute__((always_inline)) +static __inline__ void __attribute__((always_inline)) init_one_static_tls (pthread_descr descr, struct link_map *map) { # if TLS_TCB_AT_TP diff --git a/libpthread/linuxthreads/queue.h b/libpthread/linuxthreads/queue.h index 28bd75531..e50517f77 100644 --- a/libpthread/linuxthreads/queue.h +++ b/libpthread/linuxthreads/queue.h @@ -18,7 +18,7 @@ linked through their p_nextwaiting field. The lists are kept sorted by decreasing priority, and then decreasing waiting time. */ -static inline void enqueue(pthread_descr * q, pthread_descr th) +static __inline__ void enqueue(pthread_descr * q, pthread_descr th) { int prio = th->p_priority; ASSERT(th->p_nextwaiting == NULL); @@ -32,7 +32,7 @@ static inline void enqueue(pthread_descr * q, pthread_descr th) *q = th; } -static inline pthread_descr dequeue(pthread_descr * q) +static __inline__ pthread_descr dequeue(pthread_descr * q) { pthread_descr th; th = *q; @@ -43,7 +43,7 @@ static inline pthread_descr dequeue(pthread_descr * q) return th; } -static inline int remove_from_queue(pthread_descr * q, pthread_descr th) +static __inline__ int remove_from_queue(pthread_descr * q, pthread_descr th) { for (; *q != NULL; q = &((*q)->p_nextwaiting)) { if (*q == th) { @@ -55,7 +55,7 @@ static inline int remove_from_queue(pthread_descr * q, pthread_descr th) return 0; } -static inline int queue_is_empty(pthread_descr * q) +static __inline__ int queue_is_empty(pthread_descr * q) { return *q == NULL; } diff --git a/libpthread/linuxthreads/restart.h b/libpthread/linuxthreads/restart.h index 24d9fab74..f53642eda 100644 --- a/libpthread/linuxthreads/restart.h +++ b/libpthread/linuxthreads/restart.h @@ -17,7 +17,7 @@ /* Primitives for controlling thread execution */ -static inline void restart(pthread_descr th) +static __inline__ void restart(pthread_descr th) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -27,7 +27,7 @@ static inline void restart(pthread_descr th) #endif } -static inline void suspend(pthread_descr self) +static __inline__ void suspend(pthread_descr self) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -37,7 +37,7 @@ static inline void suspend(pthread_descr self) #endif } -static inline int timedsuspend(pthread_descr self, +static __inline__ int timedsuspend(pthread_descr self, const struct timespec *abstime) { /* See pthread.c */ diff --git a/libpthread/linuxthreads/spinlock.c b/libpthread/linuxthreads/spinlock.c index 6b6610688..f32540286 100644 --- a/libpthread/linuxthreads/spinlock.c +++ b/libpthread/linuxthreads/spinlock.c @@ -26,7 +26,7 @@ static void __pthread_acquire(int * spinlock); -static inline void __pthread_release(int * spinlock) +static __inline__ void __pthread_release(int * spinlock) { WRITE_MEMORY_BARRIER(); *spinlock = __LT_SPINLOCK_INIT; diff --git a/libpthread/linuxthreads/spinlock.h b/libpthread/linuxthreads/spinlock.h index ff96fc336..210ead471 100644 --- a/libpthread/linuxthreads/spinlock.h +++ b/libpthread/linuxthreads/spinlock.h @@ -39,7 +39,7 @@ extern int __pthread_has_cas; extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { if (__builtin_expect (__pthread_has_cas, 1)) @@ -56,7 +56,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, #ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS -static inline int +static __inline__ int compare_and_swap_with_release_semantics (long * ptr, long oldval, long newval, int * spinlock) { @@ -66,7 +66,7 @@ compare_and_swap_with_release_semantics (long * ptr, long oldval, #endif -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __compare_and_swap(ptr, oldval, newval); @@ -77,7 +77,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __pthread_compare_and_swap(ptr, oldval, newval, spinlock); @@ -96,13 +96,13 @@ extern void internal_function __pthread_lock(struct _pthread_fastlock * lock, pthread_descr self); extern int __pthread_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -133,13 +133,13 @@ extern int __pthread_alt_timedlock(struct _pthread_fastlock * lock, extern void __pthread_alt_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_alt_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_alt_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) /* Operations on pthread_atomic, which is defined in internals.h */ -static inline long atomic_increment(struct pthread_atomic *pa) +static __inline__ long atomic_increment(struct pthread_atomic *pa) { long oldval; @@ -184,7 +184,7 @@ static inline long atomic_increment(struct pthread_atomic *pa) } -static inline long atomic_decrement(struct pthread_atomic *pa) +static __inline__ long atomic_decrement(struct pthread_atomic *pa) { long oldval; @@ -196,7 +196,7 @@ static inline long atomic_decrement(struct pthread_atomic *pa) } -static inline __attribute__((always_inline)) void +static __inline__ __attribute__((always_inline)) void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. diff --git a/libpthread/linuxthreads/sysdeps/ia64/pspinlock.c b/libpthread/linuxthreads/sysdeps/ia64/pspinlock.c index 8bbaf6f92..fa10c7b37 100644 --- a/libpthread/linuxthreads/sysdeps/ia64/pspinlock.c +++ b/libpthread/linuxthreads/sysdeps/ia64/pspinlock.c @@ -30,7 +30,7 @@ int __pthread_spin_lock (pthread_spinlock_t *lock) { int *p = (int *) lock; - + while (__builtin_expect (__sync_val_compare_and_swap (p, 0, 1), 0)) { /* Spin without using the atomic instruction. */ diff --git a/libpthread/linuxthreads/sysdeps/pthread/list.h b/libpthread/linuxthreads/sysdeps/pthread/list.h index 43186a2d5..75decfbb7 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/list.h +++ b/libpthread/linuxthreads/sysdeps/pthread/list.h @@ -43,7 +43,7 @@ typedef struct list_head /* Add new element at the head of the list. */ -static inline void +static __inline__ void list_add (list_t *newp, list_t *head) { head->next->prev = newp; @@ -54,7 +54,7 @@ list_add (list_t *newp, list_t *head) /* Add new element at the tail of the list. */ -static inline void +static __inline__ void list_add_tail (list_t *newp, list_t *head) { head->prev->next = newp; @@ -65,7 +65,7 @@ list_add_tail (list_t *newp, list_t *head) /* Remove element from list. */ -static inline void +static __inline__ void list_del (list_t *elem) { elem->next->prev = elem->prev; @@ -74,7 +74,7 @@ list_del (list_t *elem) /* Join two lists. */ -static inline void +static __inline__ void list_splice (list_t *add, list_t *head) { /* Do nothing if the list which gets added is empty. */ diff --git a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h index 1b0a2b65e..5486f7d6a 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h +++ b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h @@ -88,7 +88,7 @@ extern struct thread_node __timer_signal_thread_rclk; /* Return pointer to timer structure corresponding to ID. */ -static inline struct timer_node * +static __inline__ struct timer_node * timer_id2ptr (timer_t timerid) { if (timerid >= 0 && timerid < TIMER_MAX) @@ -98,14 +98,14 @@ timer_id2ptr (timer_t timerid) } /* Return ID of TIMER. */ -static inline int +static __inline__ int timer_ptr2id (struct timer_node *timer) { return timer - __timer_array; } /* Check whether timer is valid; global mutex must be held. */ -static inline int +static __inline__ int timer_valid (struct timer_node *timer) { return timer && timer->inuse == TIMER_INUSE; @@ -114,13 +114,13 @@ timer_valid (struct timer_node *timer) /* Timer refcount functions; need global mutex. */ extern void __timer_dealloc (struct timer_node *timer); -static inline void +static __inline__ void timer_addref (struct timer_node *timer) { timer->refcount++; } -static inline void +static __inline__ void timer_delref (struct timer_node *timer) { if (--timer->refcount == 0) @@ -128,7 +128,7 @@ timer_delref (struct timer_node *timer) } /* Timespec helper routines. */ -static inline int +static __inline__ int timespec_compare (const struct timespec *left, const struct timespec *right) { if (left->tv_sec < right->tv_sec) @@ -144,7 +144,7 @@ timespec_compare (const struct timespec *left, const struct timespec *right) return 0; } -static inline void +static __inline__ void timespec_add (struct timespec *sum, const struct timespec *left, const struct timespec *right) { @@ -158,7 +158,7 @@ timespec_add (struct timespec *sum, const struct timespec *left, } } -static inline void +static __inline__ void timespec_sub (struct timespec *diff, const struct timespec *left, const struct timespec *right) { @@ -174,7 +174,7 @@ timespec_sub (struct timespec *diff, const struct timespec *left, /* We need one of the list functions in the other modules. */ -static inline void +static __inline__ void list_unlink_ip (struct list_links *list) { struct list_links *lnext = list->next, *lprev = list->prev; diff --git a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c index 3877b86fb..25b4630ee 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c +++ b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c @@ -65,13 +65,13 @@ extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *); /* List handling functions. */ -static inline void +static __inline__ void list_init (struct list_links *list) { list->next = list->prev = list; } -static inline void +static __inline__ void list_append (struct list_links *list, struct list_links *newp) { newp->prev = list->prev; @@ -80,7 +80,7 @@ list_append (struct list_links *list, struct list_links *newp) list->prev = newp; } -static inline void +static __inline__ void list_insbefore (struct list_links *list, struct list_links *newp) { list_append (list, newp); @@ -91,7 +91,7 @@ list_insbefore (struct list_links *list, struct list_links *newp) * is already unlinked is disastrous rather than a noop. */ -static inline void +static __inline__ void list_unlink (struct list_links *list) { struct list_links *lnext = list->next, *lprev = list->prev; @@ -100,25 +100,25 @@ list_unlink (struct list_links *list) lprev->next = lnext; } -static inline struct list_links * +static __inline__ struct list_links * list_first (struct list_links *list) { return list->next; } -static inline struct list_links * +static __inline__ struct list_links * list_null (struct list_links *list) { return list; } -static inline struct list_links * +static __inline__ struct list_links * list_next (struct list_links *list) { return list->next; } -static inline int +static __inline__ int list_isempty (struct list_links *list) { return list->next == list; @@ -126,14 +126,14 @@ list_isempty (struct list_links *list) /* Functions build on top of the list functions. */ -static inline struct thread_node * +static __inline__ struct thread_node * thread_links2ptr (struct list_links *list) { return (struct thread_node *) ((char *) list - offsetof (struct thread_node, links)); } -static inline struct timer_node * +static __inline__ struct timer_node * timer_links2ptr (struct list_links *list) { return (struct timer_node *) ((char *) list diff --git a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h index f81c22945..92619e5b4 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h +++ b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h @@ -40,7 +40,7 @@ extern int __cxa_atexit (void (*func) (void *), void *arg, void *d); # define __uselocale(x) ((void)0) #endif -/* Use a funky version in a probably vein attempt at preventing gdb +/* Use a funky version in a probably vein attempt at preventing gdb * from dlopen()'ing glibc's libthread_db library... */ #define STRINGIFY(s) STRINGIFY2 (s) #define STRINGIFY2(s) #s diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h index 817cf5922..6a53da2a0 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h @@ -1,9 +1,9 @@ -/* HP-PARISC macro definitions for mutexes, thread-specific data +/* HP-PARISC macro definitions for mutexes, thread-specific data and parameters for malloc. Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Carlos O'Donell <carlos@baldric.uwo.ca>, 2003. - + The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -43,7 +43,7 @@ __libc_lock_define (typedef, mutex_t) # define mutex_unlock(m) \ __libc_maybe_call (__pthread_mutex_unlock, (m), \ (((m)->__m_lock.__spinlock = __LT_SPINLOCK_INIT), (*(int *)(m))) ) - + /* This is defined by newer gcc version unique for each module. */ extern void *__dso_handle __attribute__ ((__weak__)); diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h index 2c0cbe99a..5e2f43cda 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -static inline int +static __inline__ int is_smp_system (void) { return 0; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c index fdec09455..3432125bb 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c @@ -31,7 +31,7 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__ /* Return any pending signal or wait for one for the given time. */ -static inline int +static __inline__ int do_sigwait (const sigset_t *set, int *sig) { int ret; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h index 81289294b..9ab75e8e6 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h @@ -22,7 +22,7 @@ /* Test whether the machine has more than one processor. This is not the best test but good enough. More complicated tests would require `malloc' which is not available at that time. */ -static inline int +static __inline__ int is_smp_system (void) { static const int sysctl_args[] = { CTL_KERN, KERN_VERSION }; diff --git a/libpthread/linuxthreads_db/thread_dbP.h b/libpthread/linuxthreads_db/thread_dbP.h index 30bdae451..407f30634 100644 --- a/libpthread/linuxthreads_db/thread_dbP.h +++ b/libpthread/linuxthreads_db/thread_dbP.h @@ -87,7 +87,7 @@ struct agent_list extern struct agent_list *__td_agent_list attribute_hidden; /* Function used to test for correct thread agent pointer. */ -static inline int +static __inline__ int ta_ok (const td_thragent_t *ta) { struct agent_list *runp = __td_agent_list; diff --git a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c index e73264108..d158183f0 100644 --- a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c +++ b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c @@ -25,7 +25,7 @@ pthread_spin_lock (lock) unsigned int val; do - asm volatile ("tas.b @%1; movt %0" + __asm__ volatile ("tas.b @%1; movt %0" : "=&r" (val) : "r" (lock) : "memory"); diff --git a/libpthread/nptl/sysdeps/sh/pthreaddef.h b/libpthread/nptl/sysdeps/sh/pthreaddef.h index 70c6a850b..c1902fb54 100644 --- a/libpthread/nptl/sysdeps/sh/pthreaddef.h +++ b/libpthread/nptl/sysdeps/sh/pthreaddef.h @@ -41,9 +41,9 @@ #define __exit_thread_inline(val) \ while (1) { \ if (__builtin_constant_p (val) && (val) == 0) \ - asm volatile ("mov #0,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ + __asm__ volatile ("mov #0,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ :: "i" (__NR_exit)); \ else \ - asm volatile ("mov %1,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ + __asm__ volatile ("mov %1,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ :: "i" (__NR_exit), "r" (val)); \ } diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h index e6ea68dfb..45339f5e0 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h @@ -183,11 +183,11 @@ typedef int lll_lock_t; #define lll_futex_wait(futex, val) \ do { \ int __ignore; \ - register unsigned long __r3 asm ("r3") = SYS_futex; \ - register unsigned long __r4 asm ("r4") = (unsigned long) (futex); \ - register unsigned long __r5 asm ("r5") = FUTEX_WAIT; \ - register unsigned long __r6 asm ("r6") = (unsigned long) (val); \ - register unsigned long __r7 asm ("r7") = 0; \ + register unsigned long __r3 __asm ("r3") = SYS_futex; \ + register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \ + register unsigned long __r5 __asm ("r5") = FUTEX_WAIT; \ + register unsigned long __r6 __asm ("r6") = (unsigned long) (val); \ + register unsigned long __r7 __asm ("r7") = 0; \ __asm __volatile (SYSCALL_WITH_INST_PAD \ : "=z" (__ignore) \ : "r" (__r3), "r" (__r4), "r" (__r5), \ @@ -198,11 +198,11 @@ typedef int lll_lock_t; #define lll_futex_timed_wait(futex, val, timeout) \ ({ \ int __status; \ - register unsigned long __r3 asm ("r3") = SYS_futex; \ - register unsigned long __r4 asm ("r4") = (unsigned long) (futex); \ - register unsigned long __r5 asm ("r5") = FUTEX_WAIT; \ - register unsigned long __r6 asm ("r6") = (unsigned long) (val); \ - register unsigned long __r7 asm ("r7") = (timeout); \ + register unsigned long __r3 __asm ("r3") = SYS_futex; \ + register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \ + register unsigned long __r5 __asm ("r5") = FUTEX_WAIT; \ + register unsigned long __r6 __asm ("r6") = (unsigned long) (val); \ + register unsigned long __r7 __asm ("r7") = (timeout); \ __asm __volatile (SYSCALL_WITH_INST_PAD \ : "=z" (__status) \ : "r" (__r3), "r" (__r4), "r" (__r5), \ @@ -215,11 +215,11 @@ typedef int lll_lock_t; #define lll_futex_wake(futex, nr) \ do { \ int __ignore; \ - register unsigned long __r3 asm ("r3") = SYS_futex; \ - register unsigned long __r4 asm ("r4") = (unsigned long) (futex); \ - register unsigned long __r5 asm ("r5") = FUTEX_WAKE; \ - register unsigned long __r6 asm ("r6") = (unsigned long) (nr); \ - register unsigned long __r7 asm ("r7") = 0; \ + register unsigned long __r3 __asm ("r3") = SYS_futex; \ + register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \ + register unsigned long __r5 __asm ("r5") = FUTEX_WAKE; \ + register unsigned long __r6 __asm ("r6") = (unsigned long) (nr); \ + register unsigned long __r7 __asm ("r7") = 0; \ __asm __volatile (SYSCALL_WITH_INST_PAD \ : "=z" (__ignore) \ : "r" (__r3), "r" (__r4), "r" (__r5), \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h index 3bb0b32a0..fc2d71591 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h @@ -255,39 +255,39 @@ #define SUBSTITUTE_ARGS_0() #define SUBSTITUTE_ARGS_1(arg1) \ long int _arg1 = (long int) (arg1); \ - register long int r4 asm ("%r4") = (long int) (_arg1) + register long int r4 __asm__ ("%r4") = (long int) (_arg1) #define SUBSTITUTE_ARGS_2(arg1, arg2) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ - register long int r4 asm ("%r4") = (long int) (_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2) + register long int r4 __asm__ ("%r4") = (long int) (_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2) #define SUBSTITUTE_ARGS_3(arg1, arg2, arg3) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ long int _arg3 = (long int) (arg3); \ - register long int r4 asm ("%r4") = (long int) (_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2); \ - register long int r6 asm ("%r6") = (long int) (_arg3) + register long int r4 __asm__ ("%r4") = (long int) (_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2); \ + register long int r6 __asm__ ("%r6") = (long int) (_arg3) #define SUBSTITUTE_ARGS_4(arg1, arg2, arg3, arg4) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ long int _arg3 = (long int) (arg3); \ long int _arg4 = (long int) (arg4); \ - register long int r4 asm ("%r4") = (long int) (_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2); \ - register long int r6 asm ("%r6") = (long int) (_arg3); \ - register long int r7 asm ("%r7") = (long int) (_arg4) + register long int r4 __asm__ ("%r4") = (long int) (_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2); \ + register long int r6 __asm__ ("%r6") = (long int) (_arg3); \ + register long int r7 __asm__ ("%r7") = (long int) (_arg4) #define SUBSTITUTE_ARGS_5(arg1, arg2, arg3, arg4, arg5) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ long int _arg3 = (long int) (arg3); \ long int _arg4 = (long int) (arg4); \ long int _arg5 = (long int) (arg5); \ - register long int r4 asm ("%r4") = (long int) (_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2); \ - register long int r6 asm ("%r6") = (long int) (_arg3); \ - register long int r7 asm ("%r7") = (long int) (_arg4); \ - register long int r0 asm ("%r0") = (long int) (_arg5) + register long int r4 __asm__ ("%r4") = (long int) (_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2); \ + register long int r6 __asm__ ("%r6") = (long int) (_arg3); \ + register long int r7 __asm__ ("%r7") = (long int) (_arg4); \ + register long int r0 __asm__ ("%r0") = (long int) (_arg5) #define SUBSTITUTE_ARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ @@ -295,12 +295,12 @@ long int _arg4 = (long int) (arg4); \ long int _arg5 = (long int) (arg5); \ long int _arg6 = (long int) (arg6); \ - register long int r4 asm ("%r4") = (long int)(_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2); \ - register long int r6 asm ("%r6") = (long int) (_arg3); \ - register long int r7 asm ("%r7") = (long int) (_arg4); \ - register long int r0 asm ("%r0") = (long int) (_arg5); \ - register long int r1 asm ("%r1") = (long int) (_arg6) + register long int r4 __asm__ ("%r4") = (long int)(_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2); \ + register long int r6 __asm__ ("%r6") = (long int) (_arg3); \ + register long int r7 __asm__ ("%r7") = (long int) (_arg4); \ + register long int r0 __asm__ ("%r0") = (long int) (_arg5); \ + register long int r1 __asm__ ("%r1") = (long int) (_arg6) #define SUBSTITUTE_ARGS_7(arg1, arg2, arg3, arg4, arg5, arg6, arg7) \ long int _arg1 = (long int) (arg1); \ long int _arg2 = (long int) (arg2); \ @@ -309,13 +309,13 @@ long int _arg5 = (long int) (arg5); \ long int _arg6 = (long int) (arg6); \ long int _arg7 = (long int) (arg7); \ - register long int r4 asm ("%r4") = (long int) (_arg1); \ - register long int r5 asm ("%r5") = (long int) (_arg2); \ - register long int r6 asm ("%r6") = (long int) (_arg3); \ - register long int r7 asm ("%r7") = (long int) (_arg4); \ - register long int r0 asm ("%r0") = (long int) (_arg5); \ - register long int r1 asm ("%r1") = (long int) (_arg6); \ - register long int r2 asm ("%r2") = (long int) (_arg7) + register long int r4 __asm__ ("%r4") = (long int) (_arg1); \ + register long int r5 __asm__ ("%r5") = (long int) (_arg2); \ + register long int r6 __asm__ ("%r6") = (long int) (_arg3); \ + register long int r7 __asm__ ("%r7") = (long int) (_arg4); \ + register long int r0 __asm__ ("%r0") = (long int) (_arg5); \ + register long int r1 __asm__ ("%r1") = (long int) (_arg6); \ + register long int r2 __asm__ ("%r2") = (long int) (_arg7) #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ @@ -332,10 +332,10 @@ #define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ \ unsigned long int resultvar; \ - register long int r3 asm ("%r3") = SYS_ify (name); \ + register long int r3 __asm__ ("%r3") = SYS_ify (name); \ SUBSTITUTE_ARGS_##nr(args); \ \ - asm volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \ + __asm__ volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \ : "=z" (resultvar) \ : "r" (r3) ASMFMT_##nr \ : "memory"); \ @@ -346,10 +346,10 @@ #define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ ({ \ unsigned long int resultvar; \ - register long int r3 asm ("%r3") = (name); \ + register long int r3 __asm__ ("%r3") = (name); \ SUBSTITUTE_ARGS_##nr(args); \ \ - asm volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \ + __asm__ volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \ : "=z" (resultvar) \ : "r" (r3) ASMFMT_##nr \ : "memory"); \ diff --git a/librt/mq_getsetattr.c b/librt/mq_getsetattr.c index 17c93a0b1..b50d9a974 100644 --- a/librt/mq_getsetattr.c +++ b/librt/mq_getsetattr.c @@ -12,7 +12,7 @@ librt_hidden_proto(mq_setattr) #define __NR___syscall_mq_getsetattr __NR_mq_getsetattr -static inline _syscall3(int, __syscall_mq_getsetattr, int, mqdes, +static __inline__ _syscall3(int, __syscall_mq_getsetattr, int, mqdes, const void *, mqstat, void *, omqstat); /* diff --git a/librt/mq_notify.c b/librt/mq_notify.c index 3d58e1161..2556669b7 100644 --- a/librt/mq_notify.c +++ b/librt/mq_notify.c @@ -11,7 +11,7 @@ #ifdef __NR_mq_notify #define __NR___syscall_mq_notify __NR_mq_notify -static inline _syscall2(int, __syscall_mq_notify, int, mqdes, +static __inline__ _syscall2(int, __syscall_mq_notify, int, mqdes, const void *, notification); /* Register notification upon message arrival to an empty message queue */ diff --git a/librt/mq_open.c b/librt/mq_open.c index e87220eb0..62c831032 100644 --- a/librt/mq_open.c +++ b/librt/mq_open.c @@ -12,7 +12,7 @@ #ifdef __NR_mq_open #define __NR___syscall_mq_open __NR_mq_open -static inline _syscall4(int, __syscall_mq_open, const char *, name, +static __inline__ _syscall4(int, __syscall_mq_open, const char *, name, int, oflag, __kernel_mode_t, mode, void *, attr); /* * Establish connection between a process and a message queue and diff --git a/librt/mq_receive.c b/librt/mq_receive.c index 127929045..40447dfb9 100644 --- a/librt/mq_receive.c +++ b/librt/mq_receive.c @@ -13,7 +13,7 @@ librt_hidden_proto(mq_timedreceive) #ifndef __UCLIBC_HAS_THREADS_NATIVE__ #ifdef __NR_mq_timedreceive #define __NR___syscall_mq_timedreceive __NR_mq_timedreceive -static inline _syscall5(int, __syscall_mq_timedreceive, int, mqdes, +static __inline__ _syscall5(int, __syscall_mq_timedreceive, int, mqdes, char *, msg_ptr, size_t, msg_len, unsigned int *, msg_prio, const void *, abs_timeout); #endif diff --git a/librt/mq_send.c b/librt/mq_send.c index 75cc5fab3..f0fcfa35a 100644 --- a/librt/mq_send.c +++ b/librt/mq_send.c @@ -13,7 +13,7 @@ librt_hidden_proto(mq_timedsend) #ifndef __UCLIBC_HAS_THREADS_NATIVE__ #ifdef __NR_mq_timedsend #define __NR___syscall_mq_timedsend __NR_mq_timedsend -static inline _syscall5(int, __syscall_mq_timedsend, int, mqdes, +static __inline__ _syscall5(int, __syscall_mq_timedsend, int, mqdes, const char *, msg_ptr, size_t, msg_len, unsigned int, msg_prio, const void *, abs_timeout); #endif diff --git a/librt/mq_unlink.c b/librt/mq_unlink.c index 8e89610a3..3c490e0ce 100644 --- a/librt/mq_unlink.c +++ b/librt/mq_unlink.c @@ -10,7 +10,7 @@ #ifdef __NR_mq_unlink #define __NR___syscall_mq_unlink __NR_mq_unlink -static inline _syscall1(int, __syscall_mq_unlink, const char *, name); +static __inline__ _syscall1(int, __syscall_mq_unlink, const char *, name); /* Remove message queue */ int mq_unlink(const char *name) diff --git a/librt/timer_create.c b/librt/timer_create.c index 6aca5fffb..9298a37c7 100644 --- a/librt/timer_create.c +++ b/librt/timer_create.c @@ -18,7 +18,7 @@ #endif #define __NR___syscall_timer_create __NR_timer_create -static inline _syscall3(int, __syscall_timer_create, clockid_t, clock_id, +static __inline__ _syscall3(int, __syscall_timer_create, clockid_t, clock_id, struct sigevent *, evp, kernel_timer_t *, ktimerid); /* Create a per-process timer */ diff --git a/librt/timer_delete.c b/librt/timer_delete.c index cc749df6b..af6b34f5d 100644 --- a/librt/timer_delete.c +++ b/librt/timer_delete.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_delete #define __NR___syscall_timer_delete __NR_timer_delete -static inline _syscall1(int, __syscall_timer_delete, kernel_timer_t, ktimerid); +static __inline__ _syscall1(int, __syscall_timer_delete, kernel_timer_t, ktimerid); /* Delete a per-process timer */ int timer_delete(timer_t timerid) diff --git a/librt/timer_getoverr.c b/librt/timer_getoverr.c index 71006eecd..0e8551684 100644 --- a/librt/timer_getoverr.c +++ b/librt/timer_getoverr.c @@ -11,7 +11,7 @@ #ifdef __NR_timer_getoverrun #define __NR___syscall_timer_getoverrun __NR_timer_getoverrun -static inline _syscall1(int, __syscall_timer_getoverrun, kernel_timer_t, +static __inline__ _syscall1(int, __syscall_timer_getoverrun, kernel_timer_t, ktimerid); /* Get the timer overrun count */ diff --git a/librt/timer_gettime.c b/librt/timer_gettime.c index e8d6d2676..e13f44642 100644 --- a/librt/timer_gettime.c +++ b/librt/timer_gettime.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_gettime #define __NR___syscall_timer_gettime __NR_timer_gettime -static inline _syscall2(int, __syscall_timer_gettime, kernel_timer_t, ktimerid, +static __inline__ _syscall2(int, __syscall_timer_gettime, kernel_timer_t, ktimerid, void *, value); /* Get the amount of time left on a timer */ diff --git a/librt/timer_settime.c b/librt/timer_settime.c index 05c4d1aef..2703fa913 100644 --- a/librt/timer_settime.c +++ b/librt/timer_settime.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_settime #define __NR___syscall_timer_settime __NR_timer_settime -static inline _syscall4(int, __syscall_timer_settime, kernel_timer_t, ktimerid, +static __inline__ _syscall4(int, __syscall_timer_settime, kernel_timer_t, ktimerid, int, flags, const void *, value, void *, ovalue); /* Set the expiration time for a timer */ diff --git a/libutil/login.c b/libutil/login.c index 2e9a5cb25..bd1dd29ee 100644 --- a/libutil/login.c +++ b/libutil/login.c @@ -12,9 +12,9 @@ void login (const struct utmp *entry) utmpname(_PATH_UTMP); setutent(); -#if _HAVE_UT_TYPE - 0 +#if _HAVE_UT_TYPE - 0 copy.ut_type = USER_PROCESS; -#endif +#endif #if _HAVE_UT_PID - 0 copy.ut_pid = getpid(); #endif diff --git a/test/Makefile b/test/Makefile index 420bc05b4..dfc42ed75 100644 --- a/test/Makefile +++ b/test/Makefile @@ -38,6 +38,9 @@ endif ifeq ($(UCLIBC_HAS_CRYPT_STUB),y) DIRS := $(filter-out crypt,$(DIRS)) endif +ifeq ($(HAS_NO_THREADS),y) + DIRS := $(filter-out pthread,$(DIRS)) +endif DIRS := $(filter-out math,$(DIRS)) diff --git a/test/Test.mak b/test/Test.mak index 189e3368b..015c3bcb9 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -30,6 +30,7 @@ endif ifeq ($(UCLIBC_ONLY),) TARGETS += $(G_TARGETS) endif + CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS) COMPILE_TARGETS := $(TARGETS) RUN_TARGETS := $(patsubst %,%.exe,$(TARGETS)) @@ -64,7 +65,6 @@ define exec_test test -z "$$expected_ret" && export expected_ret=0 ; \ if ! test $$ret -eq $$expected_ret ; then \ echo "ret == $$ret ; expected_ret == $$expected_ret" ; \ - cat "$(binary_name).out" ; \ exit 1 ; \ fi $(SCAT) "$(binary_name).out" diff --git a/test/crypt/md5c-test.c b/test/crypt/md5c-test.c index e2896b5b1..3c6154021 100644 --- a/test/crypt/md5c-test.c +++ b/test/crypt/md5c-test.c @@ -10,7 +10,7 @@ main (int argc, char *argv[]) char *cp; cp = crypt ("Hello world!", salt); - if (strcmp ("$1$saltstri$YMyguxXMBpd2TEZ.vS/3q1", cp)) { + if (strcmp ("$1$saltstri$YMyguxXMBpd2TEZ.vS/3q1", cp)) { fprintf(stderr, "Failed md5 crypt test!\n"); return EXIT_FAILURE; } diff --git a/test/malloc/malloc.c b/test/malloc/malloc.c index d63856845..ca7c5f927 100644 --- a/test/malloc/malloc.c +++ b/test/malloc/malloc.c @@ -67,7 +67,7 @@ int test2(void) } else { free(ptr); } - + ptr = malloc(100); ptr = realloc(ptr, 0); if (ptr) { diff --git a/test/malloc/testmalloc.c b/test/malloc/testmalloc.c index caf08a9e1..42707d231 100644 --- a/test/malloc/testmalloc.c +++ b/test/malloc/testmalloc.c @@ -27,7 +27,7 @@ int main(void) free(y); printf("about to free(0)\n"); free(0); - + x=malloc(13); printf("x = %p\n", x); memcpy(x, "Small string", 13); @@ -37,8 +37,8 @@ int main(void) memcpy(y, "********** Larger string **********", 36); printf("0x%p test string2: %s\n", y, (char *)y); free(y); - - + + printf("Allocate 100 nodes 500 bytes each\n"); save = 0; for (i=0; i<100; i++) { @@ -50,14 +50,14 @@ int main(void) lp->next = save; save = lp; } - + printf("freeing 100 nodes\n"); while (save) { lp = save; save = save->next; free(lp); } - + printf("try realloc 100 times \n"); lp = 0; for (i=1; i<=100; i++) { @@ -71,7 +71,7 @@ int main(void) void *unused_ret = realloc(lp, 0); (void) unused_ret; } - + printf("Allocate another 100 nodes 600 bytes each\n"); save = 0; for (i=0; i<100; i++) { @@ -83,14 +83,14 @@ int main(void) lp->next = save; save = lp; } - + printf("freeing 100 nodes\n"); while (save) { lp = save; save = save->next; free(lp); } - + printf("alloc test PASSED\n"); exit(0); diff --git a/test/malloc/time_malloc.c b/test/malloc/time_malloc.c index 64195107d..0b626654f 100644 --- a/test/malloc/time_malloc.c +++ b/test/malloc/time_malloc.c @@ -1,6 +1,6 @@ #include <stdlib.h> #define REPS (100000) -int sizes[] = { +int sizes[] = { 100000, 1024, 42000, 350, 100, 80, 3 ,3,3,3,3,3,3,3,3,3,3,3,3,50, 100000, 1024, 42000, 350, 100, 80, 3 ,3,3,3,3,3,3,3,3,3,3,3,3,50, 100000, 1024, 42000, 350, 100, 80, 3 ,3,3,3,3,3,3,3,3,3,3,3,3,50, diff --git a/test/math/libm-test.inc b/test/math/libm-test.inc index be6312930..c9c2c8b41 100644 --- a/test/math/libm-test.inc +++ b/test/math/libm-test.inc @@ -4182,14 +4182,14 @@ round_test (void) /* The result can only be represented in long double. */ TEST_f_f (round, 4503599627370495.5L, 4503599627370496.0L); TEST_f_f (round, 4503599627370496.25L, 4503599627370496.0L); - TEST_f_f (round, 4503599627370496.5L, 4503599627370497.0L); + TEST_f_f (round, 4503599627370496.5L, 4503599627370497.0L); TEST_f_f (round, 4503599627370496.75L, 4503599627370497.0L); - TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); + TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); - TEST_f_f (round, -4503599627370495.5L, -4503599627370496.0L); - TEST_f_f (round, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (round, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (round, -4503599627370496.25L, -4503599627370496.0L); TEST_f_f (round, -4503599627370496.5L, -4503599627370497.0L); - TEST_f_f (round, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (round, -4503599627370496.75L, -4503599627370497.0L); TEST_f_f (round, -4503599627370497.5L, -4503599627370498.0L); TEST_f_f (round, 9007199254740991.5L, 9007199254740992.0L); @@ -4640,7 +4640,7 @@ trunc_test (void) TEST_f_f (trunc, 10141204801825835211973625643008.25L, 10141204801825835211973625643008.0L); TEST_f_f (trunc, 10141204801825835211973625643008.5L, 10141204801825835211973625643008.0L); TEST_f_f (trunc, 10141204801825835211973625643008.75L, 10141204801825835211973625643008.0L); - TEST_f_f (trunc, 10141204801825835211973625643009.5L, 10141204801825835211973625643009.0L); + TEST_f_f (trunc, 10141204801825835211973625643009.5L, 10141204801825835211973625643009.0L); #endif END (trunc); diff --git a/test/math/rint.c b/test/math/rint.c index 399fb90e3..04c195385 100644 --- a/test/math/rint.c +++ b/test/math/rint.c @@ -6,6 +6,6 @@ int main(void) { double d1, d2; d1 = 0.6; d2 = rint(d1); printf("d1 = %f, d2 = %f\n", d1, d2); - return 0; + return 0; } diff --git a/test/misc/bug-glob2.c b/test/misc/bug-glob2.c index 9e8be983b..f8b030e2c 100644 --- a/test/misc/bug-glob2.c +++ b/test/misc/bug-glob2.c @@ -275,7 +275,7 @@ do_test (void) != GLOB_ABORTED) { puts ("glob did not fail with GLOB_ABORTED"); - exit (EXIT_FAILURE); + exit (EXIT_FAILURE); } globfree (&gl); @@ -287,7 +287,7 @@ do_test (void) if (glob ("dir2/*", GLOB_DOOFFS, NULL, &gl) != GLOB_NOMATCH) { puts ("glob did not fail with GLOB_NOMATCH"); - exit (EXIT_FAILURE); + exit (EXIT_FAILURE); } globfree (&gl); diff --git a/test/pthread/ex7.c b/test/pthread/ex7.c index 9cf30aa19..49af18d96 100644 --- a/test/pthread/ex7.c +++ b/test/pthread/ex7.c @@ -48,13 +48,13 @@ test_thread (void *ms_param) status = pthread_cond_timedwait(&foo.cond, &foo.mutex, &timeout); } pthread_mutex_unlock(&foo.mutex); - + /* post the main event */ pthread_mutex_lock(&main_event.mutex); main_event.flag = 1; pthread_cond_signal(&main_event.cond); pthread_mutex_unlock(&main_event.mutex); - + /* that's it, bye */ return (void*) status; } @@ -95,7 +95,7 @@ main (void) printf ("count = %lu\n", count); } - + usleep (10); } diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 3be8680db..3992c2647 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -1950,7 +1950,7 @@ main(int argc, char** argv) else #endif fun = "regexec"; - + for (i = 0; i < elementsof(match); i++) match[i] = state.NOMATCH; diff --git a/test/setjmp/bug269-setjmp.c b/test/setjmp/bug269-setjmp.c index 33431fa19..b11ac7b24 100644 --- a/test/setjmp/bug269-setjmp.c +++ b/test/setjmp/bug269-setjmp.c @@ -30,7 +30,7 @@ int n_x = 6; static int g_counter = 0; static int -f (void) +f (void) { static int counter = 0; static int way_point1 = 3; diff --git a/test/stdlib/teststrtol.c b/test/stdlib/teststrtol.c index e959b4990..5b43a9b0c 100644 --- a/test/stdlib/teststrtol.c +++ b/test/stdlib/teststrtol.c @@ -10,7 +10,7 @@ const char *strings[]={ "10000000", "100000000", "1000000000", /* negative */ - "-0", "-1", "-10", + "-0", "-1", "-10", "-100", "-1000", "-10000", "-100000", "-1000000", "-10000000", "-100000000", "-1000000000", diff --git a/test/string/tester.c b/test/string/tester.c index 647b8c174..ac1b90118 100644 --- a/test/string/tester.c +++ b/test/string/tester.c @@ -1089,7 +1089,7 @@ test_memcmp (void) { int i, cnt = 1; char one[21], two[21]; - + it = "memcmp"; check(memcmp("a", "a", 1) == 0, cnt++); /* Identity. */ check(memcmp("abc", "abc", 3) == 0, cnt++); /* Multicharacter. */ diff --git a/test/time/time.c b/test/time/time.c index c97c4f5ef..a4d68d50f 100644 --- a/test/time/time.c +++ b/test/time/time.c @@ -4,7 +4,7 @@ /* We use this instead of memcmp because some broken C libraries * add additional nonstandard fields to struct tm... */ - + int tm_cmp(struct tm tm1, struct tm tm2) { return tm1.tm_sec != tm2.tm_sec || diff --git a/utils/bswap.h b/utils/bswap.h index 183fce5c2..666b80a73 100644 --- a/utils/bswap.h +++ b/utils/bswap.h @@ -44,12 +44,12 @@ # include <byteswap.h> #else -static inline uint16_t bswap_16(uint16_t x) +static __inline__ uint16_t bswap_16(uint16_t x) { return ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)); } -static inline uint32_t bswap_32(uint32_t x) +static __inline__ uint32_t bswap_32(uint32_t x) { return ((((x) & 0xff000000) >> 24) | \ (((x) & 0x00ff0000) >> 8) | \ diff --git a/utils/ldd.c b/utils/ldd.c index a00bc3ba4..4a05d32d9 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -158,7 +158,7 @@ char *interp_dir = NULL; static int byteswap; static int interpreter_already_found = 0; -static inline uint32_t byteswap32_to_host(uint32_t value) +static __inline__ uint32_t byteswap32_to_host(uint32_t value) { if (byteswap == 1) { return (bswap_32(value)); @@ -166,7 +166,7 @@ static inline uint32_t byteswap32_to_host(uint32_t value) return (value); } } -static inline uint64_t byteswap64_to_host(uint64_t value) +static __inline__ uint64_t byteswap64_to_host(uint64_t value) { if (byteswap == 1) { return (bswap_64(value)); @@ -348,10 +348,10 @@ int unmap_cache(void) return 0; } #else -static inline void map_cache(void) +static __inline__ void map_cache(void) { } -static inline void unmap_cache(void) +static __inline__ void unmap_cache(void) { } #endif diff --git a/utils/readelf.c b/utils/readelf.c index 188f92f9f..2af4b5ca9 100644 --- a/utils/readelf.c +++ b/utils/readelf.c @@ -28,7 +28,7 @@ /* makefile will include elf.h for us */ static int byteswap; -static inline uint32_t byteswap32_to_host(uint32_t value) +static __inline__ uint32_t byteswap32_to_host(uint32_t value) { if (byteswap==1) { return(bswap_32(value)); @@ -36,7 +36,7 @@ static inline uint32_t byteswap32_to_host(uint32_t value) return(value); } } -static inline uint64_t byteswap64_to_host(uint64_t value) +static __inline__ uint64_t byteswap64_to_host(uint64_t value) { if (byteswap==1) { return(bswap_64(value)); |