Author: kib
Date: Fri Jul 26 10:13:48 2019
New Revision: 350352
URL: https://svnweb.freebsd.org/changeset/base/350352

Log:
  MFC r344120:
  Unify i386 and amd64 getcontextx.c, and use ifuncs while there.
  
  This is yet another attempt of the merge, previously done as r344436 and
  reverted in r344463.  It is redone since ld was changed to ifunc-capable
  linker on i386.

Added:
  stable/12/lib/libc/x86/gen/
     - copied from r344120, head/lib/libc/x86/gen/
Deleted:
  stable/12/lib/libc/amd64/gen/getcontextx.c
  stable/12/lib/libc/i386/gen/getcontextx.c
Modified:
  stable/12/lib/libc/Makefile
  stable/12/lib/libc/amd64/gen/Makefile.inc
  stable/12/lib/libc/i386/gen/Makefile.inc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/libc/Makefile
==============================================================================
--- stable/12/lib/libc/Makefile Fri Jul 26 10:00:33 2019        (r350351)
+++ stable/12/lib/libc/Makefile Fri Jul 26 10:13:48 2019        (r350352)
@@ -120,6 +120,7 @@ NOASM=
 .endif
 .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64"
 .include "${LIBC_SRCTOP}/x86/sys/Makefile.inc"
+.include "${LIBC_SRCTOP}/x86/gen/Makefile.inc"
 .endif
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP

Modified: stable/12/lib/libc/amd64/gen/Makefile.inc
==============================================================================
--- stable/12/lib/libc/amd64/gen/Makefile.inc   Fri Jul 26 10:00:33 2019        
(r350351)
+++ stable/12/lib/libc/amd64/gen/Makefile.inc   Fri Jul 26 10:13:48 2019        
(r350352)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 SRCS+= _setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
-       fabs.S getcontextx.c \
+       fabs.S \
        infinity.c ldexp.c makecontext.c signalcontext.c \
        flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
        fpgetround.c fpsetround.c fpgetsticky.c

Modified: stable/12/lib/libc/i386/gen/Makefile.inc
==============================================================================
--- stable/12/lib/libc/i386/gen/Makefile.inc    Fri Jul 26 10:00:33 2019        
(r350351)
+++ stable/12/lib/libc/i386/gen/Makefile.inc    Fri Jul 26 10:13:48 2019        
(r350352)
@@ -2,5 +2,5 @@
 # $FreeBSD$
 
 SRCS+= _ctx_start.S _setjmp.S _set_tp.c fabs.S \
-       flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c \
+       flt_rounds.c infinity.c ldexp.c makecontext.c \
        rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to