diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-06-23 22:55:23 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-06-23 22:55:23 +0400 |
| commit | 6bda8defe92592970805d48e77031ace1c4a3414 (patch) | |
| tree | 5cad4331e1e60a36da9ef1da9578090982287da5 | |
| parent | f6709c07db65f630dd5c992647f513a51d1c5764 (diff) | |
* cygwin.sc: Add recent changes from ld sources.
* winsup.h: Move #ifdef EXPCGF code into "winbase.h".
* winbase.h: #ifdef EXPCGF code moved here from "winsup.h".
| -rw-r--r-- | winsup/cygwin/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/cygwin/cygwin.sc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/winbase.h | 7 | ||||
| -rw-r--r-- | winsup/cygwin/winsup.h | 7 |
4 files changed, 18 insertions, 9 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 20c90a539..8c4f46ff3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,12 @@ +2002-06-23 Christopher Faylor <cgf@redhat.com> + + * cygwin.sc: Add recent changes from ld sources. + +2002-06-23 Conrad Scott <conrad.scott@dsl.pipex.com> + + * winsup.h: Move #ifdef EXPCGF code into "winbase.h". + * winbase.h: #ifdef EXPCGF code moved here from "winsup.h". + 2002-06-12 Thomas Pfaff <tpfaff@gmx.net> * thread.h (pthread::cleanup_stack): Renamed cleanup_handlers to diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc index b050e3e37..fe00e2bd4 100644 --- a/winsup/cygwin/cygwin.sc +++ b/winsup/cygwin/cygwin.sc @@ -11,9 +11,9 @@ SECTIONS *(.glue_7t) *(.glue_7) ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); + LONG (-1); *(SORT(.ctors.*)); *(.ctors); *(.ctor); LONG (0); ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); + LONG (-1); *(SORT(.dtors.*)); *(.dtors); *(.dtor); LONG (0); *(.fini) /* ??? Why is .gcc_exc here? */ *(.gcc_exc) diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h index d72bb0893..15d16a429 100644 --- a/winsup/cygwin/winbase.h +++ b/winsup/cygwin/winbase.h @@ -1,5 +1,12 @@ #include_next "winbase.h" +#ifdef EXPCGF +#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused)) +#else +#define DECLARE_TLS_STORAGE do {} while (0) +#define _WINBASE2_H +#endif + #ifndef _WINBASE2_H #define _WINBASE2_H diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 2758569a5..5735985c7 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -25,13 +25,6 @@ details. */ #define NO_COPY __attribute__((nocommon)) __attribute__((section(".data_cygwin_nocopy"))) -#ifdef EXPCGF -#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused)) -#else -#define DECLARE_TLS_STORAGE do {} while (0) -#define _WINBASE2_H -#endif - #ifdef __cplusplus #if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L |