From d46a29d919058fb383d19fe35c234fab58286f71 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Fri, 24 Sep 2021 10:59:47 +0200 Subject: [PATCH] libphobos: Define main function as extern(C) when compiling without D runtime (PR102476) The default supplied main function as read when compiling with `-fmain' has extern(D) linkage. However this does not work when mixing this option together with `-fno-druntime'. PR d/102476 gcc/testsuite/ChangeLog: * gdc.dg/pr102476.d: New test. libphobos/ChangeLog: * libdruntime/__main.di: Define main function as extern(C) when compiling without D runtime. --- gcc/testsuite/gdc.dg/pr102476.d | 3 +++ libphobos/libdruntime/__main.di | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gdc.dg/pr102476.d diff --git a/gcc/testsuite/gdc.dg/pr102476.d b/gcc/testsuite/gdc.dg/pr102476.d new file mode 100644 index 0000000..543716e --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr102476.d @@ -0,0 +1,3 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102476 +// { dg-do link } +// { dg-options "-fmain -fno-druntime" } diff --git a/libphobos/libdruntime/__main.di b/libphobos/libdruntime/__main.di index 8062bf4..ab1264b 100644 --- a/libphobos/libdruntime/__main.di +++ b/libphobos/libdruntime/__main.di @@ -20,7 +20,17 @@ module __main; -int main(char[][]) +version (D_BetterC) { - return 0; + extern (C) int main(int, char**) + { + return 0; + } +} +else +{ + int main(char[][]) + { + return 0; + } } -- 2.7.4