Source-Changes-HG archive

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

[src/netbsd-8]: src revert ticket 552, which broke the build



details:   https://anonhg.NetBSD.org/src/rev/49761a791aba
branches:  netbsd-8
changeset: 434682:49761a791aba
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Feb 26 04:32:29 2018 +0000

description:
revert ticket 552, which broke the build

diffstat:

 doc/CHANGES-8.0                     |  30 +---------------
 sys/arch/aarch64/include/mcontext.h |   3 +-
 sys/arch/alpha/include/mcontext.h   |   3 +-
 sys/arch/amd64/include/mcontext.h   |   3 +-
 sys/arch/arm/include/mcontext.h     |   3 +-
 sys/arch/hppa/include/mcontext.h    |   3 +-
 sys/arch/i386/include/mcontext.h    |   3 +-
 sys/arch/ia64/include/mcontext.h    |   3 +-
 sys/arch/m68k/include/mcontext.h    |   3 +-
 sys/arch/mips/include/mcontext.h    |   3 +-
 sys/arch/or1k/include/mcontext.h    |   3 +-
 sys/arch/powerpc/include/mcontext.h |   3 +-
 sys/arch/riscv/include/mcontext.h   |   3 +-
 sys/arch/sh3/include/mcontext.h     |   3 +-
 sys/arch/sparc/include/mcontext.h   |  20 +++++-----
 sys/arch/sparc64/include/mcontext.h |  10 +---
 sys/arch/vax/include/mcontext.h     |   3 +-
 tests/lib/libc/sys/Makefile         |   3 +-
 tests/lib/libc/sys/t_ucontext.c     |  68 +-----------------------------------
 19 files changed, 31 insertions(+), 142 deletions(-)

diffs (truncated from 462 to 300 lines):

diff -r 114430b1b1a6 -r 49761a791aba doc/CHANGES-8.0
--- a/doc/CHANGES-8.0   Mon Feb 26 01:31:19 2018 +0000
+++ b/doc/CHANGES-8.0   Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.130 2018/02/26 01:31:19 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.131 2018/02/26 04:32:29 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -9727,34 +9727,6 @@
        test environments.
        [martin, ticket #586]
 
-sys/arch/aarch64/include/mcontext.h            1.2
-sys/arch/alpha/include/mcontext.h              1.9
-sys/arch/amd64/include/mcontext.h              1.19
-sys/arch/arm/include/mcontext.h                        1.19
-sys/arch/hppa/include/mcontext.h               1.9
-sys/arch/i386/include/mcontext.h               1.14
-sys/arch/ia64/include/mcontext.h               1.6
-sys/arch/m68k/include/mcontext.h               1.10
-sys/arch/mips/include/mcontext.h               1.22
-sys/arch/or1k/include/mcontext.h               1.2
-sys/arch/powerpc/include/mcontext.h            1.18
-sys/arch/riscv/include/mcontext.h              1.5
-sys/arch/sh3/include/mcontext.h                        1.11
-sys/arch/sparc/include/mcontext.h              1.14-1.17
-sys/arch/sparc64/include/mcontext.h            1.10
-sys/arch/vax/include/mcontext.h                        1.9
-tests/lib/libc/sys/Makefile                    1.50
-tests/lib/libc/sys/t_ucontext.c                        1.2
-
-       - Introduce _UC_MACHINE_FP().  _UC_MACHINE_FP() is a helper
-         macro to extract from mcontext a frame pointer.
-       - Add new tests in lib/libc/sys/t_ucontext:
-         * ucontext_sp (testing _UC_MACHINE_SP)
-         * ucontext_fp (testing _UC_MACHINE_FP)
-         * ucontext_pc (testing _UC_MACHINE_PC)
-         * ucontext_intrv (testing _UC_MACHINE_INTRV)
-       [kamil, ticket #552]
-
 include/string.h                               1.52
 
        Mark memccpy(3) and strdup(3) as _POSIX_C_SOURCE >= 2001
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/aarch64/include/mcontext.h
--- a/sys/arch/aarch64/include/mcontext.h       Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/aarch64/include/mcontext.h       Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.1.22.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.1.22.2 2018/02/26 04:32:29 snj Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -106,7 +106,6 @@
 #define        _UC_TLSBASE     0x00080000      /* see <sys/ucontext.h> */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_X29])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_X0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/alpha/include/mcontext.h
--- a/sys/arch/alpha/include/mcontext.h Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/alpha/include/mcontext.h Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.8.32.1 2018/02/25 23:50:22 snj Exp $    */
+/*     $NetBSD: mcontext.h,v 1.8.32.2 2018/02/26 04:32:29 snj Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -96,7 +96,6 @@
 #define _UC_TLSBASE    0x20    /* valid process-unique value in _REG_UNIQUE */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_S6])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_V0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/amd64/include/mcontext.h
