Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ExtUtils-CBuilder: Remove image-base generation on Win32/gcc #18494

Merged
merged 1 commit into from
Feb 12, 2021
+24 −25
Merged

ExtUtils-CBuilder: Remove image-base generation on Win32/gcc #18494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
@@ -1356,6 +1356,7 @@ Yves Orton <[email protected]>
Zachary Miller <[email protected]>
Zachary Storer <[email protected]>
Zak B. Elep <[email protected]>
Zakariyya Mughal <[email protected]>
Zbynek Vyskovsky <[email protected]>
Zefram <[email protected]>
Zsbán Ambrus <[email protected]>
7 changes: 7 additions & 0 deletions dist/ExtUtils-CBuilder/Changes
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Revision history for Perl extension ExtUtils::CBuilder.

0.280236 - 2021-02-12

Fix:

- Remove image-base generation on Win32/gcc and instead use GCC's built-in
`--enable-auto-image-base` linker option.

0.280235 - 2020-11-01

Fix:
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ use Perl::OSType qw/os_type/;

use warnings;
use strict;
our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA;

# We only use this once - don't waste a symbol table entry on it.
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ use Text::ParseWords;
use IPC::Cmd qw(can_run);
use File::Temp qw(tempfile);

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION

# More details about C/C++ compilers:
# http://developers.sun.com/sunstudio/documentation/product/compiler.jsp
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Base;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

sub link_executable {
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Base;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

use File::Spec::Functions qw(catfile catdir);
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows.pm
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ use File::Spec;
use ExtUtils::CBuilder::Base;
use IO::File;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

=begin comment
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::BCC;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION

use strict;
use warnings;
15 changes: 3 additions & 12 deletions dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::GCC;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION

use warnings;
use strict;
@@ -40,15 +40,6 @@ sub format_linker_cmd {
unshift( @{$spec{other_ldflags}}, '-nostartfiles' )
if ( $spec{startup} && @{$spec{startup}} );

# From ExtUtils::MM_Win32:
#
## one thing for GCC/Mingw32:
## we try to overcome non-relocateable-DLL problems by generating
## a (hopefully unique) image-base from the dll's name
## -- BKS, 10-19-1999
File::Basename::basename( $spec{output} ) =~ /(....)(.{0,4})/;
$spec{image_base} = sprintf( "0x%x0000", unpack('n', $1 ^ $2) );

%spec = $self->write_linker_script(%spec)
if $spec{use_scripts};

@@ -72,7 +63,7 @@ sub format_linker_cmd {
@ld ,
'-o', $spec{output} ,
"-Wl,--base-file,$spec{base_file}" ,
"-Wl,--image-base,$spec{image_base}" ,
"-Wl,--enable-auto-image-base" ,
@{$spec{lddlflags}} ,
@{$spec{libpath}} ,
@{$spec{startup}} ,
@@ -93,7 +84,7 @@ sub format_linker_cmd {
push @cmds, [ grep {defined && length} (
@ld ,
'-o', $spec{output} ,
"-Wl,--image-base,$spec{image_base}" ,
"-Wl,--enable-auto-image-base" ,
@{$spec{lddlflags}} ,
@{$spec{libpath}} ,
@{$spec{startup}} ,
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::MSVC;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION

use warnings;
use strict;
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use strict;
use ExtUtils::CBuilder::Platform::Unix;
use File::Spec;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub need_prelink { 1 }
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/android.pm
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ use File::Spec;
use ExtUtils::CBuilder::Platform::Unix;
use Config;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

# The Android linker will not recognize symbols from
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use strict;
use File::Spec;
use ExtUtils::CBuilder::Platform::Unix;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

# TODO: If a specific exe_file name is requested, if the exe created
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Platform::Unix;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub compile {
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use strict;
use ExtUtils::CBuilder::Platform::Unix;
use File::Spec;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub link_executable {
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Platform::Unix;

our $VERSION = '0.280235'; # VERSION
our $VERSION = '0.280236'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub need_prelink { 1 }