*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 471d8491f7ba3f2f259fdc6e5f154a85571cf5a5..2bcad6e4d235a09e12ebb75810b3bd32737e7897 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-29  Thomas Tanner  <tanner@gmx.de>
+
+       * ltconfig.in: do not rely on a leading space when concatenating
+         variables as suggested by Erez Zadok
+       * ltmain.in: likewise
+       * doc/PLATFORMS: updated and reformatted 
+         (thanks to Erez Zadok for the testing)
+       
 1998-12-27  Thomas Tanner  <tanner@gmx.de>
 
        * THANKS: added Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>

diff --git a/doc/PLATFORMS b/doc/PLATFORMS
index 934da41b874380a3784555c9a8428ef2ecbc1995..8a9b91f3cc9428e03d25d0de2759b6c90beff82a 100644 (file)
--- a/doc/PLATFORMS
+++ b/doc/PLATFORMS
@@ -1,54 +1,103 @@
---------------------------------------------------------
-canonical host name          compiler  libtool   results
+--------------------------------------------------------------------------------
+canonical host name          compiler  libtool results        comment
                                        release
---------------------------------------------------------
-alpha-dec-osf3.2             cc        0.8       ok
-alpha-dec-osf3.2             gcc       0.8       ok
-alpha-dec-osf4.0D            cc        1.2c      ok
-alpha-dec-osf4.0D            gcc       1.2c      ok
-alpha-unknown-linux-gnu      gcc       1.2c      ok
-hppa1.1-hp-hpux9.07          cc        1.0f      ok
-hppa1.1-hp-hpux9.07          gcc       1.2a      ok
-hppa1.1-hp-hpux10.10         cc        0.9h      ok
-hppa1.1-hp-hpux10.10         gcc       0.9h      ok
-i386-pc-freebsd2.1.5         gcc       0.5       ok
-i386-pc-netbsd1.2            gcc       0.9g      ok
-i386-pc-bsdi4.0              gcc       1.2c      ok
-i386-unknown-bsdi4.0         gcc       1.2c      ok
-i586-pc-linux-gnulibc1       gcc       1.2c      ok
-i586-pc-linux-gnulibc2       gcc       1.2c      ok
-i586-pc-gnu0.3               gcc       1.2b      ok
-i586-dg-dguxR4.20MU01        gcc       1.2       ok
-i686-pc-cygwin32             egcs      1.2e      ok
-m88k-dg-dguxR4.12TMU01**     gcc       1.2       ok
-mips-sgi-irix5.2             gcc       1.2c      ok
-mips-sgi-irix5.3             cc        0.8       ok
-mips-sgi-irix5.3             gcc       0.8       ok
-mips-sgi-irix6.2             cc        0.9       ok
-mips-sgi-irix6.3             cc        1.2c      ok
-mips-sgi-irix6.3             gcc       1.2c      ok
-mips-sgi-irix6.3             irix5-gcc 1.0f      ok
-mipsel-unknown-openbsd2.1    gcc       1.0       ok
-powerpc-ibm-aix4.1.4.0       xlc       1.0i      ok
-powerpc-ibm-aix4.1.4.0       gcc       1.0       ok
-rs6000-ibm-aix3.2.5          xlc       1.0i      ok
-rs6000-ibm-aix3.2.5          gcc       1.0i      ok*
-sparc-sun-linux-gnu2.1.23    gcc       0.9h      ok
-sparc-sun-sunos4.1.3         cc        1.2c      ok
-sparc-sun-sunos4.1.3         gcc       1.2c      ok
-sparc-sun-sunos4.1.4         cc        1.0f      ok
-sparc-sun-sunos4.1.4         gcc       1.2a      ok
-sparc-sun-solaris2.4         cc        1.0a      ok
-sparc-sun-solaris2.4         gcc       1.0a      ok
-sparc-sun-solaris2.5         cc        1.0a      ok
-sparc-sun-solaris2.5         gcc       1.2c      ok
-sparc-sun-solaris2.6         gcc       1.2c      ok
-sparc-unknown-bsdi4.0        gcc       1.2c      ok
---------------------------------------------------------
+--------------------------------------------------------------------------------
+alpha-dec-osf3.2               cc      0.8     ok
+alpha-dec-osf3.2               gcc     0.8     ok
+alpha-dec-osf4.0D              gcc     1.2c    ok
+alpha-dec-osf4.0D              cc      1.2c    ok
+alpha-dec-osf2.1               gcc     1.2e    ok              static
+alpha-dec-osf4.0               gcc     1.2e    ok
+alpha-dec-osf4.0               cc      1.2e    ok
+alpha-unknown-linux-gnu                gcc     1.2c    ok
+alphaev5-unknown-linux-gnu     gcc     1.2e    ok
+hppa2.0w-hp-hpux11.00          cc      1.2e    ok
+hppa1.1-hp-hpux10.10           gcc     1.2e    ok
+hppa1.1-hp-hpux10.10           cc      0.9h    ok
+hppa1.1-hp-hpux10.20           gcc     1.2e    ok
+hppa1.1-hp-hpux9.01            gcc     1.2e    ok              GNU as
+hppa1.1-hp-hpux9.05            gcc     1.2e    ok
+hppa1.1-hp-hpux9.07            gcc     1.2e    ok
+hppa1.1-hp-hpux9.07            cc      1.0f    ok
+i386-pc-freebsd2.1.5           gcc     0.5     ok
+i386-pc-netbsd1.2              gcc     0.9g    ok
+i386-pc-bsdi2.1                        gcc     1.2e    ok              static
+i386-pc-bsdi3.0                        gcc     1.2e    ok              static
+i386-pc-bsdi3.1                        gcc     1.2e    ok              static
+i386-pc-bsdi4.0                        gcc     1.2e    ok
+i386-unknown-bsdi4.0           gcc     1.2c    ok
+i386-pc-solaris2.5.1           gcc     1.2e    ok
+i386-pc-solaris2.6             gcc     1.2e    ok
+i386-pc-solaris2.7             gcc     1.2e    ok
+i386-unknown-freebsd2.2.8      gcc     1.2e    ok
+i386-unknown-freebsd3.0                gcc     1.2e    ok
+i386-unknown-netbsd1.3.2       gcc     1.2e    ok
+i386-unknown-netbsd1.3.3       gcc     1.2e    ok
+i386-unknown-openbsd2.4                gcc     1.2e    ok
+i486-ncr-sysv4.3.03            gcc     1.2e    ok
+i586-pc-gnu0.3                 gcc     1.2b    ok
+i586-dg-dguxR4.20MU01          gcc     1.2     ok
+i486-pc-linux-gnulibc1         gcc     1.2e    ok
+i586-pc-linux-gnu              gcc     1.2e    ok
+i586-pc-linux-gnulibc1         gcc     1.2e    ok
+i686-pc-linux-gnu              gcc     1.2e    ok
+i686-pc-linux-gnulibc1         gcc     1.2e    ok
+i686-pc-cygwin32               egcs    1.2e    ok
+m68k-next-nextstep3            gcc     1.2e    ok              static
+m68k-sun-sunos4.1.1            gcc     1.2e    ok              !shared
+m88k-dg-dguxR4.12TMU01**       gcc     1.2     ok
+mips-sgi-irix5.2               gcc     1.2c    ok
+mips-sgi-irix5.3               gcc     1.2e    ok
+mips-sgi-irix5.3               cc      0.8     ok
+mips-sgi-irix6.2               gcc     1.2e    ok
+mips-sgi-irix6.2               cc      0.9     ok
+mips-sgi-irix6.3               gcc     1.2c    ok
+mips-sgi-irix6.3               irix5-gcc 1.0f  ok
+mips-sgi-irix6.3               cc      1.2c    ok
+mips-sgi-irix6.4               gcc     1.2e    ok
+mips-sgi-irix6.5               gcc     1.2e    ok
+mipsel-unknown-openbsd2.1      gcc     1.0     ok
+powerpc-ibm-aix4.1.4.0         xlc     1.0i    ok
+powerpc-ibm-aix4.1.4.0         gcc     1.0     ok
+powerpc-ibm-aix4.1.5.0         gcc     1.2e    ok              !shared
+powerpc-ibm-aix4.2.1.0         gcc     1.2e    ok              !shared
+rs6000-ibm-aix3.2.5            xlc     1.0i    ok
+rs6000-ibm-aix3.2.5            gcc     1.0i    ok*
+rs6000-ibm-aix4.1.4.0          gcc     1.2e    ok              !shared
+rs6000-ibm-aix4.1.5.0          gcc     1.2e    ok              !shared
+sparc-sun-linux-gnu2.1.23      gcc     0.9h    ok
+sparc-sun-solaris2.3           gcc     1.2e    ok
+sparc-sun-solaris2.4           gcc     1.0a    ok
+sparc-sun-solaris2.4           cc      1.0a    ok
+sparc-sun-solaris2.5           gcc     1.2e    ok
+sparc-sun-solaris2.5           cc      1.0a    ok
+sparc-sun-solaris2.5.1         gcc     1.2e    ok
+sparc-sun-solaris2.6           gcc     1.2e    ok
+sparc-sun-solaris2.7           gcc     1.2e    ok
+sparc-sun-sunos4.1.3           gcc     1.2e    ok              GNU ld/as
+sparc-sun-sunos4.1.3           cc      1.2c    ok
+sparc-sun-sunos4.1.3C          gcc     1.2e    ok
+sparc-sun-sunos4.1.3_U1                gcc     1.2e    ok
+sparc-sun-sunos4.1.4           gcc     1.2e    ok
+sparc-sun-sunos4.1.4           cc      1.0f    ok
+sparc-unknown-bsdi4.0          gcc     1.2c    ok
+sparc-unknown-linux-gnulibc1   gcc     1.2e    ok
+sparc64-unknown-linux-gnu      gcc     1.2e    ok
+
+Notes:
+
+- "ok" means "all tests passed".
+
+- "static" means that the system doesn't support shared libs,
+  but libtool can build static libraries.
+
+- "!shared" means that the system does support shared libraries, but
+  current libtool could not build them.
 
 * Some versions of GCC's collect2 linker program cannot link trivial
