[src/netbsd-6]: src/lib/libc/arch Pull up following revision(s) (requested by...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-6]: src/lib/libc/arch Pull up following revision(s) (requested by...
From: riz <riz%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 22:10:28 +0000

details:   https://anonhg.NetBSD.org/src/rev/96b7680d8f67
branches:  netbsd-6
changeset: 773841:96b7680d8f67
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Feb 27 20:22:59 2012 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #57):
        lib/libc/arch/arm/sys/cerror.S: revision 1.8
        lib/libc/arch/vax/SYS.h: revision 1.12
        lib/libc/arch/powerpc64/sys/cerror.S: revision 1.3
        lib/libc/arch/powerpc64/sys/cerror.S: revision 1.4
        lib/libc/arch/i386/sys/cerror.S: revision 1.16
        lib/libc/arch/x86_64/sys/cerror.S: revision 1.5
        lib/libc/arch/powerpc/sys/cerror.S: revision 1.10
        lib/libc/arch/mips/sys/cerror.S: revision 1.17
        lib/libc/arch/powerpc/sys/cerror.S: revision 1.9
Make __cerror protected to restore ABI leak in older libc versions,
where e.g. librt referenced the copy from libc. This still allows libc
to use PC-relative jumps.
PowerPC doesn't have CERROR since it never had a.out.
Use _C_LABEL(__cerror) instead.

diffstat:

 lib/libc/arch/arm/sys/cerror.S       |  4 ++--
 lib/libc/arch/i386/sys/cerror.S      |  6 +++---
 lib/libc/arch/mips/sys/cerror.S      |  8 ++++----
 lib/libc/arch/powerpc/sys/cerror.S   |  6 +++---
 lib/libc/arch/powerpc64/sys/cerror.S |  4 ++--
 lib/libc/arch/vax/SYS.h              |  4 ++--
 lib/libc/arch/x86_64/sys/cerror.S    |  6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diffs (152 lines):

diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/arm/sys/cerror.S
--- a/lib/libc/arch/arm/sys/cerror.S    Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/arm/sys/cerror.S    Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.7 2011/01/14 06:12:17 matt Exp $  */
+/*     $NetBSD: cerror.S,v 1.7.8.1 2012/02/27 20:22:59 riz Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -34,7 +34,7 @@
 #include "SYS.h"
 
 #ifdef PIC
-       .hidden CERROR
+       .protected      CERROR
 #endif
 
 ASENTRY(CERROR)
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/i386/sys/cerror.S
--- a/lib/libc/arch/i386/sys/cerror.S   Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/i386/sys/cerror.S   Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.15 2011/11/18 20:21:41 joerg Exp $        */
+/*     $NetBSD: cerror.S,v 1.15.2.1 2012/02/27 20:22:59 riz Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,13 +36,13 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: cerror.S,v 1.15 2011/11/18 20:21:41 joerg Exp $")
+       RCSID("$NetBSD: cerror.S,v 1.15.2.1 2012/02/27 20:22:59 riz Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
 
        .globl  _C_LABEL(__errno)
-       .hidden CERROR
+       .protected      CERROR
 
 _ENTRY(CERROR)
        pushl   %eax
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/mips/sys/cerror.S
--- a/lib/libc/arch/mips/sys/cerror.S   Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/mips/sys/cerror.S   Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.16 2011/01/17 23:34:44 matt Exp $ */
+/*     $NetBSD: cerror.S,v 1.16.8.1 2012/02/27 20:23:00 riz Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,13 +38,13 @@
 #if 0
        RCSID("from: @(#)cerror.s       8.1 (Berkeley) 6/16/93")
 #else
-       RCSID("$NetBSD: cerror.S,v 1.16 2011/01/17 23:34:44 matt Exp $")
+       RCSID("$NetBSD: cerror.S,v 1.16.8.1 2012/02/27 20:23:00 riz Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef PIC
-       .hidden __cerror
-#endif
+       .protected      __cerror
+i#endif
 
 #ifdef _REENTRANT
        .globl  _C_LABEL(__errno)
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/powerpc/sys/cerror.S
--- a/lib/libc/arch/powerpc/sys/cerror.S        Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/powerpc/sys/cerror.S        Mon Feb 27 20:22:59 2012 +0000
@@ -1,17 +1,17 @@
-/*     $NetBSD: cerror.S,v 1.8 2011/01/16 02:43:10 matt Exp $  */
+/*     $NetBSD: cerror.S,v 1.8.8.1 2012/02/27 20:23:00 riz Exp $       */
 
 #include "SYS.h"
 #include "assym.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: cerror.S,v 1.8 2011/01/16 02:43:10 matt Exp $")
+__RCSID("$NetBSD: cerror.S,v 1.8.8.1 2012/02/27 20:23:00 riz Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 #ifndef _REENTRANT
        .globl  _C_LABEL(errno)
 #endif
 #ifdef PIC
-       .hidden _C_LABEL(__cerror)
+       .protected _C_LABEL(__cerror)
 #endif
 
 ENTRY(__cerror)
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/powerpc64/sys/cerror.S
--- a/lib/libc/arch/powerpc64/sys/cerror.S      Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/powerpc64/sys/cerror.S      Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.2 2011/10/29 16:03:03 christos Exp $      */
+/*     $NetBSD: cerror.S,v 1.2.4.1 2012/02/27 20:22:59 riz Exp $       */
 
 #include <machine/asm.h>
 #include "SYS.h"
@@ -7,7 +7,7 @@
        .globl  _C_LABEL(errno)
 #endif
 #ifdef PIC
-       .hidden _C_LABEL(__cerror)
+       .protected _C_LABEL(__cerror)
 #endif
 
 ENTRY(__cerror)
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/vax/SYS.h
--- a/lib/libc/arch/vax/SYS.h   Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/vax/SYS.h   Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: SYS.h,v 1.11 2011/01/25 02:38:15 matt Exp $ */
+/*     $NetBSD: SYS.h,v 1.11.6.1 2012/02/27 20:22:59 riz Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -85,5 +85,5 @@
 
 #define        ASMSTR          .asciz
 
-       .hidden CERROR
+       .protected      CERROR
        .globl  CERROR
diff -r 7f914249a551 -r 96b7680d8f67 lib/libc/arch/x86_64/sys/cerror.S
--- a/lib/libc/arch/x86_64/sys/cerror.S Mon Feb 27 20:18:46 2012 +0000
+++ b/lib/libc/arch/x86_64/sys/cerror.S Mon Feb 27 20:22:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.4 2011/11/18 20:17:46 joerg Exp $ */
+/*     $NetBSD: cerror.S,v 1.4.2.1 2012/02/27 20:22:59 riz Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,13 +36,13 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: cerror.S,v 1.4 2011/11/18 20:17:46 joerg Exp $")
+       RCSID("$NetBSD: cerror.S,v 1.4.2.1 2012/02/27 20:22:59 riz Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
 
        .globl  _C_LABEL(__errno)
-       .hidden CERROR
+       .protected      CERROR
 
 _ENTRY(CERROR)
        pushq   %r12

Prev by Date: [src/netbsd-6]: src/sys/arch Pull up following revision(s) (requested by tsut...
Next by Date: [src/netbsd-6]: src/usr.sbin/postinstall Pull up following revision(s) (reque...
Previous by Thread: [src/netbsd-6]: src/sys/arch Pull up following revision(s) (requested by tsut...
Next by Thread: [src/netbsd-6]: src/usr.sbin/postinstall Pull up following revision(s) (reque...
Indexes:

Home | Main Index | Thread Index | Old Index