Merged changes from HEAD

1 files changed, 18 insertions, 17 deletions

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 30cf31fdd..d10bdf2b5 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -51,7 +51,7 @@ CC:=@CC@
 # FIXME: Which is it, CC or CC_FOR_TARGET?
 CC_FOR_TARGET:=$(CC)
 CFLAGS:=@CFLAGS@
-CFLAGS+=-MMD -fbuiltin
+override CFLAGS+=-MMD -fbuiltin
 CXX:=@CXX@
 CXXFLAGS:=@CXXFLAGS@
 
@@ -117,22 +117,23 @@ MALLOC_OFILES=@MALLOC_OFILES@
 
 DLL_IMPORTS:=$(w32api_lib)/libkernel32.a
 
-# Please maintain this list in sorted order, with maximum files per line
+# Please maintain this list in sorted order, with maximum files per 80 col line
 DLL_OFILES:=assert.o autoload.o cygheap.o cygserver_client.o cygserver_transport.o \
 	cygserver_transport_pipes.o cygserver_transport_sockets.o dcrt0.o debug.o \
 	delqueue.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o exceptions.o \
 	exec.o external.o fcntl.o fhandler.o fhandler_clipboard.o fhandler_console.o \
 	fhandler_disk_file.o fhandler_dsp.o fhandler_floppy.o fhandler_mem.o \
-	fhandler_random.o fhandler_raw.o fhandler_serial.o fhandler_socket.o \
-	fhandler_tape.o fhandler_termios.o fhandler_tty.o fhandler_windows.o \
-	fhandler_zero.o fnmatch.o fork.o glob.o grp.o heap.o init.o ioctl.o ipc.o \
-	localtime.o malloc.o miscfuncs.o mmap.o net.o ntea.o passwd.o path.o \
-	pinfo.o pipe.o poll.o pthread.o regcomp.o regerror.o regexec.o \
-	regfree.o registry.o resource.o scandir.o sched.o sec_acl.o \
-	sec_helper.o security.o select.o shared.o shm.o shortcut.o signal.o \
-	sigproc.o smallprint.o spawn.o strace.o strsep.o sync.o syscalls.o \
-	sysconf.o syslog.o termios.o thread.o times.o tty.o uinfo.o uname.o \
-	v8_regexp.o v8_regerror.o v8_regsub.o wait.o wincap.o window.o \
+	fhandler_proc.o fhandler_process.o fhandler_random.o fhandler_raw.o \
+	fhandler_registry.o fhandler_serial.o fhandler_socket.o \
+	fhandler_tape.o fhandler_termios.o fhandler_tty.o fhandler_virtual.o \
+	fhandler_windows.o fhandler_zero.o fnmatch.o fork.o glob.o grp.o \
+	heap.o init.o ioctl.o ipc.o localtime.o malloc.o miscfuncs.o mmap.o \
+	net.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o pthread.o regcomp.o \
+	regerror.o regexec.o regfree.o registry.o resource.o scandir.o sched.o \
+	sec_acl.o sec_helper.o security.o select.o shared.o shm.o shortcut.o \
+	signal.o sigproc.o smallprint.o spawn.o strace.o strsep.o sync.o \
+	syscalls.o sysconf.o syslog.o termios.o thread.o times.o tty.o uinfo.o \
+	uname.o v8_regexp.o v8_regerror.o v8_regsub.o wait.o wincap.o window.o \
 	$(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MALLOC_OFILES) $(MT_SAFE_OBJECTS)
 
 GMON_OFILES:=gmon.o mcount.o profil.o
@@ -165,10 +166,10 @@ all_host: new-$(LIB_NAME) cygrun.exe
 
 force:
 
-install: install-bin install-libs install-headers install-man install_target \
+install: install-libs install-headers install-man install_target \
 	$(install_host) $(install_target)
 
-uninstall: uninstall-libs uninstall-headers uninstall-man 
+uninstall: uninstall-libs uninstall-headers uninstall-man
 
 install-libs: $(TARGET_LIBS)
 	$(INSTALL_DATA) new-$(DLL_NAME) $(bindir)/$(DLL_NAME); \
@@ -275,10 +276,10 @@ version.cc winver.o: winver_stamp
 	@ :
 
 shared_info_magic.h: cygmagic shared_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC)" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
 
 child_info_magic.h: cygmagic child_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC)" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
 
 dcrt0.o sigproc.o: child_info_magic.h
 
@@ -321,7 +322,7 @@ cygserver_client_outside.o: cygserver_client.cc
 cygserver_shm.o: cygserver_shm.cc
 	$(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $<
 
-cygserver.exe: cygserver.o cygserver_shm.o cygserver_transport_outside.o cygserver_transport_pipes_outside.o cygserver_transport_sockets_outside.o cygserver_client_outside.o cygserver_process.o threaded_queue.o wincap.o version.o smallprint.o 
+cygserver.exe: cygserver.o cygserver_shm.o cygserver_transport_outside.o cygserver_transport_pipes_outside.o cygserver_transport_sockets_outside.o cygserver_client_outside.o cygserver_process.o threaded_queue.o wincap.o version.o smallprint.o
 	$(CXX) -o $@ $^
 #ifdef VERBOSE
 #	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)