Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d9dd406

Browse files
anarazelanarazel
committed
Require C99 (and thus MSCV 2013 upwards).
In 86d78ef I enabled configure to check for C99 support, with the goal of checking which platforms support C99. While there are a few machines without C99 support among our buildfarm animals, de-supporting them for v12 was deemed acceptable. While not tested in aforementioned commit, the biggest increase in minimum compiler version comes from MSVC, which gained C99 support fairly late. The subset in MSVC 2013 is sufficient for our needs, at this point. While that is a significant increase in minimum version, the existing windows binaries are already built with a new enough version. Make configure error out if C99 support could not be detected. For MSVC builds, increase the minimum version to 2013. The increase to MSVC 2013 allows us to get rid of VCBuildProject.pm, as that was only required for MSVC 2005/2008. Author: Andres Freund Discussion: https://postgr.es/m/97d4b165-192d-3605-749c-f614a0c4e783@2ndquadrant.com
1 parent a569eea commit d9dd406

11 files changed

+114
-560
lines changed

‎configure

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4602,6 +4602,13 @@ if test "x$ac_cv_prog_cc_c99" != xno; then :
46024602
fi
46034603

46044604

4605+
4606+
# Error out if the compiler does not support C99, as the codebase
4607+
# relies on that.
4608+
if test "$ac_cv_prog_cc_c99" = no; then
4609+
as_fn_error $? "C compiler \"$CC\" does not support C99" "$LINENO" 5
4610+
fi
4611+
46054612
ac_ext=cpp
46064613
ac_cpp='$CXXCPP $CPPFLAGS'
46074614
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5361,6 +5368,48 @@ fi
53615368

53625369

53635370
# -Wdeclaration-after-statement isn't applicable for C++
5371+
# Really don't want VLAs to be used in our dialect of C
5372+
5373+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Werror=vla, for CFLAGS" >&5
5374+
$as_echo_n "checking whether ${CC} supports -Werror=vla, for CFLAGS... " >&6; }
5375+
if ${pgac_cv_prog_CC_cflags__Werror_vla+:} false; then :
5376+
$as_echo_n "(cached) " >&6
5377+
else
5378+
pgac_save_CFLAGS=$CFLAGS
5379+
pgac_save_CC=$CC
5380+
CC=${CC}
5381+
CFLAGS="${CFLAGS} -Werror=vla"
5382+
ac_save_c_werror_flag=$ac_c_werror_flag
5383+
ac_c_werror_flag=yes
5384+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5385+
/* end confdefs.h. */
5386+
5387+
int
5388+
main ()
5389+
{
5390+
5391+
;
5392+
return 0;
5393+
}
5394+
_ACEOF
5395+
if ac_fn_c_try_compile "$LINENO"; then :
5396+
pgac_cv_prog_CC_cflags__Werror_vla=yes
5397+
else
5398+
pgac_cv_prog_CC_cflags__Werror_vla=no
5399+
fi
5400+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5401+
ac_c_werror_flag=$ac_save_c_werror_flag
5402+
CFLAGS="$pgac_save_CFLAGS"
5403+
CC="$pgac_save_CC"
5404+
fi
5405+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CC_cflags__Werror_vla" >&5
5406+
$as_echo "$pgac_cv_prog_CC_cflags__Werror_vla" >&6; }
5407+
if test x"$pgac_cv_prog_CC_cflags__Werror_vla" = x"yes"; then
5408+
CFLAGS="${CFLAGS} -Werror=vla"
5409+
fi
5410+
5411+
5412+
# -Wvla is not applicable for C++
53645413

53655414
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Wendif-labels, for CFLAGS" >&5
53665415
$as_echo_n "checking whether ${CC} supports -Wendif-labels, for CFLAGS... " >&6; }

‎configure.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,13 @@ esac
359359

