From 7b3ce39538c890442a2e46b57bf1911ef7ab8ff8 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 29 Jul 2017 21:04:09 -0700
Subject: [PATCH] Don't compile non-lib modules as lib modules [BZ #21864]

Some programs have more than one source files.  These non-lib modules
should not be compiled with -DMODULE_NAME=libc.  This patch puts these
non-lib modules in $(others-extras) and adds $(others-extras) to
all-nonlib.

	[BZ #21864]
	* Makerules (all-nonlib): Add $(others-extras).
	* catgets/Makefile (others-extras): New.
	* elf/Makefile (others-extras): Likewise.
	* nss/Makefile (others-extras): Likewise.
---
 Makerules        | 3 ++-
 catgets/Makefile | 1 +
 elf/Makefile     | 1 +
 nss/Makefile     | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makerules b/Makerules
index 9bb707c..8f1324d 100644
--- a/Makerules
+++ b/Makerules
@@ -1359,7 +1359,8 @@ lib := testsuite
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 endif
 
-all-nonlib := $(strip $(tests-internal) $(test-internal-extras) $(others))
+all-nonlib := $(strip $(tests-internal) $(test-internal-extras) \
+		      $(others) $(others-extras))
 ifneq (,$(all-nonlib))
 cpp-srcs-left = $(all-nonlib)
 lib := nonlib
diff --git a/catgets/Makefile b/catgets/Makefile
index e5f4949..39aab67 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -38,6 +38,7 @@ tests-special += $(objpfx)tst-catgets-mem.out
 endif
 
 gencat-modules	= xmalloc
+others-extras   = $(gencat-modules)
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
diff --git a/elf/Makefile b/elf/Makefile
index d314a5f..7cf959a 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -112,6 +112,7 @@ install-rootsbin += ldconfig
 
 ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs
 extra-objs	+= $(ldconfig-modules:=.o)
+others-extras   = $(ldconfig-modules)
 endif
 endif
 
diff --git a/nss/Makefile b/nss/Makefile
index 1e298c2..0369249 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -47,6 +47,7 @@ CPPFLAGS-getent.c	= -DHAVE_SUNRPC=$(have-sunrpc)
 others                  := getent makedb
 install-bin             := getent makedb
 makedb-modules = xmalloc hash-string
+others-extras		= $(makedb-modules)
 extra-objs		+= $(makedb-modules:=.o)
 
 tests-static            = tst-field
-- 
2.7.4