From 9fbfccff717521641eb52de7581a98bbae35e75f Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 10 Aug 2022 16:09:39 +0200
Subject: [PATCH] Cygwin: move memory management sources into mm subdir

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/cygwin/Makefile.am                | 22 +++++++++++-----------
 winsup/cygwin/{ => mm}/cygheap.cc        |  0
 winsup/cygwin/{ => mm}/heap.cc           |  0
 winsup/cygwin/{ => mm}/malloc.cc         |  0
 winsup/cygwin/{ => mm}/malloc_wrapper.cc |  0
 winsup/cygwin/{ => mm}/mmap.cc           |  0
 winsup/cygwin/{ => mm}/mmap_alloc.cc     |  0
 winsup/cygwin/{ => mm}/shared.cc         |  0
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename winsup/cygwin/{ => mm}/cygheap.cc (100%)
 rename winsup/cygwin/{ => mm}/heap.cc (100%)
 rename winsup/cygwin/{ => mm}/malloc.cc (100%)
 rename winsup/cygwin/{ => mm}/malloc_wrapper.cc (100%)
 rename winsup/cygwin/{ => mm}/mmap.cc (100%)
 rename winsup/cygwin/{ => mm}/mmap_alloc.cc (100%)
 rename winsup/cygwin/{ => mm}/shared.cc (100%)

diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 84e06c82a..f9c45ec14 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -235,6 +235,15 @@ MATH_FILES= \
 	math/tgammal.c \
 	math/truncl.c
 
+MM_FILES = \
+	mm/cygheap.cc \
+	mm/heap.cc \
+	mm/malloc.cc \
+	mm/malloc_wrapper.cc \
+	mm/mmap.cc \
+	mm/mmap_alloc.cc \
+	mm/shared.cc
+
 REGEX_FILES = \
 	regex/regcomp.c \
 	regex/regerror.c \
@@ -259,7 +268,6 @@ DLL_FILES= \
 	clock.cc \
 	ctype.cc \
 	cxx.cc \
-	cygheap.cc \
 	cygthread.cc \
 	cygtls.cc \
 	cygwait.cc \
@@ -285,7 +293,6 @@ DLL_FILES= \
 	glob_pattern_p.cc \
 	globals.cc \
 	grp.cc \
-	heap.cc \
 	hookapi.cc \
 	init.cc \
 	ioctl.cc \
@@ -295,11 +302,8 @@ DLL_FILES= \
 	libstdcxx_wrapper.cc \
 	loadavg.cc \
 	lsearch.cc \
-	malloc_wrapper.cc \
 	miscfuncs.cc \
 	mktemp.cc \
-	mmap.cc \
-	mmap_alloc.cc \
 	msg.cc \
 	mount.cc \
 	net.cc \
@@ -324,7 +328,6 @@ DLL_FILES= \
 	select.cc \
 	sem.cc \
 	setlsapwd.cc \
-	shared.cc \
 	shm.cc \
 	signal.cc \
 	sigproc.cc \
@@ -350,9 +353,6 @@ DLL_FILES= \
 	window.cc \
 	winf.cc
 
-MALLOC_FILES= \
-	malloc.cc
-
 GMON_FILES= \
 	gmon.c \
 	mcount.c \
@@ -368,10 +368,10 @@ libdll_a_SOURCES= \
 	$(TARGET_FILES) \
 	$(DLL_FILES) \
 	$(REGEX_FILES) \
-	$(MALLOC_FILES) \
 	$(FHANDLER_FILES) \
 	$(LIBC_FILES) \
 	$(MATH_FILES) \
+	$(MM_FILES) \
 	$(SEC_FILES) \
 	$(TZCODE_FILES) \
 	$(GENERATED_FILES)
@@ -408,7 +408,7 @@ BUILT_SOURCES = \
 
 # Every time we touch a source file, the version info has to be rebuilt
 # to maintain a correct build date, especially in uname release output
-dirs = $(srcdir) $(srcdir)/fhandler $(srcdir)/lib $(srcdir)/libc $(srcdir)/math $(srcdir)/regex $(srcdir)/sec $(srcdir)/tzcode
+dirs = $(srcdir) $(srcdir)/fhandler $(srcdir)/lib $(srcdir)/libc $(srcdir)/math $(srcdir)/mm $(srcdir)/regex $(srcdir)/sec $(srcdir)/tzcode
 find_src_files = $(wildcard $(dir)/*.[chS]) $(wildcard $(dir)/*.cc)
 src_files := $(foreach dir,$(dirs),$(find_src_files))
 
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/mm/cygheap.cc
similarity index 100%
rename from winsup/cygwin/cygheap.cc
rename to winsup/cygwin/mm/cygheap.cc
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/mm/heap.cc
similarity index 100%
rename from winsup/cygwin/heap.cc
rename to winsup/cygwin/mm/heap.cc
diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/mm/malloc.cc
similarity index 100%
rename from winsup/cygwin/malloc.cc
rename to winsup/cygwin/mm/malloc.cc
diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/mm/malloc_wrapper.cc
similarity index 100%
rename from winsup/cygwin/malloc_wrapper.cc
rename to winsup/cygwin/mm/malloc_wrapper.cc
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mm/mmap.cc
similarity index 100%
rename from winsup/cygwin/mmap.cc
rename to winsup/cygwin/mm/mmap.cc
diff --git a/winsup/cygwin/mmap_alloc.cc b/winsup/cygwin/mm/mmap_alloc.cc
similarity index 100%
rename from winsup/cygwin/mmap_alloc.cc
rename to winsup/cygwin/mm/mmap_alloc.cc
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/mm/shared.cc
similarity index 100%
rename from winsup/cygwin/shared.cc
rename to winsup/cygwin/mm/shared.cc