* shlib.conf: Change aix5.3 section to aix5.*. Change aix* section to aix4.*,

and set DYNOBJEXT and MAKE_DYNOBJ_COMMAND.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17423 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 919c45af76621701de8d34d718cc6b52bd64fe8b..99addf6dc938c768bdc65008dce47ed34eb53371 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -4,6 +4,9 @@
        file not found).
        * lib.in (PARSE_OBJLISTS): Likewise.
 
+       * shlib.conf: Change aix5.3 section to aix5.*.  Change aix*
+       section to aix4.*, and set DYNOBJEXT and MAKE_DYNOBJ_COMMAND.
+
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
        * post.in ($(BUILDTOP)/.depend-verify-db, depend-verify-db-k5,

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 941a33ab5bcd926eee5ee0d04ea69f93bf6ca713..04ed7724234f0ba58be9f61d4506b14d75879787 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -367,7 +367,7 @@ mips-*-netbsd*)
 
        ;;
 
-*-*-aix5.3*)
+*-*-aix5*)
        SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
        SHLIBEXT=.so
        # AIX doesn't need separate PIC objects
@@ -394,26 +394,33 @@ mips-*-netbsd*)
        RUN_ENV='LIBPATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/lib:/usr/local/lib; export LIBPATH; '
        ;;
 
-*-*-aix*)
+*-*-aix4.*)
        SHLIBVEXT='.a.$(LIBMAJOR).$(LIBMINOR)'
        SHLIBEXT=.a
        # AIX doesn't need separate PIC objects
        SHOBJEXT=.o
        SHLIB_EXPFLAGS='  $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        PROFFLAGS=-pg
+       # Dynamically loaded object can have whatever suffix, but don't
+       # make archives like for shared libraries.
+       DYNOBJEXT=.so
+       #
        if test "$krb5_cv_prog_gcc" = "yes" ; then
          wl_prefix=-Wl,
          RPATH_FLAG='-Wl,-blibpath:'
          LDCOMBINE='$(CC) -shared -v -o shr.o.$(LIBMAJOR).$(LIBMINOR) $$objlist -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:$(SHLIB_EXPORT_FILE) -Xlinker -bernotok $(SHLIB_EXPFLAGS) -lc $$initfini'
+         LDCOMBINE_DYN='$(CC) -shared -v -o $@ $$objlist -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:$(SHLIB_EXPORT_FILE) -Xlinker -bernotok $(SHLIB_EXPFLAGS) -lc $$initfini'
        else
          wl_prefix=
          RPATH_FLAG=-blibpath:
          LDCOMBINE='/bin/ld -o shr.o.$(LIBMAJOR).$(LIBMINOR) $$objlist -H512 -T512 -bnoentry -bgcbypass:1 -bnodelcsect -bfilelist -bM:SRE -bE:$(SHLIB_EXPORT_FILE) -bernotok $(SHLIB_EXPFLAGS) -lc $$initfini'
+         LDCOMBINE_DYN='/bin/ld -o $@ $$objlist -H512 -T512 -bnoentry -bgcbypass:1 -bnodelcsect -bfilelist -bM:SRE -bE:$(SHLIB_EXPORT_FILE) -bernotok $(SHLIB_EXPFLAGS) -lc $$initfini'
        fi
        # Assume initialization always delayed.
        INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
        use_linker_fini_option=yes
        MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
+       MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE_DYN}"
        RPATH_TAIL=:/usr/lib:/lib
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"' $(CFLAGS) $(LDFLAGS)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'