Page MenuHomeFreeBSD
Files F131719201

D9632.diff
No OneTemporary
Actions

D9632.diff
View Options

Index: head/lib/libc/arm/aeabi/Makefile.inc
===================================================================
--- head/lib/libc/arm/aeabi/Makefile.inc
+++ head/lib/libc/arm/aeabi/Makefile.inc
@@ -28,5 +28,6 @@
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
Index: head/lib/libc/arm/aeabi/Symbol.map
===================================================================
--- head/lib/libc/arm/aeabi/Symbol.map
+++ head/lib/libc/arm/aeabi/Symbol.map
@@ -69,4 +69,11 @@
__aeabi_memset;
__aeabi_memset4;
__aeabi_memset8;
+
+ /*
+ * A workaround for DEFINE_AEABI_FUNCTION_ALIAS() bug.
+ * - see aeabi_int_div.S
+ */
+ __aeabi_idiv;
+ __aeabi_uidiv;
};
Index: head/lib/libc/arm/aeabi/aeabi_int_div.S
===================================================================
--- head/lib/libc/arm/aeabi/aeabi_int_div.S
+++ 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

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 11, 3:05 PM (20 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23581579
Default Alt Text
D9632.diff (2 KB)

Event Timeline