From 13aed6110437a6d02d0f618ec814cff5a34a0de1 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 15 Feb 2011 09:49:14 +0000
Subject: [PATCH] re PR pch/14940 (PCH largefile test fails on various
platforms)
PR pch/14940
* config/alpha/host-osf.c: New file.
* config/alpha/x-osf: New file.
* config.host (alpha*-dec-osf*): Use it.
From-SVN: r170166
---
gcc/ChangeLog | 7 ++
gcc/config.host | 6 +-
gcc/config/alpha/host-osf.c | 147 ++++++++++++++++++++++++++++++++++++
gcc/config/alpha/x-osf | 4 +
4 files changed, 163 insertions(+), 1 deletion(-)
create mode 100644 gcc/config/alpha/host-osf.c
create mode 100644 gcc/config/alpha/x-osf
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0814cc8b73cc..32d96491c5cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR pch/14940
+ * config/alpha/host-osf.c: New file.
+ * config/alpha/x-osf: New file.
+ * config.host (alpha*-dec-osf*): Use it.
+
2011-02-14 Anatoly Sokolov <aesok@post.ru>
* config/rx/rx.h (GO_IF_MODE_DEPENDENT_ADDRESS): Remove.
diff --git a/gcc/config.host b/gcc/config.host
index 5b56f834a747..d0342b996e6e 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -1,6 +1,6 @@
# GCC host-specific configuration file.
# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# 2010, 2011 Free Software Foundation, Inc.
#This file is part of GCC.
@@ -169,6 +169,10 @@ case ${host} in
prefix=/gnu
local_prefix=/gnu/local
;;
+ alpha*-dec-osf*)
+ out_host_hook_obj=host-osf.o
+ host_xmake_file="${host_xmake_file} alpha/x-osf"
+ ;;
alpha*-dec-*vms*)
host_xm_file="vms/xm-vms.h"
host_xmake_file=vms/x-vms
diff --git a/gcc/config/alpha/host-osf.c b/gcc/config/alpha/host-osf.c
new file mode 100644
index 000000000000..0a554b3ec2c6
--- /dev/null
+++ b/gcc/config/alpha/host-osf.c
@@ -0,0 +1,147 @@
+/* Tru64 UNIX host-specific hook definitions.
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ This file is part of GCC.
+
+ GCC is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GCC 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 General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include <sys/mman.h>
+/* Inhibit inclusion of <sys/mount.h>, unnecessary and errors out due to
+ use of poisoned bcmp, bcopy. */
+#define _SYS_MOUNT_H_
+#include <sys/procfs.h>
+#include "hosthooks.h"
+#include "hosthooks-def.h"
+
+
+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS
+#define HOST_HOOKS_GT_PCH_GET_ADDRESS osf_gt_pch_get_address
+#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
+#define HOST_HOOKS_GT_PCH_USE_ADDRESS osf_gt_pch_use_address
+
+/* The mmap ADDR parameter may be ignored without MAP_FIXED set. Before we
+ give up, check existing mappings with ioctl(PIOCMAP) to see if the space
+ is really free. */
+
+static void *
+mmap_fixed (void *addr, size_t len, int prot, int flags, int fd, off_t off)
+{
+ void *base;
+
+ base = mmap ((caddr_t) addr, len, prot, flags, fd, off);
+
+ if (base != addr)
+ {
+ /* PID_MAX is SHRT_MAX on Tru64 UNIX V4.0, but INT_MAX on V5.1.
+ Allow for both. "/proc/" + INT_MAX + '\0'. */
+ char pname[6+10+1];
+ int procfd, nmap;
+ prmap_t *pmap;
+ int i, overlap = 0;
+
+ if (base != (void *) MAP_FAILED)
+ munmap ((caddr_t) base, len);
+
+ /* Check if there's any mapping overlapping [addr, addr+len). */
+
+ snprintf (pname, sizeof (pname), "/proc/%d", getpid ());
+ procfd = open (pname, O_RDONLY);
+ if (procfd == -1)
+ return ((void *) MAP_FAILED);
+ if (ioctl (procfd, PIOCNMAP, &nmap) == -1)
+ return ((void *) MAP_FAILED);
+ pmap = (prmap_t *) xmalloc (sizeof (*pmap) * (nmap+1));
+ if (ioctl (procfd, PIOCMAP, pmap) == -1)
+ return ((void *) MAP_FAILED);
+
+ /* It seems like pmap[] is sorted by address, but can we rely on
+ that? */
+ for (i = 0; i < nmap; i++)
+ {
+ uintptr_t map_start = (uintptr_t) pmap[i].pr_vaddr;
+ uintptr_t map_end = map_start + pmap[i].pr_size;
+
+ if ((uintptr_t) addr < map_end
+ && (uintptr_t) addr+len > map_start)
+ {
+ overlap = 1;
+ break;
+ }
+ }
+ free (pmap);
+ close (procfd);
+
+ if (!overlap)
+ base = mmap ((caddr_t) addr, len, prot, flags | MAP_FIXED, fd, off);
+ else
+ base = mmap ((caddr_t) addr, len, prot, flags, fd, off);
+ }
+
+ return base;
+}
+
+/* For various ports, try to guess a fixed spot in the vm space that's
+ probably free. Take the middle between start of text segment and
+ dynamic loader space. See <sys/machine/addrconf.h> and Tru64 UNIX
+ Assembly Language Programmer's Guide, p.6-18, Figure 6-3: Default Layout
+ of Memory (User Program View). */
+#define TRY_EMPTY_VM_SPACE 0x20050000000
+
+/* Determine a location where we might be able to reliably allocate
+ SIZE bytes. FD is the PCH file, though we should return with the
+ file unmapped. */
+
+static void *
+osf_gt_pch_get_address (size_t size, int fd)
+{
+ void *addr;
+
+ addr = mmap_fixed ((caddr_t) TRY_EMPTY_VM_SPACE, size,
+ PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+
+ /* If we failed the map, that means there's *no* free space. */
+ if (addr == (void *) MAP_FAILED)
+ return NULL;
+ /* Unmap the area before returning. */
+ munmap ((caddr_t) addr, size);
+
+ return addr;
+}
+
+/* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at
+ mapping the data at BASE, -1 if we couldn't. */
+
+static int
+osf_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
+{
+ void *addr;
+
+ /* We're called with size == 0 if we're not planning to load a PCH
+ file at all. This allows the hook to free any static space that
+ we might have allocated at link time. */
+ if (size == 0)
+ return -1;
+
+ addr = mmap_fixed ((caddr_t) base, size,
+ PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset);
+
+ return addr == base ? 1 : -1;
+}
+
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
diff --git a/gcc/config/alpha/x-osf b/gcc/config/alpha/x-osf
new file mode 100644
index 000000000000..5bb9c90986e6
--- /dev/null
+++ b/gcc/config/alpha/x-osf
@@ -0,0 +1,4 @@
+host-osf.o : $(srcdir)/config/alpha/host-osf.c $(CONFIG_H) $(SYSTEM_H) \
+ coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
+ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ $(srcdir)/config/alpha/host-osf.c
--
GitLab