Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tweaks needed for 10 branch



just fyi, had to tweak this when building; to be honest I'm a bit puzzled
Index: external/apache2/llvm/dist/llvm/include/llvm/Support/Signals.h
===================================================================
RCS file: /cvsroot/src/external/apache2/llvm/dist/llvm/include/llvm/Support/Signals.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Signals.h
--- external/apache2/llvm/dist/llvm/include/llvm/Support/Signals.h	30 May 2021 01:26:36 -0000	1.1.1.2
+++ external/apache2/llvm/dist/llvm/include/llvm/Support/Signals.h	1 Jul 2023 20:40:33 -0000
@@ -15,6 +15,7 @@
 #define LLVM_SUPPORT_SIGNALS_H
 
 #include <string>
+#include <cstdint>
 
 namespace llvm {
 class StringRef;
Index: lib/libc/time/zic.c
===================================================================
RCS file: /cvsroot/src/lib/libc/time/zic.c,v
retrieving revision 1.87
diff -u -r1.87 zic.c
--- lib/libc/time/zic.c	13 Dec 2022 19:08:42 -0000	1.87
+++ lib/libc/time/zic.c	1 Jul 2023 20:40:42 -0000
@@ -472,20 +472,23 @@
 ** Memory allocation.
 */
 
-static ATTRIBUTE_NORETURN void
+ATTRIBUTE_NORETURN
+static void
 memory_exhausted(const char *msg)
 {
 	fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg);
 	exit(EXIT_FAILURE);
 }
 
-static ATTRIBUTE_NORETURN void
+ATTRIBUTE_NORETURN
+static void
 size_overflow(void)
 {
   memory_exhausted(_("size overflow"));
 }
 
-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
+ATTRIBUTE_REPRODUCIBLE
+static ptrdiff_t
 size_sum(size_t a, size_t b)
 {
 #ifdef ckd_add
@@ -500,7 +503,8 @@
   size_overflow();
 }
 
-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
+ATTRIBUTE_REPRODUCIBLE
+static ptrdiff_t
 size_product(ptrdiff_t nitems, ptrdiff_t itemsize)
 {
 #ifdef ckd_mul
@@ -515,7 +519,8 @@
   size_overflow();
 }
 
-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
+ATTRIBUTE_REPRODUCIBLE
+static ptrdiff_t
 align_to(ptrdiff_t size, ptrdiff_t alignment)
 {
   ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits);
@@ -680,7 +685,8 @@
   }
 }
 
-static ATTRIBUTE_NORETURN void
+ATTRIBUTE_NORETURN
+static void
 usage(FILE *stream, int status)
 {
   fprintf(stream,
@@ -3754,7 +3760,8 @@
 	return nsubs;
 }
 
-static ATTRIBUTE_NORETURN void
+ATTRIBUTE_NORETURN
+static void
 time_overflow(void)
 {
 	error(_("time overflow"));


Home | Main Index | Thread Index | Old Index