360360
AC_PROG_CC([$pgac_cc_list])
361361
AC_PROG_CC_C99()
362+
363+
# Error out if the compiler does not support C99, as the codebase
364+
# relies on that.
365+
if test "$ac_cv_prog_cc_c99" = no; then
366+
AC_MSG_ERROR([C compiler "$CC" does not support C99])
367+
fi
368+
362369
AC_PROG_CXX([$pgac_cxx_list])
363370

364371
# Check if it's Intel's compiler, which (usually) pretends to be gcc,
@@ -477,6 +484,9 @@ if test "$GCC" = yes -a "$ICC" = no; then
477484
# These work in some but not all gcc versions
478485
PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
479486
# -Wdeclaration-after-statement isn't applicable for C++
487+
# Really don't want VLAs to be used in our dialect of C
488+
PGAC_PROG_CC_CFLAGS_OPT([-Werror=vla])
489+
# -Wvla is not applicable for C++
480490
PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
481491
PGAC_PROG_CXX_CFLAGS_OPT([-Wendif-labels])
482492
PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])

‎doc/src/sgml/install-windows.sgml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Microsoft tools is to install <productname>Visual Studio Express 2017
2323
for Windows Desktop</productname> and use the included
2424
compiler. It is also possible to build with the full
25-
<productname>Microsoft Visual C++ 2005 to 2017</productname>.
25+
<productname>Microsoft Visual C++ 2013 to 2017</productname>.
2626
In some cases that requires the installation of the
2727
<productname>Windows SDK</productname> in addition to the compiler.
2828
</para>
@@ -77,20 +77,24 @@
7777
<para>
7878
Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
7979
32-bit PostgreSQL builds are possible with
80-
<productname>Visual Studio 2005</productname> to
80+
<productname>Visual Studio 2013</productname> to
8181
<productname>Visual Studio 2017</productname> (including Express editions),
8282
as well as standalone Windows SDK releases 6.0 to 8.1.
8383
64-bit PostgreSQL builds are supported with
8484
<productname>Microsoft Windows SDK</productname> version 6.0a to 8.1 or
85-
<productname>Visual Studio 2008</productname> and above. Compilation
86-
is supported down to <productname>Windows XP</productname> and
87-
<productname>Windows Server 2003</productname> when building with
88-
<productname>Visual Studio 2005</productname> to
89-
<productname>Visual Studio 2013</productname>. Building with
90-
<productname>Visual Studio 2015</productname> is supported down to
91-
<productname>Windows Vista</productname> and <productname>Windows Server 2008</productname>.
92-
Building with <productname>Visual Studio 2017</productname> is supported
93-
down to <productname>Windows 7 SP1</productname> and <productname>Windows Server 2008 R2 SP1</productname>.
85+
<productname>Visual Studio 2013</productname> and above. Compilation
86+
is supported down to <productname>Windows 7</productname> and
87+
<productname>Windows Server 2008 R2 SP1</productname> when building with
88+
<productname>Visual Studio 2013</productname> to
89+
<productname>Visual Studio 2017</productname>.
90+
<!--
91+
For 2013 requirements:
92+
https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2013-sysrequirements-vs
93+
For 2015 requirements:
94+
https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2015-sysrequirements-vs
95+
For 2017 requirements:
96+
https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2017-system-requirements-vs
97+
-->
9498
</para>
9599

96100
<para>

‎doc/src/sgml/installation.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ su - postgres
8585
<listitem>
8686
<para>
8787
You need an <acronym>ISO</acronym>/<acronym>ANSI</acronym> C compiler (at least
88-
C89-compliant). Recent
88+
C99-compliant). Recent
8989
versions of <productname>GCC</productname> are recommended, but
9090
<productname>PostgreSQL</productname> is known to build using a wide variety
9191
of compilers from different vendors.

