From a2ba36a67d4d6caa4da75bbd18a467651caf1497 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 5 Nov 2014 09:28:01 +0000 Subject: [PATCH] * Makefile.in (NEW_FUNCTIONS): Define target-independent. Add target dependent stuff afterwards. Globally define timezone and all xdr symbols as non-exported from libcygwin.a. --- winsup/cygwin/ChangeLog | 6 ++++ winsup/cygwin/Makefile.in | 59 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 4726aae4d..bba6ce4cf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2014-11-05 Corinna Vinschen + + * Makefile.in (NEW_FUNCTIONS): Define target-independent. Add target + dependent stuff afterwards. Globally define timezone and all xdr + symbols as non-exported from libcygwin.a. + 2014-11-03 Corinna Vinschen * cygheap.cc: Fix formatting. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 57a3d04ce..2d8c1d620 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -329,10 +329,62 @@ endif GMON_OFILES:=gmon.o mcount.o profil.o mcountFunc.o -ifeq ($(target_cpu),x86_64) -NEW_FUNCTIONS:= -else NEW_FUNCTIONS:=$(addprefix --replace=,\ + timezone= \ + __xdrrec_getrec= \ + __xdrrec_setnonblock= \ + xdr_array= \ + xdr_bool= \ + xdr_bytes= \ + xdr_char= \ + xdr_double= \ + xdr_enum= \ + xdr_float= \ + xdr_free= \ + xdr_hyper= \ + xdr_int= \ + xdr_int16_t= \ + xdr_int32_t= \ + xdr_int64_t= \ + xdr_int8_t= \ + xdr_long= \ + xdr_longlong_t= \ + xdr_netobj= \ + xdr_opaque= \ + xdr_pointer= \ + xdr_reference= \ + xdr_short= \ + xdr_sizeof= \ + xdr_string= \ + xdr_u_char= \ + xdr_u_hyper= \ + xdr_u_int= \ + xdr_u_int16_t= \ + xdr_u_int32_t= \ + xdr_u_int64_t= \ + xdr_u_int8_t= \ + xdr_u_long= \ + xdr_u_longlong_t= \ + xdr_u_short= \ + xdr_uint16_t= \ + xdr_uint32_t= \ + xdr_uint64_t= \ + xdr_uint8_t= \ + xdr_union= \ + xdr_vector= \ + xdr_void= \ + xdr_wrapstring= \ + xdrmem_create= \ + xdrrec_create= \ + xdrrec_endofrecord= \ + xdrrec_eof= \ + xdrrec_skiprecord= \ + xdrstdio_create= \ +) +ifeq ($(target_cpu),x86_64) +NEW_FUNCTIONS+= +else +NEW_FUNCTIONS+=$(addprefix --replace=,\ acl=_acl32 \ aclcheck=_aclcheck32 \ aclfrommode=_aclfrommode32 \ @@ -380,7 +432,6 @@ NEW_FUNCTIONS:=$(addprefix --replace=,\ setreuid=_setreuid32 \ setuid=_setuid32 \ stat=_stat64 \ - timezone= \ tmpfile=_tmpfile64 \ truncate=_truncate64 \ )