0a6a1f1d05
This brings our tree to NetBSD 7.0, as found on -current on the 10-10-2015. This updates: - LLVM to 3.6.1 - GCC to GCC 5.1 - Replace minix/commands/zdump with usr.bin/zdump - external/bsd/libelf has moved to /external/bsd/elftoolchain/ - Import ctwm - Drop sprintf from libminc Change-Id: I149836ac18e9326be9353958bab9b266efb056f0
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
diff -rNU3 dist.orig/Makefile.in dist.nbsd/Makefile.in
|
|
--- dist.orig/Makefile.in 2013-03-13 16:38:22.000000000 +0100
|
|
+++ dist.nbsd/Makefile.in 2015-10-16 08:31:48.000000000 +0200
|
|
@@ -337,8 +337,12 @@
|
|
$(SHELL) ./config.status --recheck
|
|
|
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
|
+ @echo "NOT REBUILDING $@"
|
|
+NetBSD_DISABLED_configure:
|
|
$(am__cd) $(srcdir) && $(AUTOCONF)
|
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
|
+ @echo "NOT REBUILDING $@"
|
|
+NetBSD_DISABLED_aclocal:
|
|
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
|
$(am__aclocal_m4_deps):
|
|
|
|
diff -rNU3 dist.orig/PATCHES dist.nbsd/PATCHES
|
|
--- dist.orig/PATCHES 2013-03-13 16:37:38.000000000 +0100
|
|
+++ dist.nbsd/PATCHES 2015-10-16 08:31:48.000000000 +0200
|
|
@@ -0,0 +1,4 @@
|
|
+texp-zero
|
|
+atan-expo-range
|
|
+rec_sqrt-carry
|
|
+asin_exprange
|
|
diff -rNU3 dist.orig/src/Makefile.in dist.nbsd/src/Makefile.in
|
|
--- dist.orig/src/Makefile.in 2013-03-13 16:38:21.000000000 +0100
|
|
+++ dist.nbsd/src/Makefile.in 2015-10-16 08:31:48.000000000 +0200
|
|
@@ -921,6 +921,8 @@
|
|
# should not be a problem in practice, in particular because "make dist"
|
|
# automatically rebuilds get_patches.c before generating the archives.
|
|
$(srcdir)/get_patches.c: $(top_srcdir)/PATCHES $(top_srcdir)/tools/get_patches.sh
|
|
+ @echo "NOT REBUILDING $@"
|
|
+NetBSD_DISABLED_get_patches.c:
|
|
(cd $(top_srcdir) && ./tools/get_patches.sh) > $@ || rm -f $@
|
|
|
|
# Do not add get_patches.c to CLEANFILES so that this file doesn't
|
|
diff -rNU3 dist.orig/src/mpfr-longlong.h dist.nbsd/src/mpfr-longlong.h
|
|
--- dist.orig/src/mpfr-longlong.h 2013-03-13 16:37:32.000000000 +0100
|
|
+++ dist.nbsd/src/mpfr-longlong.h 2014-03-25 16:28:15.000000000 +0100
|
|
@@ -1022,7 +1022,7 @@
|
|
#endif /* __m88000__ */
|
|
|
|
#if defined (__mips) && W_TYPE_SIZE == 32
|
|
-#if __GMP_GNUC_PREREQ (4,4)
|
|
+#if __GMP_GNUC_PREREQ (4,4) || defined(__clang__)
|
|
#define umul_ppmm(w1, w0, u, v) \
|
|
do { \
|
|
UDItype __ll = (UDItype)(u) * (v); \
|
|
@@ -1044,7 +1044,7 @@
|
|
#endif /* __mips */
|
|
|
|
#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
|
|
-#if __GMP_GNUC_PREREQ (4,4)
|
|
+#if __GMP_GNUC_PREREQ (4,4) || defined(__clang__)
|
|
#define umul_ppmm(w1, w0, u, v) \
|
|
do { \
|
|
typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
|
|
@@ -1160,7 +1160,7 @@
|
|
__asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
|
|
#define COUNT_LEADING_ZEROS_0 32
|
|
#if HAVE_HOST_CPU_FAMILY_powerpc
|
|
-#if __GMP_GNUC_PREREQ (4,4)
|
|
+#if __GMP_GNUC_PREREQ (4,4) || defined(__clang__)
|
|
#define umul_ppmm(w1, w0, u, v) \
|
|
do { \
|
|
UDItype __ll = (UDItype)(u) * (v); \
|
|
@@ -1259,7 +1259,7 @@
|
|
#define count_leading_zeros(count, x) \
|
|
__asm__ ("cntlzd %0,%1" : "=r" (count) : "r" (x))
|
|
#define COUNT_LEADING_ZEROS_0 64
|
|
-#if __GMP_GNUC_PREREQ (4,4)
|
|
+#if __GMP_GNUC_PREREQ (4,4) || defined(__clang__)
|
|
#define umul_ppmm(w1, w0, u, v) \
|
|
do { \
|
|
typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
|