--- a/sys/arch/amd64/include/mcontext.h Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/amd64/include/mcontext.h Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.18.20.1 2018/02/25 23:50:22 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.18.20.2 2018/02/26 04:32:29 snj Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -68,7 +68,6 @@
 
 /* AMD64 ABI 128-bytes "red zone". */
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_RSP] - 128)
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_RBP])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_RIP])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_RAX])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/arm/include/mcontext.h
--- a/sys/arch/arm/include/mcontext.h   Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/arm/include/mcontext.h   Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.18.10.1 2018/02/25 23:50:22 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.18.10.2 2018/02/26 04:32:29 snj Exp $   */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -110,7 +110,6 @@
 #define _UC_MACHINE_PAD        1               /* Padding appended to ucontext_t */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_R11])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_R0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/hppa/include/mcontext.h
--- a/sys/arch/hppa/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/hppa/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.8.22.1 2018/02/25 23:50:22 snj Exp $    */
+/*     $NetBSD: mcontext.h,v 1.8.22.2 2018/02/26 04:32:29 snj Exp $    */
 
 #ifndef _HPPA_MCONTEXT_H_
 #define        _HPPA_MCONTEXT_H_
@@ -50,7 +50,6 @@
 } mcontext_t;
 
 #define        _UC_MACHINE_SP(uc)      ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define        _UC_MACHINE_FP(uc)      ((uc)->uc_mcontext.__gregs[3])
 #define        _UC_MACHINE_PC(uc)      ((uc)->uc_mcontext.__gregs[_REG_PCOQH])
 #define        _UC_MACHINE_SET_PC(uc, pc)                                      \
 do {                                                                   \
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/i386/include/mcontext.h
--- a/sys/arch/i386/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/i386/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.12.22.1 2018/02/25 23:50:22 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.12.22.2 2018/02/26 04:32:30 snj Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -116,7 +116,6 @@
 #ifndef _UC_MACHINE_SP
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_UESP])
 #endif
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_EBP])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_EIP])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_EAX])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/ia64/include/mcontext.h
--- a/sys/arch/ia64/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/ia64/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.5.8.1 2018/02/25 23:50:23 snj Exp $     */
+/*     $NetBSD: mcontext.h,v 1.5.8.2 2018/02/26 04:32:30 snj Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -112,7 +112,6 @@
 } mcontext_t;
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.mc_special.sp)
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[79])
 /* XXX or assembly "mov Rn = ip" or ...? */
 #define        _UC_MACHINE_PC(uc)      ((uc)->uc_mcontext.mc_special.iip)
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/m68k/include/mcontext.h
--- a/sys/arch/m68k/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/m68k/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.9.42.1 2018/02/25 23:50:23 snj Exp $    */
+/*     $NetBSD: mcontext.h,v 1.9.42.2 2018/02/26 04:32:30 snj Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -102,7 +102,6 @@
 #define        _UC_TLSBASE     0x00080000
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_A7])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_A6])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_D0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/mips/include/mcontext.h
--- a/sys/arch/mips/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/mips/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.21.10.1 2018/02/25 23:50:23 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.21.10.2 2018/02/26 04:32:30 snj Exp $   */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -159,7 +159,6 @@
 #define        _UC_TLSBASE     0x00040000
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_S8])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_EPC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_V0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/or1k/include/mcontext.h
--- a/sys/arch/or1k/include/mcontext.h  Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/or1k/include/mcontext.h  Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.1.12.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.1.12.2 2018/02/26 04:32:30 snj Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -88,7 +88,6 @@
 #define        _UC_TLSBASE     0x00080000      /* see <sys/ucontext.h> */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_R2])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_RV])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/powerpc/include/mcontext.h
