[Cegcc-svn] SF.net SVN: cegcc:[1372] trunk/cegcc/src/mingw

[<ped...@us...>]

Revision: 1372
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1372&view=rev
Author:   pedroalves
Date:     2009-09-06 21:23:17 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
	* Makefile.in (libceoldname.a): Specify COREDLL.dll as dll name,
	not coredll.dll.
	(libcoredll6.a): Remove rule.
	(lib%.a): Don't pass --dllname to dlltool if the .def file already
	specifies one with LIBRARY.

Modified Paths:
--------------
    trunk/cegcc/src/mingw/ChangeLog.mingw32ce
    trunk/cegcc/src/mingw/Makefile.in

Modified: trunk/cegcc/src/mingw/ChangeLog.mingw32ce
===================================================================
--- trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2009-09-06 20:50:57 UTC (rev 1371)
+++ trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2009-09-06 21:23:17 UTC (rev 1372)
@@ -1,5 +1,13 @@
-2009-02-08  Pedro Alves  <ped...@us...>
+2009-09-06  Pedro Alves  <ped...@us...>
 
+	* Makefile.in (libceoldname.a): Specify COREDLL.dll as dll name,
+	not coredll.dll.
+	(libcoredll6.a): Remove rule.
+	(lib%.a): Don't pass --dllname to dlltool if the .def file already
+	specifies one with LIBRARY.
+
+2009-09-06  Pedro Alves  <ped...@us...>
+
 	* abort.c (abort): Exit with exit code 1 instead of 0.
 
 2009-09-01  Danny Backx  <dan...@us...>

Modified: trunk/cegcc/src/mingw/Makefile.in
===================================================================
--- trunk/cegcc/src/mingw/Makefile.in	2009-09-06 20:50:57 UTC (rev 1371)
+++ trunk/cegcc/src/mingw/Makefile.in	2009-09-06 21:23:17 UTC (rev 1372)
@@ -366,7 +366,7 @@
 
 libceoldname.a: moldname-coredll.def $(MOLD_OBJS)
 	$(DLLTOOL) --as $(AS) -k -U	\
-		--dllname coredll.dll	\
+		--dllname COREDLL.dll	\
 		--def moldname-coredll.def	\
 		--output-lib $@
 	$(AR) rc $@ $(MOLD_OBJS)
@@ -619,11 +619,12 @@
 
 MINGW_REPL_FUNCS = printf fprintf sprintf vprintf vfprintf vsprintf
 
-libcoredll6.a: coredll6.def
-	$(DLLTOOL) --as=$(AS) -k --dllname coredll.dll --output-lib $@ --def $<
-
+# If the .def file specifies an explicit LIBRARY name, then don't
+# override it with --dllname.
 lib%.a: %.def
-	$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@ --def $<
+	grep -q "^LIBRARY " $< 2>&1 1>/dev/null \
+		&& $(DLLTOOL) --as=$(AS) -k --output-lib $@ --def $< \
+		|| $(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@ --def $<
 	for key in $(MINGW_REPL_FUNCS); do \
 	  src=`$(NM_LOOKUP)`; \
 	  if test -n "$$src"; then \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.