Hi,
This patch changes WITH_LOCAL_DRUNTIME to build with `-fno-druntime'.
The D tests done at configure-time for libphobos don't require a
functional D run-time, so don't enable any run-time features.
Bootstrapped and regression tested on x86_64-linux-gnu/-m32/-mx32, and
committed to mainline.
Regards,
Iain.
---
libphobos/ChangeLog:
* configure: Regenerate.
* m4/autoconf.m4 (AC_LANG_PROGRAM): Declare module name 'object'.
* m4/gcc_support.m4 (WITH_LOCAL_DRUNTIME): Compile tests with
-fno-druntime.
---
libphobos/configure | 28 ++++++++++++++--------------
libphobos/m4/autoconf.m4 | 2 +-
libphobos/m4/gcc_support.m4 | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libphobos/configure b/libphobos/configure
index b1c8ecb5673..14298a0dc4f 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -5382,7 +5382,7 @@ fi
gdc_save_DFLAGS=$GDCFLAGS
- GDCFLAGS="-fno-moduleinfo -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
$GDCFLAGS"
+ GDCFLAGS="-fno-druntime -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
$GDCFLAGS"
ac_ext=d
ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5'
@@ -5392,7 +5392,7 @@ ac_compiler_gnu=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking If $GDC can compile D
sources" >&5
$as_echo_n "checking If $GDC can compile D sources... " >&6; }
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
extern(C) int main() {
@@ -12097,7 +12097,7 @@ CC="$lt_save_CC"
gdc_save_DFLAGS=$GDCFLAGS
- GDCFLAGS="-fno-moduleinfo -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
$GDCFLAGS"
+ GDCFLAGS="-fno-druntime -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
$GDCFLAGS"
# Source file extension for D test sources.
@@ -14089,7 +14089,7 @@ fi
gdc_save_DFLAGS=$GDCFLAGS
- GDCFLAGS="-fno-moduleinfo -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
-nophoboslib $GDCFLAGS"
+ GDCFLAGS="-fno-druntime -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
-nophoboslib $GDCFLAGS"
ac_ext=d
ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5'
@@ -14098,7 +14098,7 @@ ac_compiler_gnu=yes
GDCFLAGS="$GDCFLAGS -g -Werror -ffunction-sections -fdata-sections"
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
int foo; void bar() { }
extern(C) int main() {
@@ -14562,7 +14562,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
gdc_save_DFLAGS=$GDCFLAGS
- GDCFLAGS="-fno-moduleinfo -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
-nophoboslib $GDCFLAGS"
+ GDCFLAGS="-fno-druntime -nostdinc -I $phobos_cv_abs_srcdir/libdruntime
-nophoboslib $GDCFLAGS"
ac_ext=d
ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5'
@@ -14576,7 +14576,7 @@ if ${ac_cv_search_malloc+:} false; then :
else
ac_func_search_save_LIBS=$LIBS
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
extern(C) int malloc();
extern(C) int main() {
@@ -14622,7 +14622,7 @@ if ${ac_cv_search_pthread_create+:} false; then :
else
ac_func_search_save_LIBS=$LIBS
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
extern(C) int pthread_create();
extern(C) int main() {
@@ -14668,7 +14668,7 @@ if ${ac_cv_search_cosf+:} false; then :
else
ac_func_search_save_LIBS=$LIBS
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
extern(C) int cosf();
extern(C) int main() {
@@ -14714,7 +14714,7 @@ if ${ac_cv_search_clock_gettime+:} false; then :
else
ac_func_search_save_LIBS=$LIBS
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
extern(C) int clock_gettime();
extern(C) int main() {
@@ -14765,7 +14765,7 @@ $as_echo_n "checking for atomic builtins for byte... "
>&6; }
else
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
import gcc.builtins;
extern(C) int main() {
@@ -14799,7 +14799,7 @@ $as_echo_n "checking for atomic builtins for short... "
>&6; }
else
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
import gcc.builtins;
extern(C) int main() {
@@ -14833,7 +14833,7 @@ $as_echo_n "checking for atomic builtins for int... "
>&6; }
else
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
import gcc.builtins;
extern(C) int main() {
@@ -14867,7 +14867,7 @@ $as_echo_n "checking for atomic builtins for long... "
>&6; }
else
cat > conftest.$ac_ext <<_ACEOF
-module mod;
+module object;
import gcc.builtins;
extern(C) int main() {
diff --git a/libphobos/m4/autoconf.m4 b/libphobos/m4/autoconf.m4
index f46a7809f43..f0ca947478c 100644
--- a/libphobos/m4/autoconf.m4
+++ b/libphobos/m4/autoconf.m4
@@ -27,7 +27,7 @@ AU_DEFUN([AC_LANG_D], [AC_LANG(D)])
# AC_LANG_PROGRAM(D)([PROLOGUE], [BODY])
# ---------------------------------------
m4_define([AC_LANG_PROGRAM(D)],
-[module mod;
+[module object;
$1
extern(C) int main() {
diff --git a/libphobos/m4/gcc_support.m4 b/libphobos/m4/gcc_support.m4
index 0903ed4b45f..cc1acb4a230 100644
--- a/libphobos/m4/gcc_support.m4
+++ b/libphobos/m4/gcc_support.m4
@@ -27,7 +27,7 @@ AC_DEFUN([PHOBOS_ABS_SRCDIR], [
AC_DEFUN([WITH_LOCAL_DRUNTIME], [
AC_REQUIRE([PHOBOS_ABS_SRCDIR])
gdc_save_DFLAGS=$GDCFLAGS
- GDCFLAGS="-fno-moduleinfo -nostdinc -I $phobos_cv_abs_srcdir/libdruntime $2
$GDCFLAGS"
+ GDCFLAGS="-fno-druntime -nostdinc -I $phobos_cv_abs_srcdir/libdruntime $2
$GDCFLAGS"
$1
GDCFLAGS=$gdc_save_DFLAGS
])
--
2.30.2
