diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
| commit | 8833066b122427710a9e14a888ce6cfa862332d3 (patch) | |
| tree | 29591019d695919417b3698618d6a342e97381d6 /sysdeps/generic | |
| parent | fedca46896bdb702cb988837a0c2c5447e72ba2b (diff) | |
| download | glibc-8833066b122427710a9e14a888ce6cfa862332d3.tar glibc-8833066b122427710a9e14a888ce6cfa862332d3.tar.gz glibc-8833066b122427710a9e14a888ce6cfa862332d3.tar.bz2 glibc-8833066b122427710a9e14a888ce6cfa862332d3.zip | |
Updated to fedora-glibc-20070731T1624cvs/fedora-glibc-2_6_90-1
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/_G_config.h | 20 | ||||
| -rw-r--r-- | sysdeps/generic/initfini.c | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index a152b070c6..4aafe65f6b 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -8,19 +8,15 @@ #include <bits/types.h> #define __need_size_t -#define __need_wchar_t -#define __need_wint_t +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +# define __need_wchar_t +#endif #define __need_NULL #include <stddef.h> -#ifndef _WINT_T -/* Integral type unchanged by default argument promotions that can - hold any value corresponding to members of the extended character - set, as well as at least one value that does not correspond to any - member of the extended character set. */ -# define _WINT_T -typedef unsigned int wint_t; -#endif #define __need_mbstate_t +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +# define __need_wint_t +#endif #include <wchar.h> #define _G_size_t size_t typedef struct @@ -41,7 +37,8 @@ typedef struct #define _G_wchar_t wchar_t #define _G_wint_t wint_t #define _G_stat64 stat -#include <gconv.h> +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +# include <gconv.h> typedef union { struct __gconv_info __cd; @@ -51,6 +48,7 @@ typedef union struct __gconv_step_data __data; } __combined; } _G_iconv_t; +#endif typedef int _G_int16_t __attribute__ ((__mode__ (__HI__))); typedef int _G_int32_t __attribute__ ((__mode__ (__SI__))); diff --git a/sysdeps/generic/initfini.c b/sysdeps/generic/initfini.c index 2b8412a428..d5ef778367 100644 --- a/sysdeps/generic/initfini.c +++ b/sysdeps/generic/initfini.c @@ -81,7 +81,7 @@ call_gmon_start(void) } SECTION (".init"); -extern void _init (void); +extern void __attribute__ ((section (".init"))) _init (void); void _init (void) { @@ -107,7 +107,7 @@ asm ("\n/*@_init_EPILOG_ENDS*/"); asm ("\n/*@_fini_PROLOG_BEGINS*/"); SECTION (".fini"); -extern void _fini (void); +extern void __attribute__ ((section (".fini"))) _fini (void); void _fini (void) { |