update credits
[LibreOffice.git] / external / postgresql / arm64.patch.1
blobdb8a3ad0a06908a50504e8848f775c45dfb72a6c
1 diff -ur postgresql.org/src/tools/msvc/Mkvcbuild.pm postgresql/src/tools/msvc/Mkvcbuild.pm
2 --- postgresql.org/src/tools/msvc/Mkvcbuild.pm  2021-03-14 02:09:15.288060770 +0100
3 +++ postgresql/src/tools/msvc/Mkvcbuild.pm      2021-03-14 02:12:22.351726582 +0100
4 @@ -107,13 +107,6 @@
5  
6         push(@pgportfiles, 'strtof.c') if ($vsVersion < '14.00');
7  
8 -       if ($vsVersion >= '9.00')
9 -       {
10 -               push(@pgportfiles, 'pg_crc32c_sse42_choose.c');
11 -               push(@pgportfiles, 'pg_crc32c_sse42.c');
12 -               push(@pgportfiles, 'pg_crc32c_sb8.c');
13 -       }
14 -       else
15         {
16                 push(@pgportfiles, 'pg_crc32c_sb8.c');
17         }
18 diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm postgresql/src/tools/msvc/MSBuildProject.pm
19 --- postgresql.org/src/tools/msvc/MSBuildProject.pm     2021-03-14 02:09:15.288060770 +0100
20 +++ postgresql/src/tools/msvc/MSBuildProject.pm 2021-03-14 02:12:22.351726582 +0100
21 @@ -307,8 +307,7 @@
22           : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
23         my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';');
25 -       my $targetmachine =
26 -         $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64';
27 +       my $targetmachine = "MachineARM64";
29         my $includes = $self->{includes};
30         unless ($includes eq '' or $includes =~ /;$/)
31 @@ -347,7 +346,6 @@
32        <ProgramDatabaseFile>.\\$cfgname\\$self->{name}\\$self->{name}.pdb</ProgramDatabaseFile>
33        <GenerateMapFile>false</GenerateMapFile>
34        <MapFileName>.\\$cfgname\\$self->{name}\\$self->{name}.map</MapFileName>
35 -      <RandomizedBaseAddress>false</RandomizedBaseAddress>
36        <!-- Permit links to MinGW-built, 32-bit DLLs (default before VS2012). -->
37        <ImageHasSafeExceptionHandlers/>
38        <SubSystem>Console</SubSystem>
39 diff -ur postgresql.org/src/tools/msvc/Solution.pm postgresql/src/tools/msvc/Solution.pm
40 --- postgresql.org/src/tools/msvc/Solution.pm   2021-03-14 02:09:15.288060770 +0100
41 +++ postgresql/src/tools/msvc/Solution.pm       2021-03-14 02:12:22.351726582 +0100
42 @@ -62,10 +62,7 @@
43         if (1) #($^O eq "MSWin32")
44         {
45                 # Examine CL help output to determine if we are in 32 or 64-bit mode.
46 -               my $output = `cl /? 2>&1`;
47 -               $? >> 8 == 0 or die "cl command not found";
48 -               $self->{platform} =
49 -                 ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
50 +               $self->{platform} = 'ARM64';
51         }
52         else
53         {