Skip to content

Commit 9b96596

Browse files
committed
configure: move -fexcess-precision=standard to the internal cflags (ocaml#9496)
Follow-up to c5afa93. The GCC option -fexcess=precision is supported for C but not for C++. Some users use ocamlc -c or ocamlopt -c to compile C++ source files, causing errors since -fexcess-precision=standard was added to the common C flags in commit c5afa93. This commit moves -fexcess-precision=standard to the internal C flags, so that ocamlc -c and ocamlopt -c will not apply it to C / C++ source files. (cherry picked from commit 4d3b431)
1 parent ff98901 commit 9b96596

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

configure

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12497,10 +12497,10 @@ case $host in #(
1249712497
gcc-[01234]-*) :
1249812498
as_fn_error $? "This version of Mingw GCC is too old. Please use GCC version 5 or above." "$LINENO" 5 ;; #(
1249912499
gcc-*) :
12500-
internal_cflags="-Wno-unused $gcc_warnings"
12500+
internal_cflags="-Wno-unused $gcc_warnings \
12501+
-fexcess-precision=standard"
1250112502
# TODO: see whether the code can be fixed to avoid -Wno-unused
12502-
common_cflags="-O2 -fno-strict-aliasing -fwrapv \
12503-
-fexcess-precision=standard -mms-bitfields"
12503+
common_cflags="-O2 -fno-strict-aliasing -fwrapv -mms-bitfields"
1250412504
internal_cppflags='-DUNICODE -D_UNICODE'
1250512505
internal_cppflags="$internal_cppflags -DWINDOWS_UNICODE="
1250612506
internal_cppflags="${internal_cppflags}\$(WINDOWS_UNICODE)" ;; #(
@@ -12532,12 +12532,12 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;};
1253212532
internal_cflags="$gcc_warnings" ;; #(
1253312533
gcc-4-*) :
1253412534
common_cflags="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv \
12535-
-fno-builtin-memcmp -fexcess-precision=standard";
12536-
internal_cflags="$gcc_warnings" ;; #(
12535+
-fno-builtin-memcmp";
12536+
internal_cflags="$gcc_warnings -fexcess-precision=standard" ;; #(
1253712537
gcc-*) :
12538-
common_cflags="-O2 -fno-strict-aliasing -fwrapv \
12539-
-fexcess-precision=standard";
12540-
internal_cflags="$gcc_warnings -fno-common" ;; #(
12538+
common_cflags="-O2 -fno-strict-aliasing -fwrapv";
12539+
internal_cflags="$gcc_warnings -fno-common \
12540+
-fexcess-precision=standard" ;; #(
1254112541
msvc-*) :
1254212542
common_cflags="-nologo -O2 -Gy- -MD"
1254312543
common_cppflags="-D_CRT_SECURE_NO_DEPRECATE"

configure.ac

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -555,10 +555,10 @@ AS_CASE([$host],
555555
[AC_MSG_ERROR(m4_normalize([This version of Mingw GCC is too old.
556556
Please use GCC version 5 or above.]))],
557557
[gcc-*],
558-
[internal_cflags="-Wno-unused $gcc_warnings"
558+
[internal_cflags="-Wno-unused $gcc_warnings \
559+
-fexcess-precision=standard"
559560
# TODO: see whether the code can be fixed to avoid -Wno-unused
560-
common_cflags="-O2 -fno-strict-aliasing -fwrapv \
561-
-fexcess-precision=standard -mms-bitfields"
561+
common_cflags="-O2 -fno-strict-aliasing -fwrapv -mms-bitfields"
562562
internal_cppflags='-DUNICODE -D_UNICODE'
563563
internal_cppflags="$internal_cppflags -DWINDOWS_UNICODE="
564564
internal_cppflags="${internal_cppflags}\$(WINDOWS_UNICODE)"],
@@ -587,12 +587,12 @@ AS_CASE([$host],
587587
internal_cflags="$gcc_warnings"],
588588
[gcc-4-*],
589589
[common_cflags="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv \
590-
-fno-builtin-memcmp -fexcess-precision=standard";
591-
internal_cflags="$gcc_warnings"],
590+
-fno-builtin-memcmp";
591+
internal_cflags="$gcc_warnings -fexcess-precision=standard"],
592592
[gcc-*],
593-
[common_cflags="-O2 -fno-strict-aliasing -fwrapv \
594-
-fexcess-precision=standard";
595-
internal_cflags="$gcc_warnings -fno-common"],
593+
[common_cflags="-O2 -fno-strict-aliasing -fwrapv";
594+
internal_cflags="$gcc_warnings -fno-common \
595+
-fexcess-precision=standard"],
596596
[msvc-*],
597597
[common_cflags="-nologo -O2 -Gy- -MD"
598598
common_cppflags="-D_CRT_SECURE_NO_DEPRECATE"

0 commit comments

Comments
 (0)