From 4703b555ee4a567a7ce986476c3c0117b75b0029 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 25 Jan 2017 16:38:01 +0100 Subject: [PATCH] libhsail-rt: Fix some Autotools issues contrib/ * gcc_update (files_and_dependencies): Care for "libhsail-rt". libhsail-rt/ * configure.ac: Don't instantiate AC_CONFIG_MACRO_DIR. * configure: Regenerate. libhsail-rt/ * config.h.in: Remove stale file. From-SVN: r244902 --- contrib/ChangeLog | 4 + contrib/gcc_update | 4 + libhsail-rt/ChangeLog | 13 +++ libhsail-rt/config.h.in | 217 --------------------------------------- libhsail-rt/configure | 6 +- libhsail-rt/configure.ac | 2 - 6 files changed, 23 insertions(+), 223 deletions(-) delete mode 100644 libhsail-rt/config.h.in diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d429bebf294..2f862fae976 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2017-01-25 Thomas Schwinge + + * gcc_update (files_and_dependencies): Care for "libhsail-rt". + 2017-01-23 Gerald Pfeifer * patch_tester.sh (TESTLOGS): Remove diff --git a/contrib/gcc_update b/contrib/gcc_update index a3f6d26117b..fe643af68dc 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -140,6 +140,10 @@ libgomp/testsuite/Makefile.in: libgomp/testsuite/Makefile.am libgomp/aclocal.m4 libgomp/configure.ac: libgomp/plugin/configfrag.ac libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4 libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4 +libhsail-rt/aclocal.m4: libhsail-rt/configure.ac +libhsail-rt/Makefile.in: libhsail-rt/Makefile.am libhsail-rt/aclocal.m4 +libhsail-rt/configure: libhsail-rt/configure.ac libhsail-rt/aclocal.m4 +libhsail-rt/target-config.h.in: libhsail-rt/configure.ac libhsail-rt/aclocal.m4 libitm/aclocal.m4: libitm/configure.ac libitm/acinclude.m4 libitm/Makefile.in: libitm/Makefile.am libitm/aclocal.m4 libitm/testsuite/Makefile.in: libitm/testsuite/Makefile.am libitm/aclocal.m4 diff --git a/libhsail-rt/ChangeLog b/libhsail-rt/ChangeLog index 8264c316384..0184c249d76 100644 --- a/libhsail-rt/ChangeLog +++ b/libhsail-rt/ChangeLog @@ -1,3 +1,10 @@ +2017-01-25 Thomas Schwinge + + * config.h.in: Remove stale file. + + * configure.ac: Don't instantiate AC_CONFIG_MACRO_DIR. + * configure: Regenerate. + 2017-01-25 Jakub Jelinek PR other/79046 @@ -36,3 +43,9 @@ * rt/sat_arithmetic.c: Likewise. * rt/segment.c: Likewise. * rt/workitems.c: Likewise. + +Copyright (C) 2017 Free Software Foundation, Inc. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. diff --git a/libhsail-rt/config.h.in b/libhsail-rt/config.h.in deleted file mode 100644 index 9dd4110809e..00000000000 --- a/libhsail-rt/config.h.in +++ /dev/null @@ -1,217 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Define to 1 if you have the `acosl' function. */ -#undef HAVE_ACOSL - -/* Define to 1 if you have the `asinl' function. */ -#undef HAVE_ASINL - -/* Define to 1 if you have the `atan2l' function. */ -#undef HAVE_ATAN2L - -/* Define to 1 if you have the `atanl' function. */ -#undef HAVE_ATANL - -/* Define to 1 if you have the `cosl' function. */ -#undef HAVE_COSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `expl' function. */ -#undef HAVE_EXPL - -/* Define to 1 if you have the `expm1l' function. */ -#undef HAVE_EXPM1L - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `ldexpl' function. */ -#undef HAVE_LDEXPL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_ETHER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_FS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_REBOOT_H - -/* Define to 1 if you have the `log10l' function. */ -#undef HAVE_LOG10L - -/* Define to 1 if you have the `log1pl' function. */ -#undef HAVE_LOG1PL - -/* Define to 1 if you have the `logl' function. */ -#undef HAVE_LOGL - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_ICMP6_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IF_ETHER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_SYST_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IP_MROUTE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETPACKET_PACKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_ARP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_ROUTE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SCHED_H - -/* Define to 1 if you have the `sinl' function. */ -#undef HAVE_SINL - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if the compiler provides the __sync_bool_compare_and_swap - function for uint32 */ -#undef HAVE_SYNC_BOOL_COMPARE_AND_SWAP_4 - -/* Define to 1 if the compiler provides the __sync_bool_compare_and_swap - function for uint64 */ -#undef HAVE_SYNC_BOOL_COMPARE_AND_SWAP_8 - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSCALL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_EPOLL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_FILE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_INOTIFY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_MMAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_MOUNT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PRCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PTRACE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STATFS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCALL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSINFO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIMEX_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_USER_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UTSNAME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_VFS_H - -/* Define to 1 if you have the `tanl' function. */ -#undef HAVE_TANL - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UTIME_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif diff --git a/libhsail-rt/configure b/libhsail-rt/configure index e62d5a0a9ab..a490125f5b3 100755 --- a/libhsail-rt/configure +++ b/libhsail-rt/configure @@ -2409,8 +2409,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Needed to define ${target}. Needs to be very early to avoid annoying # warning about calling AC_ARG_PROGRAM before AC_CANONICAL_SYSTEM ac_aux_dir= @@ -10975,7 +10973,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10978 "configure" +#line 10976 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11081,7 +11079,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11084 "configure" +#line 11082 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libhsail-rt/configure.ac b/libhsail-rt/configure.ac index 95b9a4f57a7..ed7e3041994 100644 --- a/libhsail-rt/configure.ac +++ b/libhsail-rt/configure.ac @@ -34,8 +34,6 @@ # POSSIBILITY OF SUCH DAMAGE. AC_INIT([phsa HSAIL runtime library], [1.0], [pekka.jaaskelainen@parmance.com]) -AC_CONFIG_MACRO_DIR([m4]) - AC_PREREQ([2.64]) # Needed to define ${target}. Needs to be very early to avoid annoying -- 2.30.2