This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

4.1 PATCH: Fix libgfortran bootstrap failure on Tru64 UNIX V4.0F (PR libfortran/15234)


Unfortunately, PR libfortran/15234 (the lack of uint32_t etc. on Tru64 UNIX
V4.0F, which breaks bootstrap in libgfortran) still isn't fixed on the 4.1
branch.  The following backport of the patch for PR libgomp/25259 does
this.

It allowed 4.1 branch bootstrap on alpha-dec-osf4.0f to finish (testsuite
is still running).

Ok for the 4.1 branch?  (For some reason, svn diff doesn't include
config/stdint.m4, despite the file has been added by svn merge.  It's
identical to the mainline version, though, so I won't include it here.)

	Rainer

-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University


Wed Feb  8 20:50:29 2006  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	PR libfortran/15234: Backport from mainline
	config:
	2006-01-02  Paolo Bonzini  <bonzini@gnu.org>

        PR target/25259
        * stdint.m4: New.

	libgfortran:
	2006-01-02  Paolo Bonzini  <bonzini@gnu.org>

        PR target/25259
        * configure.ac: Use GCC_HEADER_STDINT.
        * libgfortran.h: Include gstdint.h.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.

Index: libgfortran/libgfortran.h
===================================================================
--- libgfortran/libgfortran.h	(revision 110750)
+++ libgfortran/libgfortran.h	(working copy)
@@ -1,5 +1,5 @@
-/* Common declarations for all of libgfor.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Common declarations for all of libgfortran.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>, and
    Andy Vaught <andy@xena.eas.asu.edu>
 
@@ -51,39 +51,7 @@ Boston, MA 02110-1301, USA.  */
 #include <ieeefp.h>
 #endif
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && defined(TARGET_ILP32)
-typedef char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-typedef long long int64_t;
-typedef unsigned char uint8_t;
-#if defined(__sun) && defined(__svr4__)
-/* Prevent <pthread.h> from redefining uint8_t on Solaris 2.5.1
-   FIXME when the header inclusion scheme is revisited.  */
-#define _UINT8_T
-#endif
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#if defined(__sun) && defined(__svr4__)
-/* Prevent <pthread.h> from redefining uint32_t on Solaris 2.5.1
-   FIXME when the header inclusion scheme is revisited.  */
-#define _UINT32_T
-#endif
-typedef unsigned long long uint64_t;
-#if defined(__sun) && defined(__svr4__)
-/* Prevent <pthread.h> from redefining uint64_t on Solaris 2.5.1
-   FIXME when the header inclusion scheme is revisited.  */
-#define _UINT64_T
-#endif
-#endif
+#include "gstdint.h"
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
Index: libgfortran/configure.ac
===================================================================
--- libgfortran/configure.ac	(revision 110750)
+++ libgfortran/configure.ac	(working copy)
@@ -160,6 +160,7 @@ AC_CHECK_HEADERS(time.h sys/params.h sys
 AC_CHECK_HEADERS(sys/types.h sys/stat.h floatingpoint.h ieeefp.h)
 AC_CHECK_HEADERS(fenv.h fptrap.h float.h)
 AC_CHECK_HEADER([complex.h],[AC_DEFINE([HAVE_COMPLEX_H], [1], [complex.h exists])])
+GCC_HEADER_STDINT(gstdint.h)
 
 AC_CHECK_MEMBERS([struct stat.st_blksize])
 AC_CHECK_MEMBERS([struct stat.st_blocks])


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]