-static binaries on AIX 3.  For these configurations, libtool's
-`-all-static' flag has no effect.
+  static binaries on AIX 3.  For these configurations, libtool's
+  `-all-static' flag has no effect.
+  
 ** Note that R4.12TMU01 is the C2 release of DG/UX which corresponds to
-R4.11MU04 in the base release.  These should be equivalent as far as
-libtool is concerned, but only R4.12TMU01 has actually been tested.
+  R4.11MU04 in the base release.  These should be equivalent as far as
+  libtool is concerned, but only R4.12TMU01 has actually been tested.

diff --git a/ltconfig.in b/ltconfig.in
index d7e43ad75f9411028ccfdce05503b27dbc3bb495..7a10a197a9bff2a2d5074b505839b90d42387cb8 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -996,13 +996,13 @@ if test "$with_gnu_ld" = yes; then
   # See if GNU ld supports shared libraries.
   case "$host_os" in
   amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     ;;
 
   sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs'
     hardcode_direct=yes
     hardcode_minus_L=yes
     hardcode_shlibpath_var=no
@@ -1036,19 +1036,19 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 ' > ltdll.c
       archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $soname-def~
       $DLLTOOL --export-all --output-def $soname-def $libobjs ltdll.$objext~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $rm ltdll.$objext $soname-base $soname-exp'
       archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $soname-def~
       cat "$export_symbols" >> $soname-def~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $rm ltdll.$objext $soname-base $soname-exp'
       old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $soname-def --output-lib $objdir/$libname.a~$rm $soname-def'
    else
@@ -1062,7 +1062,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_from_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
@@ -1073,8 +1073,8 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
-      archive_sym_cmds='$CC -shared ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib$libobjs$deplibs'
+      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib $libobjs $deplibs'
+      archive_sym_cmds='$CC -shared ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib $libobjs $deplibs'
     else
       ld_shlibs=no
     fi
@@ -1092,9 +1092,9 @@ else
   case "$host_os" in
   aix3*)
     allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp~
-       $LD -o $objdir/$soname$libobjs$deplibs -bE:$lib.exp -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-    archive_sym_cmds='$LD -o $objdir/$soname$libobjs$deplibs -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+    archive_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp~
+       $LD -o $objdir/$soname $libobjs $deplibs -bE:$lib.exp -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+    archive_sym_cmds='$LD -o $objdir/$soname $libobjs $deplibs -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
     # Note: this linker hardcodes the directories in LIBPATH if there
     # are no directories specified by -L.
     hardcode_minus_L=yes
@@ -1107,15 +1107,15 @@ else
 
   aix4*)
     allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp        else cat $export_symbols > $lib.exp~
-       $CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
-    archive_sym_cmds='$CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
+    archive_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp        else cat $export_symbols > $lib.exp~
+       $CC -o $objdir/$soname $libobjs $deplibs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
+    archive_sym_cmds='$CC -o $objdir/$soname $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
     hardcode_direct=yes
     hardcode_minus_L=yes
     ;;
 
   amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     ;;