‎doc/src/sgml/sources.sgml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -867,19 +867,30 @@ BETTER: unrecognized node type: 42
867867
<title>C Standard</title>
868868
<para>
869869
Code in <productname>PostgreSQL</productname> should only rely on language
870-
features available in the C89 standard. That means a conforming
871-
C89 compiler has to be able to compile postgres, at least aside
872-
from a few platform dependent pieces. Features from later
873-
revision of the C standard or compiler specific features can be
874-
used, if a fallback is provided.
875-
</para>
876-
<para>
877-
For example <literal>static inline</literal> and
878-
<literal>_StaticAssert()</literal> are currently used, even
879-
though they are from newer revisions of the C standard. If not
880-
available we respectively fall back to defining the functions
881-
without inline, and to using a C89 compatible replacement that
882-
performs the same checks, but emits rather cryptic messages.
870+
features available in the C99 standard. That means a conforming
871+
C99 compiler has to be able to compile postgres, at least aside
872+
from a few platform dependent pieces.
873+
</para>
874+
<para>
875+
A few features included in the C99 standard are, at this time, not be
876+
permitted to be used in core <productname>PostgreSQL</productname>
877+
code. This currently includes variable length arrays, intermingled
878+
declarations and code, <literal>//</literal> comments, universal
879+
character names. Reasons for that include portability and historical
880+
practices.
881+
</para>
882+
<para>
883+
Features from later revision of the C standard or compiler specific
884+
features can be used, if a fallback is provided.
885+
</para>
886+
<para>
887+
For example <literal>_StaticAssert()</literal> and
888+
<literal>__builtin_constant_p</literal> are currently used, even though
889+
they are from newer revisions of the C standard and a
890+
<productname>GCC</productname> extension respectively. If not available
891+
we respectively fall back to using a C99 compatible replacement that
892+
performs the same checks, but emits rather cryptic messages and do not
893+
use <literal>__builtin_constant_p</literal>.
883894
</para>
884895
</simplesect>
885896

‎src/tools/msvc/MSBuildProject.pm

Lines changed: 5 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package MSBuildProject;
22

33
#
4-
# Package that encapsulates a MSBuild project file (Visual C++ 2010 or greater)
4+
# Package that encapsulates a MSBuild project file (Visual C++ 2013 or greater)
55
#
66
# src/tools/msvc/MSBuildProject.pm
77
#
@@ -257,6 +257,7 @@ sub WriteConfigurationPropertyGroup
257257
<UseOfMfc>false</UseOfMfc>
258258
<CharacterSet>MultiByte</CharacterSet>
259259
<WholeProgramOptimization>$p->{wholeopt}</WholeProgramOptimization>
260+
<PlatformToolset>$self->{PlatformToolset}</PlatformToolset>
260261
</PropertyGroup>
261262
EOF
262263
return;
@@ -391,75 +392,6 @@ EOF
391392
return;
392393
}
393394

394-
package VC2010Project;
395-
396-
#
397-
# Package that encapsulates a Visual C++ 2010 project file
398-
#
399-
400-
use strict;
401-
use warnings;
402-
use base qw(MSBuildProject);
403-
404-
no warnings qw(redefine); ## no critic
405-
406-
sub new
407-
{
408-
my $classname = shift;
409-
my $self = $classname->SUPER::_new(@_);
410-
bless($self, $classname);
411-
412-
$self->{vcver} = '10.00';
413-
414-
return $self;
415-
}
416-
417-
package VC2012Project;
418-
419-
#
420-
# Package that encapsulates a Visual C++ 2012 project file
421-
#
422-
423-
use strict;
424-
use warnings;
425-
use base qw(MSBuildProject);
426-
427-
no warnings qw(redefine); ## no critic
428-
429-
sub new
430-
{
431-
my $classname = shift;
432-
my $self = $classname->SUPER::_new(@_);
433-
bless($self, $classname);
434-
435-
$self->{vcver} = '11.00';
436-
$self->{PlatformToolset} = 'v110';
437-
438-
return $self;
439-
}
440-
441-
# This override adds the <PlatformToolset> element
442-
# to the PropertyGroup labeled "Configuration"
443-
sub WriteConfigurationPropertyGroup
444-
{
445-
my ($self, $f, $cfgname, $p) = @_;
446-
my $cfgtype =
447-
($self->{type} eq "exe")
448-
? 'Application'
449-
: ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
450-
451-
print $f <<EOF;
452-
<PropertyGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'" Label="Configuration">
453-
<ConfigurationType>$cfgtype</ConfigurationType>
454-
<UseOfMfc>false</UseOfMfc>
455-
<CharacterSet>MultiByte</CharacterSet>
456-
<WholeProgramOptimization>$p->{wholeopt}</WholeProgramOptimization>
457-
<PlatformToolset>$self->{PlatformToolset}</PlatformToolset>
458-
</PropertyGroup>
459-
EOF
460-
return;
461-
}
462-
463395
package VC2013Project;
464396

