Author: mmel
Date: Sun Apr 16 05:14:42 2017
New Revision: 316998
URL: https://svnweb.freebsd.org/changeset/base/316998
Log:
MFC r313823,r313866:
r313823:
Pull in r285478 from upstream compiler-rt trunk (by Saleem Abdulrasool):
r313866:
Publish __aeabi_uidiv and __aeabi_idiv as compatible symbols from libc.
Added:
stable/11/lib/libc/arm/aeabi/aeabi_int_div.S
- copied unchanged from r313866, head/lib/libc/arm/aeabi/aeabi_int_div.S
Modified:
stable/11/contrib/compiler-rt/lib/builtins/assembly.h
stable/11/lib/libc/arm/aeabi/Makefile.inc
stable/11/lib/libc/arm/aeabi/Symbol.map
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/compiler-rt/lib/builtins/assembly.h
==============================================================================
--- stable/11/contrib/compiler-rt/lib/builtins/assembly.h Sun Apr 16
04:36:22 2017 (r316997)
+++ stable/11/contrib/compiler-rt/lib/builtins/assembly.h Sun Apr 16
05:14:42 2017 (r316998)
@@ -164,6 +164,7 @@
#define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target)
\
.globl SYMBOL_NAME(name) SEPARATOR
\
SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR
\
+ DECLARE_SYMBOL_VISIBILITY(SYMBOL_NAME(name)) SEPARATOR
\
.set SYMBOL_NAME(name), SYMBOL_NAME(target) SEPARATOR
#if defined(__ARM_EABI__)
Modified: stable/11/lib/libc/arm/aeabi/Makefile.inc
==============================================================================
--- stable/11/lib/libc/arm/aeabi/Makefile.inc Sun Apr 16 04:36:22 2017
(r316997)
+++ stable/11/lib/libc/arm/aeabi/Makefile.inc Sun Apr 16 05:14:42 2017
(r316998)
@@ -28,5 +28,6 @@ SRCS+= aeabi_memcmp.S \
aeabi_memmove.S \
aeabi_memset.S
-SYM_MAPS+=${LIBC_SRCTOP}/arm/aeabi/Symbol.map
+SRCS+= aeabi_int_div.S
+SYM_MAPS+=${LIBC_SRCTOP}/arm/aeabi/Symbol.map
Modified: stable/11/lib/libc/arm/aeabi/Symbol.map
==============================================================================
--- stable/11/lib/libc/arm/aeabi/Symbol.map Sun Apr 16 04:36:22 2017
(r316997)
+++ stable/11/lib/libc/arm/aeabi/Symbol.map Sun Apr 16 05:14:42 2017
(r316998)
@@ -69,4 +69,11 @@ FBSDprivate_1.0 {
__aeabi_memset;
__aeabi_memset4;
__aeabi_memset8;
+
+ /*
+ * A workaround for DEFINE_AEABI_FUNCTION_ALIAS() bug.
+ * - see aeabi_int_div.S
+ */
+ __aeabi_idiv;
+ __aeabi_uidiv;
};
Copied: stable/11/lib/libc/arm/aeabi/aeabi_int_div.S (from r313866,
head/lib/libc/arm/aeabi/aeabi_int_div.S)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/lib/libc/arm/aeabi/aeabi_int_div.S Sun Apr 16 05:14:42
2017 (r316998, copy of r313866, head/lib/libc/arm/aeabi/aeabi_int_div.S)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 Michal Meloun
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Due to bug in libcompiler_rt, all symbols declared by
+ * DEFINE_AEABI_FUNCTION_ALIAS() are not hidden. All these but
+ * __aeabi_uidiv_compat and/or __aeabi_idiv_compat are explicitly
+ * exported from libc and don't causes problems.
+ *
+ * As workaround, export these from libc as compatible symbols,
+ * in global namespace
+ */
+
+ENTRY(__aeabi_uidiv_compat)
+ .symver __aeabi_uidiv_compat, __aeabi_uidiv@
+ b __udivsi3
+END(__aeabi_uidiv_compat)
+
+ENTRY(__aeabi_idiv_compat)
+ .symver __aeabi_idiv_compat, __aeabi_idiv@
+ b __divsi3
+END(__aeabi_idiv_compat)
+
+ .section .note.GNU-stack,"",%progbits
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