@@ -1148,19 +1148,19 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 ' > ltdll.c
       archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $soname-def~
       $DLLTOOL --export-all --output-def $soname-def $libobjs ltdll.$objext~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $rm ltdll.$objext $soname-base $soname-exp $soname-def'
       archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $soname-def~
       cat "$export_symbols" >> $soname-def~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $soname-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$compile_dependencylibs~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext $compile_dependencylibs~
       $rm ltdll.$objext $soname-base $soname-exp $soname-def'
       old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $soname-def --output-lib $objdir/$libname.a~$rm $soname-def'
     else
@@ -1173,7 +1173,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_from_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
@@ -1187,7 +1187,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
   # does not break anything, and helps significantly (at the cost of a little
   # extra space).
   freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs /usr/lib/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
@@ -1196,7 +1196,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 
   # Unfortunately, older versions of FreeBSD 2 do not have this feature.
   freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs'
     hardcode_direct=yes
     hardcode_minus_L=yes
     hardcode_shlibpath_var=no
@@ -1204,7 +1204,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 
   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
   freebsd3*)
-    archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_minus_L=no
@@ -1212,7 +1212,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     ;;
 
   hpux9*)
-    archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
+    archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname $libobjs $deplibs~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
@@ -1220,7 +1220,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     ;;
 
   hpux10* | hpux11*)
-    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
@@ -1229,23 +1229,23 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 
   irix5* | irix6*)
     if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
+      archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring $libobjs $deplibs'
     else
-      archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
+      archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring $libobjs $deplibs'
     fi
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     ;;
 
   netbsd*)
     # Tested with NetBSD 1.2 ld
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
     ;;
 
   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -1255,24 +1255,24 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp$libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib$libobjs$deplibs $objdir/$libname.def'
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $objdir/$libname.def'
     old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
     ;;
 
   osf3* | osf4*)
     if test "$with_gcc" = yes; then
       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
+      archive_cmds='$CC -shared${allow_undefined_flag} -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring $libobjs $deplibs'
     else
       allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
+      archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring $libobjs $deplibs'
     fi
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
     ;;
 
   sco3.2v5*)
-    archive_cmds='$LD -G -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -G -o $lib $libobjs $deplibs'
     hardcode_direct=yes
     ;;
 
@@ -1280,9 +1280,9 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     no_undefined_flag=' -z text'
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs'
     archive_sym_cmds='$echo "{ global:" > $lib.exp~sed $export_symbols -e "s/.*/\1;/" >> $lib.exp~$echo "local: * }" >> $lib.exp~
-               $LD -G${allow_undefined_flag} -M $export_symbols -h $soname -o $lib$libobjs$deplibs~$rm $lib.exp'
+               $LD -G${allow_undefined_flag} -M $export_symbols -h $soname -o $lib $libobjs $deplibs~$rm $lib.exp'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
 
@@ -1297,9 +1297,9 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
   sunos4*)
     # Why do we need -Bstatic?  To avoid inter-library dependencies, maybe...
     if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared ${wl}-Bstatic -o $lib$libobjs$deplibs'
+      archive_cmds='$CC -shared ${wl}-Bstatic -o $lib $libobjs $deplibs'
     else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs'
     fi
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=yes
@@ -1308,7 +1308,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     ;;
 
   uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=no
     hardcode_minus_L=no
@@ -1316,7 +1316,7 @@ DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
     ;;
 
   dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=no
     hardcode_minus_L=no

diff --git a/ltmain.in b/ltmain.in
index 7c0cca9fa604848e107a63576e5c8f35f1145ddc..27655fed09466fdbca27c09b6e5f983ad1d85cb2 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1398,7 +1398,7 @@ compiler."
        oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
        # Transform .lo files to .o files.
-       oldobjs="$objs"`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
+       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
       fi
 
       if test "$build_libtool_libs" = yes; then
@@ -1688,7 +1688,7 @@ EOF
       $run $rm $obj $libobj
 
       # Create the old-style object.
-      reload_objs="$objs"`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
+      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
 
       output="$obj"
       eval cmds=\"$reload_cmds\"
@@ -1812,7 +1812,7 @@ EOF
        *.c)
          if test -z "$export_symbols"; then
            # Add our own program objects to the preloaded list.
-           dlprefiles=`$echo "X$objs$dlprefiles" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
+           dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
          fi
 
          # Discover the nlist of each of the dlfiles.