diff options
| author | Greg McGary <greg@mcgary.org> | 2000-06-21 18:15:14 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-06-21 18:15:14 +0000 |
| commit | 69b4c4297c3f3474116b00aa07490d28da61975e (patch) | |
| tree | 793ce40df4f1aa06fde3f53b5d9f49cc3c3ff43d | |
| parent | 387be0875946c3c3328288b47a4f8a5534064b69 (diff) | |
| download | glibc-69b4c4297c3f3474116b00aa07490d28da61975e.tar.gz glibc-69b4c4297c3f3474116b00aa07490d28da61975e.tar.xz glibc-69b4c4297c3f3474116b00aa07490d28da61975e.zip | |
* Makerules (elide-routines.*, elide-bp-thunks):
Define unconditionally.
| -rw-r--r-- | Makerules | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/Makerules b/Makerules index 6f02ed329a..3704073908 100644 --- a/Makerules +++ b/Makerules @@ -369,6 +369,30 @@ define sed-remove-objpfx endef endif +# Modify the list of routines we build for different targets + +ifeq (yes,$(build-shared)) +ifndef libc.so-version +# Undefine this because it can't work when we libc.so is unversioned. +static-only-routines = +endif +endif + +# Bounded pointer thunks are only built for *.ob +elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks)) + +elide-routines.oS += $(filter-out $(static-only-routines),\ + $(routines) $(aux) $(sysdep_routines)) \ + $(elide-bp-thunks) +elide-routines.os += $(static-only-routines) $(elide-bp-thunks) + +# If we have versioned code we don't need the old versions in any of the +# static libraries. +elide-routines.o += $(shared-only-routines) $(elide-bp-thunks) +elide-routines.op += $(shared-only-routines) $(elide-bp-thunks) +elide-routines.og += $(shared-only-routines) $(elide-bp-thunks) +elide-routines.ob += $(shared-only-routines) + # Shared library building. ifeq (yes,$(build-shared)) @@ -413,26 +437,6 @@ $(LINK.o) -shared -o $@ $(sysdep-LDFLAGS) $(config-LDFLAGS) \ $(no-whole-archive) $(LDLIBS-$(@F:%.so=%).so) endef -ifndef libc.so-version -# Undefine this because it can't work when we libc.so is unversioned. -static-only-routines = -endif - -# Bounded pointer thunks are only built for *.ob -elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks)) - -elide-routines.oS += $(filter-out $(static-only-routines),\ - $(routines) $(aux) $(sysdep_routines)) \ - $(elide-bp-thunks) -elide-routines.os += $(static-only-routines) $(elide-bp-thunks) - -# If we have versioned code we don't need the old versions in any of the -# static libraries. -elide-routines.o += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.op += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.og += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.ob += $(shared-only-routines) - # Don't try to use -lc when making libc.so itself. # Also omits crti.o and crtn.o, which we do not want # since we define our own `.init' section specially. |