465397
#
@@ -468,7 +400,7 @@ package VC2013Project;
468400

469401
use strict;
470402
use warnings;
471-
use base qw(VC2012Project);
403+
use base qw(MSBuildProject);
472404

473405
no warnings qw(redefine); ## no critic
474406

@@ -493,7 +425,7 @@ package VC2015Project;
493425

494426
use strict;
495427
use warnings;
496-
use base qw(VC2012Project);
428+
use base qw(MSBuildProject);
497429

498430
no warnings qw(redefine); ## no critic
499431

@@ -518,7 +450,7 @@ package VC2017Project;
518450

519451
use strict;
520452
use warnings;
521-
use base qw(VC2012Project);
453+
use base qw(MSBuildProject);
522454

523455
no warnings qw(redefine); ## no critic
524456

‎src/tools/msvc/README

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MSVC build
44
==========
55

66
This directory contains the tools required to build PostgreSQL using
7-
Microsoft Visual Studio 2005 - 2017. This builds the whole backend, not just
7+
Microsoft Visual Studio 2013 - 2017. This builds the whole backend, not just
88
the libpq frontend library. For more information, see the documentation
99
chapter "Installation on Windows" and the description below.
1010

@@ -67,14 +67,12 @@ Install.pm module containing the install logic
6767
Mkvcbuild.pm module containing the code to generate the Visual
6868
Studio build (project/solution) files
6969
MSBuildProject.pm module containing the code to generate MSBuild based
70-
project files (Visual Studio 2010 or greater)
70+
project files (Visual Studio 2013 or greater)
7171
Project.pm module containing the common code to generate the
7272
Visual Studio project files. Also provides the
7373
common interface of all project file generators
7474
Solution.pm module containing the code to generate the Visual
7575
Studio solution files.
76-
VCBuildProject.pm module containing the code to generate VCBuild based
77-
project files (Visual Studio 2005/2008)
7876
VSObjectFactory.pm factory module providing the code to create the
7977
appropriate project/solution files for the current
8078
environment
@@ -90,14 +88,12 @@ config_default.pl to create the configuration arguments.
9088
These configuration arguments are passed over to Mkvcbuild::mkvcbuild
9189
(Mkvcbuild.pm) which creates the Visual Studio project and solution files.
9290
It does this by using VSObjectFactory::CreateSolution to create an object
93-
implementing the Solution interface (this could be either a VS2005Solution,
94-
a VS2008Solution, a VS2010Solution or a VS2012Solution or a VS2013Solution,
91+
implementing the Solution interface (this could be either a VS2013Solution,
9592
or a VS2015Solution or a VS2017Solution, all in Solution.pm, depending on
9693
the user's build environment) and adding objects implementing the corresponding
97-
Project interface (VC2005Project or VC2008Project from VCBuildProject.pm or
98-
VC2010Project or VC2012Project or VC2013Project or VC2015Project or VC2017Project
99-
from MSBuildProject.pm) to it.
94+
Project interface (VC2013Project or VC2015Project or VC2017Project from
95+
MSBuildProject.pm) to it.
10096
When Solution::Save is called, the implementations of Solution and Project
10197
save their content in the appropriate format.
102-
The final step of starting the appropriate build program (msbuild or vcbuild)
103-
is performed in build.pl again.
98+
The final step of starting the appropriate build program (msbuild) is
99+
performed in build.pl again.

0 commit comments

Comments
 (0)