* gfortran.h: Introduce options to control the mangling.

        * lang.opt: Likewise.
        * options.c (gfc_init_options): Handle the options.
        * trans-common.c (gfc_sym_mangled_common_id): New function.
        (gfc_build_common_decl): Call it.
        * trans-decl.c (gfc_sym_mangled_function_id): New function.
        (gfc_get_extern_function_decl, gfc_build_function_decl): Call it.
	* intrinsic.c (add_sym): Prefix names with correct string.
	(add_sym_0s): New function.
	(add_subroutines): Register abort.
libgfor
	* Makefile.am (gfor_helper_src): Add intrinsics/abort.c.
	(FFLAGS): Add -fno-underscoring.
	* Makefile.in: Regenerate.
	* intrinsics/abort.c: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@70292 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 87 insertions, 13 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8fb05632c8f..748e32d3ff9 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-10  Paul Brook  <paul@nowt.org>
+
+	* Makefile.am (gfor_helper_src): Add intrinsics/abort.c.
+	(FFLAGS): Add -fno-underscoring.
+	* Makefile.in: Regenerate.
+	* intrinsics/abort.c: New file.
+
 2003-08-10  Erik Schnetter  <schnetter@uni-tuebingen.de>
 
 	* fmain.c (main): Do not call init and cleanup; call set_args instead.
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index e9b21beb5d8..61b19c413bc 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -30,6 +30,7 @@ gfor_io_headers= \
 io/io.h
 
 gfor_helper_src= \
+intrinsics/abort.c \
 intrinsics/cpu_time.c \
 intrinsics/eoshift0.c \
 intrinsics/eoshift2.c \
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 1b5f684f558..01c406107c2 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -158,6 +158,7 @@ io/io.h
 
 
 gfor_helper_src = \
+intrinsics/abort.c \
 intrinsics/cpu_time.c \
 intrinsics/eoshift0.c \
 intrinsics/eoshift2.c \
@@ -536,7 +537,7 @@ am__objects_24 = $(am__objects_2) $(am__objects_3) $(am__objects_4) \
 am__objects_25 = backspace.lo close.lo endfile.lo format.lo inquire.lo \
 	list_read.lo lock.lo open.lo read.lo rewind.lo transfer.lo \
 	unit.lo unix.lo write.lo
-am__objects_26 = cpu_time.lo eoshift0.lo eoshift2.lo ishftc.lo \
+am__objects_26 = abort.lo cpu_time.lo eoshift0.lo eoshift2.lo ishftc.lo \
 	pack_generic.lo unpack_generic.lo string_intrinsics.lo size.lo \
 	spread_generic.lo reshape_generic.lo reshape_packed.lo \
 	transpose_generic.lo associated.lo in_pack_generic.lo \
@@ -562,9 +563,9 @@ libgfortranbegin_la_OBJECTS = $(am_libgfortranbegin_la_OBJECTS)
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/all_l4.Plo ./$(DEPDIR)/all_l8.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/any_l4.Plo ./$(DEPDIR)/any_l8.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/associated.Plo \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/abort.Plo ./$(DEPDIR)/all_l4.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/all_l8.Plo ./$(DEPDIR)/any_l4.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/any_l8.Plo ./$(DEPDIR)/associated.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/backspace.Plo ./$(DEPDIR)/close.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/count_4_l4.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/count_4_l8.Plo \
@@ -759,6 +760,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abort.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all_l4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all_l8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/any_l4.Plo@am__quote@
@@ -4626,6 +4628,39 @@ write.lo: io/write.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o write.lo `test -f 'io/write.c' || echo '$(srcdir)/'`io/write.c
 
