summary refs log tree commit diff
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-06-21 02:31:29 +0000
committerGreg McGary <greg@mcgary.org>2000-06-21 02:31:29 +0000
commit28546617b68def43244bdb788cd5c1523f64b50e (patch)
tree0c8ada56ef7fe1397294d4a50cdccce9ee9e8585
parent620cdffb589dd11bb5e17cf0af0b1d559d4037ce (diff)
downloadglibc-28546617b68def43244bdb788cd5c1523f64b50e.tar.gz
glibc-28546617b68def43244bdb788cd5c1523f64b50e.tar.xz
glibc-28546617b68def43244bdb788cd5c1523f64b50e.zip
* Makerules (objects): Add BP thunks.
2000-06-20  Greg McGary  <greg@mcgary.org>

	* Makerules (objects): Add BP thunks.
-rw-r--r--ChangeLog4
-rw-r--r--Makerules11
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 333ab08bdb..52d7af8bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-20  Greg McGary  <greg@mcgary.org>
+
+	* Makerules (objects): Add BP thunks.
+
 2000-06-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/programs/charmap.c (parse_charmap): Handle UCS names also
diff --git a/Makerules b/Makerules
index 7ea9783d0d..6f02ed329a 100644
--- a/Makerules
+++ b/Makerules
@@ -474,18 +474,17 @@ override sources := $(addsuffix .c,\
 			$(filter-out $(elided-routines),\
 			    $(routines) $(aux) \
 			    $(sysdep_routines)))
-# XXX The following was introduced here in the BP patches but it belongs
-# XXX somewhere else since adding it here breaks `make dist'.
-#			    $(addprefix $(bppfx),\
-#				$(filter $(routines) $(sysdep_routines),\
-#				    $(bp-thunks))))
 sysdep_routines := $(sysdep_routines)
 
 headers := $(headers) $(sysdep_headers)
 
 # This is the list of all object files, gotten by
 # replacing every ".c" in `sources' with a ".o".
-override objects	:= $(addprefix $(objpfx),$(sources:.c=.o))
+# We also add bounded-pointer thunks, which are later
+# elided for all suffixes except for `.ob'.
+override objects := $(addprefix $(objpfx),$(sources:.c=.o) \
+		      $(patsubst %,$(bppfx)%.o,\
+			$(filter $(routines) $(sysdep_routines),$(bp-thunks))))
 
 
 # The makefile may define $(extra-libs) with `libfoo libbar'