Skip to content

R
riscv-gcc-1
Commit e606fb39 by Andreas Jaeger Committed by Andreas Jaeger
Options

pack_generic.c (pack): Remove unneeded calculation. 

	* intrinsics/pack_generic.c (pack): Remove unneeded calculation.

	* m4/matmull.m4 (matmul_): Remove unneeded calculations, fix
	pointer cast to avoid warning.
	* generated/matmul_l4.c: Regenerated.
	* generated/matmul_l8.c: Regenerated.

	* Makefile.am: Remove AM_CFLAGS here.
	* configure.ac: Define AM_CFLAGS and AM_FCFLAGS so that warnings
	are set.  Set additionally -Wstrict-prototypes for CFLAGS.
	* Makefile.in: Regenerated
	* configure: Regenerated.

From-SVN: r99723
parent 6b021536
Showing with 37 additions and 23 deletions
libgfortran/ChangeLog
2005-05-15 Andreas Jaeger <aj@suse.de> 2005-05-15 Andreas Jaeger <aj@suse.de>
* intrinsics/pack_generic.c (pack): Remove unneeded calculation.
* m4/matmull.m4 (matmul_): Remove unneeded calculations, fix
pointer cast to avoid warning.
* generated/matmul_l4.c: Regenerated.
* generated/matmul_l8.c: Regenerated.
* Makefile.am: Remove AM_CFLAGS here.
* configure.ac: Define AM_CFLAGS and AM_FCFLAGS so that warnings
are set. Set additionally -Wstrict-prototypes for CFLAGS.
* Makefile.in: Regenerated
* configure: Regenerated.
* intrinsics/system_clock.c (system_clock_4, system_clock_8): Add * intrinsics/system_clock.c (system_clock_4, system_clock_8): Add
missing returns, reformat a bit. missing returns, reformat a bit.
......
libgfortran/Makefile.am
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
## We like to use C99 routines when available. This makes sure that
## __STDC_VERSION__ is set such that libc includes make them available.
AM_CFLAGS = -std=gnu99
ACLOCAL_AMFLAGS = -I ../config ACLOCAL_AMFLAGS = -I ../config
## May be used by toolexeclibdir. ## May be used by toolexeclibdir.
...@@ -530,4 +528,3 @@ $(gfor_built_specific2_src): m4/specific2.m4 m4/head.m4 ...@@ -530,4 +528,3 @@ $(gfor_built_specific2_src): m4/specific2.m4 m4/head.m4
endif endif
EXTRA_DIST = $(m4_files) EXTRA_DIST = $(m4_files)
libgfortran/Makefile.in
# Makefile.in generated by automake 1.9.2 from Makefile.am. # Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
...@@ -206,6 +206,8 @@ distuninstallcheck_listfiles = find . -type f -print ...@@ -206,6 +206,8 @@ distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_FCFLAGS = @AM_FCFLAGS@
AR = @AR@ AR = @AR@
AS = @AS@ AS = @AS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
...@@ -213,7 +215,6 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -213,7 +215,6 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
...@@ -300,7 +301,6 @@ target_os = @target_os@ ...@@ -300,7 +301,6 @@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
AM_CFLAGS = -std=gnu99
ACLOCAL_AMFLAGS = -I ../config ACLOCAL_AMFLAGS = -I ../config
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
......
libgfortran/configure
...@@ -308,7 +308,7 @@ ac_includes_default="\ ...@@ -308,7 +308,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT AM_FCFLAGS AM_CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -2932,13 +2932,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -2932,13 +2932,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Add -Wall if we are using GCC. # Add -Wall if we are using GCC.
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall" AM_FCFLAGS="-Wall"
## We like to use C99 routines when available. This makes sure that
## __STDC_VERSION__ is set such that libc includes make them available.
AM_CFLAGS="-std=gnu99 -Wall -Wstrict-prototypes"
fi fi
# Find other programs we need. # Find other programs we need.
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
...@@ -4086,7 +4089,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" ...@@ -4086,7 +4089,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4089 "configure"' > conftest.$ac_ext echo '#line 4092 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -4472,7 +4475,7 @@ fi ...@@ -4472,7 +4475,7 @@ fi
# Provide some information about the compiler. # Provide some information about the compiler.
echo "$as_me:4475:" \ echo "$as_me:4478:" \
"checking for Fortran compiler version" >&5 "checking for Fortran compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2` ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
...@@ -12201,7 +12204,8 @@ s,@CC@,$CC,;t t ...@@ -12201,7 +12204,8 @@ s,@CC@,$CC,;t t
s,@ac_ct_CC@,$ac_ct_CC,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t
s,@EXEEXT@,$EXEEXT,;t t s,@EXEEXT@,$EXEEXT,;t t
s,@OBJEXT@,$OBJEXT,;t t s,@OBJEXT@,$OBJEXT,;t t
s,@CFLAGS@,$CFLAGS,;t t s,@AM_FCFLAGS@,$AM_FCFLAGS,;t t
s,@AM_CFLAGS@,$AM_CFLAGS,;t t
s,@AS@,$AS,;t t s,@AS@,$AS,;t t
s,@ac_ct_AS@,$ac_ct_AS,;t t s,@ac_ct_AS@,$ac_ct_AS,;t t
s,@AR@,$AR,;t t s,@AR@,$AR,;t t
......
libgfortran/configure.ac
...@@ -109,12 +109,15 @@ m4_define([_AC_ARG_VAR_PRECIOUS],[]) ...@@ -109,12 +109,15 @@ m4_define([_AC_ARG_VAR_PRECIOUS],[])
AC_PROG_CC AC_PROG_CC
m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
AC_SUBST(CFLAGS)
# Add -Wall if we are using GCC. # Add -Wall if we are using GCC.
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall" AM_FCFLAGS="-Wall"
## We like to use C99 routines when available. This makes sure that
## __STDC_VERSION__ is set such that libc includes make them available.
AM_CFLAGS="-std=gnu99 -Wall -Wstrict-prototypes"
fi fi
AC_SUBST(AM_FCFLAGS)
AC_SUBST(AM_CFLAGS)
# Find other programs we need. # Find other programs we need.
AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AS, as)
......
libgfortran/intrinsics/pack_generic.c
/* Generic implementation of the PACK intrinsic /* Generic implementation of the PACK intrinsic
Copyright (C) 2002, 2004 Free Software Foundation, Inc. Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
Contributed by Paul Brook <paul@nowt.org> Contributed by Paul Brook <paul@nowt.org>
This file is part of the GNU Fortran 95 runtime library (libgfortran). This file is part of the GNU Fortran 95 runtime library (libgfortran).
...@@ -125,7 +125,6 @@ pack (gfc_array_char *ret, const gfc_array_char *array, ...@@ -125,7 +125,6 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
runtime_error ("Funny sized logical array"); runtime_error ("Funny sized logical array");
for (n = 0; n < dim; n++) for (n = 0; n < dim; n++)
mstride[n] <<= 1; mstride[n] <<= 1;
mstride0 <<= 1;
mptr = GFOR_POINTER_L8_TO_L4 (mptr); mptr = GFOR_POINTER_L8_TO_L4 (mptr);
} }
......
libgfortran/m4/matmull.m4
`/* Implementation of the MATMUL intrinsic `/* Implementation of the MATMUL intrinsic
Copyright 2002 Free Software Foundation, Inc. Copyright 2002, 2005 Free Software Foundation, Inc.
Contributed by Paul Brook <paul@nowt.org> Contributed by Paul Brook <paul@nowt.org>
This file is part of the GNU Fortran 95 runtime library (libgfortran). This file is part of the GNU Fortran 95 runtime library (libgfortran).
...@@ -91,7 +91,7 @@ matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b) ...@@ -91,7 +91,7 @@ matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
} }
retarray->data retarray->data
= internal_malloc_size (sizeof (rtype_name) * size0 (retarray)); = internal_malloc_size (sizeof (rtype_name) * size0 ((array_t *) retarray));
retarray->base = 0; retarray->base = 0;
} }
...@@ -100,14 +100,12 @@ matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b) ...@@ -100,14 +100,12 @@ matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
{ {
assert (GFC_DESCRIPTOR_SIZE (a) == 8); assert (GFC_DESCRIPTOR_SIZE (a) == 8);
abase = GFOR_POINTER_L8_TO_L4 (abase); abase = GFOR_POINTER_L8_TO_L4 (abase);
astride <<= 1;
} }
bbase = b->data; bbase = b->data;
if (GFC_DESCRIPTOR_SIZE (b) != 4) if (GFC_DESCRIPTOR_SIZE (b) != 4)
{ {
assert (GFC_DESCRIPTOR_SIZE (b) == 8); assert (GFC_DESCRIPTOR_SIZE (b) == 8);
bbase = GFOR_POINTER_L8_TO_L4 (bbase); bbase = GFOR_POINTER_L8_TO_L4 (bbase);
bstride <<= 1;
} }
dest = retarray->data; dest = retarray->data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment