Improve size discovery

diff --git a/Makefile.PL b/Makefile.PL
index 5f5b4159fb101f5b97136aab49dbe4364f94b459..6f4e066506346e41221cd9c6e37449e1bbecda24 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,28 +35,32 @@ if ($cc) {
  print "none\n";
 }
 
  print "none\n";
 }
 

-my $arch = $Config{archname} || '';
-my ($cpu) = $arch =~ /^([^-]+)/;
-

 my @DEFINES;
 my @DEFINES;

-my $unit = 8;
+
+my $unit = { bits => 8, size => 1 };

 if (unpack("h*", pack("s", 0x1234)) != 4321) {
  print "Forcing unit size of 8 on non-little-endian systems.\n";
 } else {
 if (unpack("h*", pack("s", 0x1234)) != 4321) {
  print "Forcing unit size of 8 on non-little-endian systems.\n";
 } else {

- my $align = int($Config{alignbytes} || 0);

  print "Checking unit size in bits... ";
  print "Checking unit size in bits... ";

- my @s = (8, 16, 32);
- push @s, 64 unless $^O eq 'MSWin32';
- for (@s) {
-  my $size = int($Config{'u' . $_ . 'size'} || 0);
-  $unit = $_ if $size && $size <= $align;
+ my $align = $Config{alignbytes} || 1;
+ my @bits = (8, 16, 32);
+ push @bits, 64 unless $^O eq 'MSWin32';
+ for my $bits (@bits) {
+  my $size = $Config{"u${bits}size"};
+  next unless $size;
+  $unit = { bits => $bits, size => $size } if $size && $size <= $align;

  }
  }

- print $unit, "\n";
+ print $unit->{bits},
+                " (actually $unit->{size} bytes for $align bytes alignment).\n";

 }
 }

-push @DEFINES, DEFINE => '-DBV_UNIT="'
-                                 . ($unit == 64 ? 'uint64_t' : 'U' . $unit)
-                                 . '"'
-                      . ' -DSVU_SIZE=' . $unit;
+
+{
+ my $bits = $unit->{bits};
+ push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
+ push @DEFINES, "-DSVU_SIZE=$bits";
+}
+
+@DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;

 
 my $dist = 'Scalar-Vec-Util';
 
 
 my $dist = 'Scalar-Vec-Util';