--- a/sys/arch/powerpc/include/mcontext.h       Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/powerpc/include/mcontext.h       Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.17.12.1 2018/02/25 23:50:23 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.17.12.2 2018/02/26 04:32:30 snj Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -133,7 +133,6 @@
 #define        _UC_TLSBASE     0x00080000      /* thread context valid in R2 */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_R1])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_R31])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_R3])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/riscv/include/mcontext.h
--- a/sys/arch/riscv/include/mcontext.h Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/riscv/include/mcontext.h Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.4.10.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.4.10.2 2018/02/26 04:32:30 snj Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -118,7 +118,6 @@
 #define        _UC_TLSBASE     0x00080000      /* see <sys/ucontext.h> */
 
 #define _UC_MACHINE_SP(uc)     ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc)     ((uc)->uc_mcontext.__gregs[_REG_S0])
 #define _UC_MACHINE_PC(uc)     ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define _UC_MACHINE_INTRV(uc)  ((uc)->uc_mcontext.__gregs[_REG_RV])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/sh3/include/mcontext.h
--- a/sys/arch/sh3/include/mcontext.h   Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/sh3/include/mcontext.h   Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.10.32.1 2018/02/25 23:50:23 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.10.32.2 2018/02/26 04:32:30 snj Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -82,7 +82,6 @@
 } mcontext_t;
 
 #define        _UC_MACHINE_SP(uc)      ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define        _UC_MACHINE_FP(uc)      ((uc)->uc_mcontext.__gregs[_REG_R14])
 #define        _UC_MACHINE_PC(uc)      ((uc)->uc_mcontext.__gregs[_REG_PC])
 #define        _UC_MACHINE_INTRV(uc)   ((uc)->uc_mcontext.__gregs[_REG_R0])
 
diff -r 114430b1b1a6 -r 49761a791aba sys/arch/sparc/include/mcontext.h
--- a/sys/arch/sparc/include/mcontext.h Mon Feb 26 01:31:19 2018 +0000
+++ b/sys/arch/sparc/include/mcontext.h Mon Feb 26 04:32:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.13.32.1 2018/02/25 23:50:23 snj Exp $   */
+/*     $NetBSD: mcontext.h,v 1.13.32.2 2018/02/26 04:32:30 snj Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
  */
 
 #ifndef _SPARC_MCONTEXT_H_
-#define        _SPARC_MCONTEXT_H_
+#define _SPARC_MCONTEXT_H_
 
-#define        _UC_SETSTACK    0x00010000
-#define        _UC_CLRSTACK    0x00020000
-#define        _UC_TLSBASE     0x00080000
+#define _UC_SETSTACK   0x00010000
+#define _UC_CLRSTACK   0x00020000
+#define _UC_TLSBASE    0x00080000
 
 /*
  * Layout of mcontext_t according the System V Application Binary Interface,
@@ -144,13 +144,13 @@
 } mcontext_t;
 
 #ifdef __arch64__
-#define        _UC_MACHINE_PAD 8               /* Padding appended to ucontext_t */
-#define        _UC_MACHINE_SP(uc)      (((uc)->uc_mcontext.__gregs[_REG_O6]) + 0x7ff)
-#define        _UC_MACHINE_FP(uc)      (((__greg_t *)_UC_MACHINE_SP(uc))[15])
+#define _UC_MACHINE_PAD        8               /* Padding appended to ucontext_t */
+#define        _UC_MACHINE_SP(uc)      (((uc)->uc_mcontext.__gregs[_REG_O6])+0x7ff)
+#define _UC_MACHINE32_PAD      43      /* compat_netbsd32 variant */



Home | Main Index | Thread Index | Old Index