Use a unique base address for each DLL.
authorSam Lantinga <slouken@libsdl.org>
Mon, 06 Oct 2003 08:34:08 +0000
changeset 7300f4f974d0201
parent 729 dac996d69abb
child 731 faaa676b20ef
Use a unique base address for each DLL.
Fixed ltmain.sh for MSYS development environment.
acinclude.m4
ltmain.sh
     1.1 --- a/acinclude.m4	Mon Oct 06 07:13:16 2003 +0000
     1.2 +++ b/acinclude.m4	Mon Oct 06 08:34:08 2003 +0000
     1.3 @@ -3043,7 +3043,7 @@
     1.4      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
     1.5  
     1.6      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
     1.7 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
     1.8 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
     1.9        # If the export-symbols file already is a .def file (1st line
    1.10        # is EXPORTS), use it as is; otherwise, prepend...
    1.11        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
    1.12 @@ -3052,7 +3052,7 @@
    1.13  	echo EXPORTS > $output_objdir/$soname.def;
    1.14  	cat $export_symbols >> $output_objdir/$soname.def;
    1.15        fi~
    1.16 -      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
    1.17 +      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
    1.18      else
    1.19        _LT_AC_TAGVAR(ld_shlibs, $1)=no
    1.20      fi
    1.21 @@ -5266,7 +5266,7 @@
    1.22        _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    1.23  
    1.24        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
    1.25 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
    1.26 +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
    1.27  	# If the export-symbols file already is a .def file (1st line
    1.28  	# is EXPORTS), use it as is; otherwise, prepend...
    1.29  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
    1.30 @@ -5275,7 +5275,7 @@
    1.31  	  echo EXPORTS > $output_objdir/$soname.def;
    1.32  	  cat $export_symbols >> $output_objdir/$soname.def;
    1.33  	fi~
    1.34 -	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
    1.35 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base  ${wl}--out-implib,$lib'
    1.36        else
    1.37  	ld_shlibs=no
    1.38        fi
     2.1 --- a/ltmain.sh	Mon Oct 06 07:13:16 2003 +0000
     2.2 +++ b/ltmain.sh	Mon Oct 06 08:34:08 2003 +0000
     2.3 @@ -4656,8 +4656,13 @@
     2.4      return 0;
     2.5  
     2.6    if ((stat (path, &st) >= 0) &&
     2.7 -      (((st.st_mode & S_IXOTH) == S_IXOTH) ||
     2.8 +      (
     2.9 +#ifdef S_IXOTH
    2.10 +       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
    2.11 +#endif
    2.12 +#ifdef S_IXGRP
    2.13         ((st.st_mode & S_IXGRP) == S_IXGRP) ||
    2.14 +#endif
    2.15         ((st.st_mode & S_IXUSR) == S_IXUSR)))
    2.16      return 1;
    2.17    else