@@ -806,9 +806,10 @@ proper position among the other output files. */
#ifndef MPX_SPEC
#define MPX_SPEC "\
-%{!nostdlib:%{!nodefaultlibs:%{mmpx:\
+%{!nostdlib:%{!nodefaultlibs:%{mmpx:%{fcheck-pointer-bounds:\
%{static:%nMPX runtime is disabled due to -static used}\
- %{!static:-lmpx}}}}"
+ %{!static:-lmpx}\
+ %{!fno-chkp-use-wrappers:-lmpxwrappers}}}}}"
#endif
/* -u* was put back because both BSD and SysV seem to support it. */
@@ -1,6 +1,9 @@
ACLOCAL_AMFLAGS = -I .. -I ../config
-SUBDIRS = mpxrt
+SUBDIRS = mpxrt mpxwrap
+
+## May be used by toolexeclibdir.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
@@ -39,3 +42,5 @@ AM_MAKEFLAGS = \
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
+
+MAKEOVERRIDES =
@@ -110,7 +110,7 @@ fi
AC_CONFIG_FILES([Makefile])
AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES(AC_FOREACH([DIR], [mpxrt], [DIR/Makefile]),
+AC_CONFIG_FILES(AC_FOREACH([DIR], [mpxrt mpxwrap], [DIR/Makefile ]),
[cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
new file mode 100644
@@ -0,0 +1,52 @@
+ALCLOCAL_AMFLAGS = -I .. -I ../config
+
+# May be used by toolexeclibdir.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+
+libmpxwrappers_la_CFLAGS = -fcheck-pointer-bounds -mmpx -fno-chkp-check-read \
+ -fno-chkp-check-write -fno-chkp-use-wrappers
+
+toolexeclib_LTLIBRARIES = libmpxwrappers.la
+
+libmpxwrappers_la_SOURCES = mpx_wrappers.c
+
+# Work around what appears to be a GNU make bug handling MAKEFLAGS
+# values defined in terms of make variables, as is the case for CC and
+# friends when we are called from the top level Makefile.
+AM_MAKEFLAGS = \
+ "AR_FLAGS=$(AR_FLAGS)" \
+ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+ "CFLAGS=$(CFLAGS)" \
+ "CXXFLAGS=$(CXXFLAGS)" \
+ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+ "INSTALL=$(INSTALL)" \
+ "INSTALL_DATA=$(INSTALL_DATA)" \
+ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+ "JC1FLAGS=$(JC1FLAGS)" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "LIBCFLAGS=$(LIBCFLAGS)" \
+ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+ "MAKE=$(MAKE)" \
+ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+ "PICFLAG=$(PICFLAG)" \
+ "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+ "SHELL=$(SHELL)" \
+ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+ "exec_prefix=$(exec_prefix)" \
+ "infodir=$(infodir)" \
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "LD=$(LD)" \
+ "LIBCFLAGS=$(LIBCFLAGS)" \
+ "NM=$(NM)" \
+ "PICFLAG=$(PICFLAG)" \
+ "RANLIB=$(RANLIB)" \
+ "DESTDIR=$(DESTDIR)"
+
+MAKEOVERRIDES =
+
new file mode 100644
@@ -0,0 +1,6 @@
+# This file is used to maintain libtool version info for libmpxintr. See
+# the libtool manual to understand the meaning of the fields. This is
+# a separate file so that version updates don't involve re-running
+# automake.
+# CURRENT:REVISION:AGE
+1:0:0
new file mode 100644
@@ -0,0 +1,238 @@
+#include "stdlib.h"
+#include "string.h"
+#include <sys/mman.h>
+
+void *
+__mpx_wrapper_malloc (size_t size)
+{
+ void *p = (void *)malloc (size);
+ if (!p) return __bnd_null_ptr_bounds (p);
+ return __bnd_set_ptr_bounds (p, size);
+}
+
+
+void *
+__mpx_wrapper_mmap (void *addr, size_t length, int prot, int flags,
+ int fd, off_t offset)
+{
+ void *p = mmap (addr, length, prot, flags, fd, offset);
+ if (!p) return __bnd_null_ptr_bounds (p);
+ return __bnd_set_ptr_bounds (p, length);
+}
+
+void *
+__mpx_wrapper_realloc (void *ptr, size_t n)
+{
+ if (!ptr)
+ return __mpx_wrapper_malloc (n);
+
+ /* We don't kwnow how much data is copied by realloc
+ and therefore may check only lower bounds. */
+ __bnd_chk_ptr_lbounds (ptr);
+ ptr = realloc (ptr, n);
+
+ if (!ptr)
+ return __bnd_null_ptr_bounds (ptr);
+
+ return __bnd_set_ptr_bounds (ptr, n);
+}
+
+void *
+__mpx_wrapper_calloc (size_t n_elements, size_t element_size)
+{
+ void *p = calloc (n_elements, element_size);
+ if (!p)
+ return __bnd_null_ptr_bounds (p);
+ return __bnd_set_ptr_bounds (p, n_elements * element_size);
+}
+
+void *
+__mpx_wrapper_memset (void *dstpp, int c, size_t len)
+{
+ if (len > 0)
+ {
+ __bnd_chk_ptr_bounds (dstpp, len);
+ memset (dstpp, c, len);
+ }
+ return dstpp;
+}
+
+void
+__mpx_wrapper_bzero (void *dst, size_t len)
+{
+ __mpx_wrapper_memset (dst, 0, len);
+}
+
+void *
+__mpx_wrapper_memmove (void *dst, const void *src, size_t n)
+{
+ const char *s = (const char*)src;
+ char *d = (char*)dst;
+ void *ret = dst;
+ size_t offset_src = ((size_t) s) & (sizeof (void *) - 1);
+ size_t offset_dst = ((size_t) d) & (sizeof (void *) - 1);
+
+ __bnd_chk_ptr_bounds (dst, n);
+ __bnd_chk_ptr_bounds (src, n);
+
+ /* Different alignment means that even if
+ pointers exist in memory, we don't how
+ pointers are aligned and therefore cann't
+ copy bounds anyway. */
+ if (offset_src != offset_dst)
+ memmove (dst, src, n);
+ else
+ {
+ if (s < d)
+ {
+ d += n;
+ s += n;
+ offset_src = (offset_src + n) & (sizeof (void *) -1);
+ while (n-- && offset_src--)
+ *--d = *--s;
+ n++;
+ if (!n)
+ return ret;
+ void **d1 = (void **)d;
+ void **s1 = (void **)s;
+ /* This loop will also copy bounds. */
+ while (n >= sizeof (void *))
+ {
+ n -= sizeof (void *);
+ *--d1 = *--s1;
+ }
+ s = (char *)s1;
+ d = (char *)d1;
+ while (n--)
+ *--d = *--s;
+ }
+ else
+ {
+ offset_src = sizeof (void *) - offset_src;
+ while (n-- && offset_src--)
+ *d++ = *s++;
+ n++;
+ if (!n)
+ return ret;
+ void **d1 = (void **)d;
+ void **s1 = (void **)s;
+ /* This loop will also copy bounds. */
+ while (n >= sizeof (void *))
+ {
+ n -= sizeof (void *);
+ *d1++ = *s1++;
+ }
+ s = (char *)s1;
+ d = (char *)d1;
+ while (n--)
+ *d++ = *s++;
+ }
+ }
+ return ret;
+}
+
+
+void *
+__mpx_wrapper_memcpy (void *dst, const void *src, size_t n)
+{
+ return __mpx_wrapper_memmove (dst, src, n);
+}
+
+void *
+__mpx_wrapper_mempcpy (void *dst, const void *src, size_t n)
+{
+ return (char *)__mpx_wrapper_memcpy (dst, src, n) + n;
+}
+
+char *
+__mpx_wrapper_strncat (char *dst, const char *src, size_t n)
+{
+ size_t dst_size = strlen (dst);
+ size_t src_size = strnlen (src, n);
+
+ __bnd_chk_ptr_bounds (dst, dst_size + src_size + 1);
+ if (src_size < n)
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+ else
+ __bnd_chk_ptr_bounds (src, src_size);
+
+ strncat (dst, src, n);
+
+ return dst;
+}
+
+char *
+__mpx_wrapper_strcat (char *dst, const char *src)
+{
+ size_t dst_size = strlen (dst);
+ size_t src_size = strlen (src);
+
+ __bnd_chk_ptr_bounds (dst, dst_size + src_size + 1);
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+
+ strcat (dst, src);
+
+ return dst;
+}
+
+char *
+__mpx_wrapper_stpcpy (char *dst, const char *src)
+{
+ size_t src_size = strlen (src);
+
+ __bnd_chk_ptr_bounds (dst, src_size + 1);
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+
+ memcpy (dst, src, src_size + 1);
+
+ return dst + src_size;
+}
+
+char *
+__mpx_wrapper_stpncpy (char *dst, const char *src, size_t n)
+{
+ size_t src_size = strnlen (src, n);
+
+ __bnd_chk_ptr_bounds (dst, n);
+ if (src_size < n)
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+ else
+ __bnd_chk_ptr_bounds (src, src_size);
+
+ return dst + src_size;
+}
+
+char *
+__mpx_wrapper_strcpy (char *dst, const char *src)
+{
+ size_t src_size = strlen (src);
+
+ __bnd_chk_ptr_bounds (dst, src_size + 1);
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+
+ memcpy (dst, src, src_size + 1);
+
+ return dst;
+}
+
+char *
+__mpx_wrapper_strncpy (char *dst, const char *src, size_t n)
+{
+ size_t src_size = strnlen (src, n);
+
+ __bnd_chk_ptr_bounds (dst, n);
+ if (src_size < n)
+ __bnd_chk_ptr_bounds (src, src_size + 1);
+ else
+ __bnd_chk_ptr_bounds (src, src_size);
+
+ return dst;
+}
+
+size_t
+__mpx_wrapper_strlen (const char *s)
+{
+ size_t length = strlen (s);
+ __bnd_chk_ptr_bounds (s, length);
+ return length;
+}