From ef152aa5b7b8a46fe98f3a821e2655f9c2e8b669 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 28 Mar 2013 15:21:19 +0000
Subject: 	* Makefile.in ($(LIB_NAME)): Make sure to rebuild when
 cygwin.def file 	has been changed. 	* cygwin64.din: Remove more
 underscored symbols. 	(getdelim): Add missing define in favor of unneeded
 __getline. 	(getline): Ditto.

---
 winsup/cygwin/ChangeLog.64bit |  8 ++++++++
 winsup/cygwin/Makefile.in     |  4 ++--
 winsup/cygwin/cygwin64.din    | 17 +++--------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/winsup/cygwin/ChangeLog.64bit b/winsup/cygwin/ChangeLog.64bit
index 089777be3..dd034da57 100644
--- a/winsup/cygwin/ChangeLog.64bit
+++ b/winsup/cygwin/ChangeLog.64bit
@@ -1,3 +1,11 @@
+2013-03-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in ($(LIB_NAME)): Make sure to rebuild when cygwin.def file
+	has been changed.
+	* cygwin64.din: Remove more underscored symbols.
+	(getdelim): Add missing define in favor of unneeded __getline.
+	(getline): Ditto.
+
 2013-03-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_console.cc
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 58f4dc2e7..d7a6e62bf 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -437,8 +437,8 @@ $(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIB
 	@ln -f $@ new-$(DLL_NAME)
 
 # Rule to build libcygwin.a
-$(LIB_NAME): $(LIBCOS) | $(TEST_DLL_NAME) 
-	${srcdir}/mkimport ${toolopts} ${NEW_FUNCTIONS} $@ cygdll.a $^
+$(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(TEST_DLL_NAME)
+	${srcdir}/mkimport ${toolopts} ${NEW_FUNCTIONS} $@ cygdll.a $(wordlist 2,99,$^)
 
 ${STATIC_LIB_NAME}: mkstatic ${TEST_DLL_NAME}
 	perl -d $< -x ${EXCLUDE_STATIC_OFILES} --library=${LIBC} --library=${LIBM} --ar=${AR} $@ cygwin.map
diff --git a/winsup/cygwin/cygwin64.din b/winsup/cygwin/cygwin64.din
index 7e3546de5..35ebc203d 100644
--- a/winsup/cygwin/cygwin64.din
+++ b/winsup/cygwin/cygwin64.din
@@ -79,7 +79,6 @@ asinh NOSIGFE
 asinhf NOSIGFE
 asnprintf SIGFE
 asprintf SIGFE
-_asprintf_r SIGFE
 __assert NOSIGFE
 __assert_func NOSIGFE
 __assertfail NOSIGFE
@@ -290,7 +289,6 @@ fchown SIGFE
 fchownat SIGFE
 fclose SIGFE
 fcloseall SIGFE
-_fcloseall_r SIGFE
 fcntl SIGFE
 fcvt SIGFE
 fcvtbuf SIGFE
@@ -423,7 +421,7 @@ getc_unlocked SIGFE
 getchar SIGFE
 getchar_unlocked SIGFE
 getcwd SIGFE
-__getdelim SIGFE
+getdelim = __getdelim SIGFE
 getdomainname SIGFE
 getdtablesize NOSIGFE
 getegid NOSIGFE
@@ -442,10 +440,9 @@ gethostbyname = cygwin_gethostbyname SIGFE
 gethostbyname2 SIGFE
 gethostid SIGFE
 gethostname = cygwin_gethostname SIGFE
-_gethostname = cygwin_gethostname SIGFE
 getifaddrs SIGFE
 getitimer SIGFE
-__getline SIGFE
+getline = __getline SIGFE
 getlogin NOSIGFE
 getlogin_r NOSIGFE
 getmntent SIGFE
@@ -948,7 +945,6 @@ scalbnf NOSIGFE
 scandir SIGFE
 scandirat SIGFE
 scanf SIGFE
-_scanf_r SIGFE
 sched_get_priority_max SIGFE
 sched_get_priority_min SIGFE
 sched_getparam SIGFE
@@ -1070,10 +1066,7 @@ sqrtf NOSIGFE
 srand NOSIGFE
 srand48 NOSIGFE
 srandom NOSIGFE
-__srget SIGFE
-__srget_r SIGFE
 sscanf SIGFE
-_sscanf_r SIGFE
 stat SIGFE
 statfs SIGFE
 statvfs SIGFE
@@ -1116,7 +1109,7 @@ strtoimax = strtoll NOSIGFE
 strtok NOSIGFE
 strtok_r NOSIGFE
 strtol NOSIGFE
-_strtold SIGFE
+strtold = _strtold SIGFE
 strtoll NOSIGFE
 strtosigno NOSIGFE
 strtoul NOSIGFE
@@ -1203,7 +1196,6 @@ utmpxname SIGFE
 valloc SIGFE
 vasnprintf SIGFE
 vasprintf SIGFE
-_vasprintf_r SIGFE
 vdprintf SIGFE
 verr SIGFE
 verrx SIGFE
@@ -1211,17 +1203,14 @@ vfiprintf SIGFE
 vfork SIGFE
 vfprintf SIGFE
 vfscanf SIGFE
-_vfscanf_r SIGFE
 vfwprintf SIGFE
 vfwscanf SIGFE
 vhangup SIGFE
 vprintf SIGFE
 vscanf SIGFE
-_vscanf_r SIGFE
 vsnprintf SIGFE
 vsprintf SIGFE
 vsscanf SIGFE
-_vsscanf_r SIGFE
 vswprintf SIGFE
 vswscanf SIGFE
 vsyslog SIGFE
-- 
cgit v1.2.3