+abort.o: intrinsics/abort.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abort.o -MD -MP -MF "$(DEPDIR)/abort.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o abort.o `test -f 'intrinsics/abort.c' || echo '$(srcdir)/'`intrinsics/abort.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/abort.Tpo" "$(DEPDIR)/abort.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/abort.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intrinsics/abort.c' object='abort.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/abort.Po' tmpdepfile='$(DEPDIR)/abort.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abort.o `test -f 'intrinsics/abort.c' || echo '$(srcdir)/'`intrinsics/abort.c
+
+abort.obj: intrinsics/abort.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abort.obj -MD -MP -MF "$(DEPDIR)/abort.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o abort.obj `if test -f 'intrinsics/abort.c'; then $(CYGPATH_W) 'intrinsics/abort.c'; else $(CYGPATH_W) '$(srcdir)/intrinsics/abort.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/abort.Tpo" "$(DEPDIR)/abort.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/abort.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intrinsics/abort.c' object='abort.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/abort.Po' tmpdepfile='$(DEPDIR)/abort.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abort.obj `if test -f 'intrinsics/abort.c'; then $(CYGPATH_W) 'intrinsics/abort.c'; else $(CYGPATH_W) '$(srcdir)/intrinsics/abort.c'; fi`
+
+abort.lo: intrinsics/abort.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abort.lo -MD -MP -MF "$(DEPDIR)/abort.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o abort.lo `test -f 'intrinsics/abort.c' || echo '$(srcdir)/'`intrinsics/abort.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/abort.Tpo" "$(DEPDIR)/abort.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/abort.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intrinsics/abort.c' object='abort.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/abort.Plo' tmpdepfile='$(DEPDIR)/abort.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abort.lo `test -f 'intrinsics/abort.c' || echo '$(srcdir)/'`intrinsics/abort.c
+
 cpu_time.o: intrinsics/cpu_time.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpu_time.o -MD -MP -MF "$(DEPDIR)/cpu_time.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o cpu_time.o `test -f 'intrinsics/cpu_time.c' || echo '$(srcdir)/'`intrinsics/cpu_time.c; \
diff --git a/libgfortran/configure b/libgfortran/configure
index ed388e1c4c8..6c46b8e1233 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -1141,7 +1141,7 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -2769,7 +2769,7 @@ if test "x$GCC" = "xyes"; then
 fi
 
 # We need gfortran to compile parts of the library
-# We can't use AC_PROG_F77 because it expecxts a fully working gfortran.
+# We can't use AC_PROG_F77 because it expects a fully working gfortran.
 #AC_PROG_F77(gfortran)
 F77="$GFORTRAN"
 ac_ext=f
@@ -2986,7 +2986,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-FFLAGS="$FFLAGS -Wall -fno-repack-arrays"
+FFLAGS="$FFLAGS -Wall -fno-repack-arrays -fno-underscoring"
 
 
 ac_ext=c
@@ -3385,7 +3385,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -3851,7 +3851,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@@ -4149,7 +4149,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -4995,7 +4995,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 gfor_have_struct_timezone=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
       if test $gfor_have_struct_timezone = yes; then
 
diff --git a/libgfortran/configure.in b/libgfortran/configure.in
index 24ddb593187..ae89cc60778 100644
--- a/libgfortran/configure.in
+++ b/libgfortran/configure.in
@@ -21,11 +21,11 @@ if test "x$GCC" = "xyes"; then
 fi
 
 # We need gfortran to compile parts of the library
-# We can't use AC_PROG_F77 because it expecxts a fully working gfortran. 
+# We can't use AC_PROG_F77 because it expects a fully working gfortran. 
 #AC_PROG_F77(gfortran)
 F77="$GFORTRAN"
 AC_PROG_F77(gfortran)
-FFLAGS="$FFLAGS -Wall -fno-repack-arrays"
+FFLAGS="$FFLAGS -Wall -fno-repack-arrays -fno-underscoring"
 
 AC_FUNC_MMAP
 AC_TYPE_OFF_T
diff --git a/libgfortran/intrinsics/abort.c b/libgfortran/intrinsics/abort.c
new file mode 100644
index 00000000000..e0a6be55681
--- /dev/null
+++ b/libgfortran/intrinsics/abort.c
@@ -0,0 +1,31 @@
+/* Implementation of the CPU_TIME intrinsic.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of the GNU Fortran 95 runtime library (libgfortran).
+
+Libgfor is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+Libgfor is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with libgfor; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include "libgfortran.h"
+#include <assert.h>
+
+
+void prefix(abort) (void);
+
+void prefix(abort) ()
+{
+  abort ();
+}
+