system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

* Makeconfig (link-libc, rpath-dirs): Remove AIX cruft definitions.

Browse Source 
(LDFLAGS-rpath-ORIGIN, LDFLAGS-soname-fname): Likewise.
	(LDFLAGS-rdynamic, LDFLAGS-Bsymbolic): Likewise.
	($(common-objpfx)gnu/lib-names.stmp): Likewise.
This commit is contained in:
Roland McGrath 2004-11-04 23:43:59 +00:00
parent ad146de70e
commit 861ff56cb1
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-11-04 Roland McGrath <roland@frob.com>
* Makeconfig (link-libc, rpath-dirs): Remove AIX cruft definitions.
(LDFLAGS-rpath-ORIGIN, LDFLAGS-soname-fname): Likewise.
(LDFLAGS-rdynamic, LDFLAGS-Bsymbolic): Likewise.
($(common-objpfx)gnu/lib-names.stmp): Likewise.
2004-11-01 Jakub Jelinek <jakub@redhat.com> 2004-11-01 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sys/procfs.h [__WORDSIZE == 32] * sysdeps/unix/sysv/linux/x86_64/sys/procfs.h [__WORDSIZE == 32]

21
Makeconfig
View File

@ -452,12 +452,6 @@ link-libc = -Wl,-rpath-link=$(rpath-link) \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib) $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
# This is how to find at build-time things that will be installed there. # This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis rt resolv crypt rpath-dirs = math elf dlfcn nss nis rt resolv crypt
else
ifneq (,$(filter aix aix%,$(config-os)))
link-libc = $(common-objpfx)libc.a \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
rpath-dirs = math dlfcn nss nis rt resolv crypt
endif
endif endif
rpath-link = \ rpath-link = \
$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%))) $(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
@ -475,13 +469,6 @@ LDFLAGS-rpath-ORIGIN = -Wl,-rpath,'$$ORIGIN'
LDFLAGS-soname-fname = -Wl,-soname,$(@F) LDFLAGS-soname-fname = -Wl,-soname,$(@F)
LDFLAGS-rdynamic = -rdynamic LDFLAGS-rdynamic = -rdynamic
LDFLAGS-Bsymbolic = -Bsymbolic LDFLAGS-Bsymbolic = -Bsymbolic
else
ifneq (,$(filter aix aix%,$(config-os)))
LDFLAGS-rpath-ORIGIN =
LDFLAGS-soname-fname =
LDFLAGS-rdynamic = -Wl,-bdynamic
LDFLAGS-Bsymbolic = -Wl,-bsymbolic
endif
endif endif
# Choose the default search path for the dynamic linker based on # Choose the default search path for the dynamic linker based on
@ -835,13 +822,6 @@ postclean-generated += soversions.mk soversions.i \
before-compile += $(common-objpfx)gnu/lib-names.h before-compile += $(common-objpfx)gnu/lib-names.h
ifeq ($(soversions.mk-done),t) ifeq ($(soversions.mk-done),t)
$(common-objpfx)gnu/lib-names.h: $(common-objpfx)gnu/lib-names.stmp; @: $(common-objpfx)gnu/lib-names.h: $(common-objpfx)gnu/lib-names.stmp; @:
ifneq (,$(findstring aix,$(config-os)))
$(common-objpfx)gnu/lib-names.stmp: $(..)sysdeps/unix/sysv/aix/gnu/lib-names.h
$(make-target-directory)
@rm -f ${@:stmp=T} $@
@cp $(..)sysdeps/unix/sysv/aix/gnu/lib-names.h $(common-objpfx)gnu
touch $@
else
$(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
$(make-target-directory) $(make-target-directory)
@rm -f ${@:stmp=T} $@ @rm -f ${@:stmp=T} $@
@ -870,7 +850,6 @@ $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
$(move-if-change) ${@:stmp=T} ${@:stmp=h} $(move-if-change) ${@:stmp=T} ${@:stmp=h}
touch $@ touch $@
endif endif
endif
common-generated += gnu/lib-names.h gnu/lib-names.stmp common-generated += gnu/lib-names.h gnu/lib-names.stmp