summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-05-30 02:53:12 (GMT)
committerGitHub <noreply@github.com>2017-05-30 02:53:12 (GMT)
commit1607630d77d4327c4bfdac32fe417d4134c6c543 (patch)
tree547c74a1bb85c935e998d9b7354ded35229782fe /patches
parent42b3dde819df3ce54c5ee2c694d8daa0594056d0 (diff)
parent4490adb5f0611313e3daa12e6a656e1910e613af (diff)
Merge pull request #727 from stilor/regen-no-renames
Regenerate with --no-renames
Diffstat (limited to 'patches')
-rw-r--r--patches/glibc/2.25/960-sh4-trap-divdi3.patch94
1 files changed, 69 insertions, 25 deletions
diff --git a/patches/glibc/2.25/960-sh4-trap-divdi3.patch b/patches/glibc/2.25/960-sh4-trap-divdi3.patch
index 20f6cb3..99fad46 100644
--- a/patches/glibc/2.25/960-sh4-trap-divdi3.patch
+++ b/patches/glibc/2.25/960-sh4-trap-divdi3.patch
@@ -264,33 +264,77 @@ index 82beac44ed..0000000000
-CPPFLAGS-divdi3.c = -Din_divdi3_c
-endif
-endif
-diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/divdi3-symbol-hacks.h
-similarity index 89%
-rename from sysdeps/wordsize-32/symbol-hacks.h
-rename to sysdeps/wordsize-32/divdi3-symbol-hacks.h
-index 0aec1e0b97..6c90cb796d 100644
---- a/sysdeps/wordsize-32/symbol-hacks.h
+diff --git a/sysdeps/wordsize-32/divdi3-symbol-hacks.h b/sysdeps/wordsize-32/divdi3-symbol-hacks.h
+new file mode 100644
+index 0000000000..6c90cb796d
+--- /dev/null
+++ b/sysdeps/wordsize-32/divdi3-symbol-hacks.h
-@@ -1,4 +1,4 @@
--/* Hacks needed for symbol manipulation.
+@@ -0,0 +1,31 @@
+/* Hacks needed for divdi3 symbol manipulation.
- Copyright (C) 2004-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -16,13 +16,13 @@
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
--#include_next "symbol-hacks.h"
--
- /* A very dirty trick: gcc emits references to __divdi3, __udivdi3,
- __moddi3, and __umoddi3. These functions are exported and
- therefore we get PLTs. Unnecessarily so. Changing gcc is a big
- task which might not be worth it so we play tricks with the
-- assembler. */
++ Copyright (C) 2004-2017 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++/* A very dirty trick: gcc emits references to __divdi3, __udivdi3,
++ __moddi3, and __umoddi3. These functions are exported and
++ therefore we get PLTs. Unnecessarily so. Changing gcc is a big
++ task which might not be worth it so we play tricks with the
+ assembler.
+ Note: in_divdi3_c is only used to avoid symbol alias on divdi3
+ build itself. */
- #if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) && defined SHARED
- asm ("__divdi3 = __divdi3_internal");
- asm ("__udivdi3 = __udivdi3_internal");
++#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) && defined SHARED
++asm ("__divdi3 = __divdi3_internal");
++asm ("__udivdi3 = __udivdi3_internal");
++asm ("__moddi3 = __moddi3_internal");
++asm ("__umoddi3 = __umoddi3_internal");
++#endif
+diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h
+deleted file mode 100644
+index 0aec1e0b97..0000000000
+--- a/sysdeps/wordsize-32/symbol-hacks.h
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/* Hacks needed for symbol manipulation.
+- Copyright (C) 2004-2017 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+-
+- The GNU C Library is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Lesser General Public
+- License as published by the Free Software Foundation; either
+- version 2.1 of the License, or (at your option) any later version.
+-
+- The GNU C Library is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Lesser General Public License for more details.
+-
+- You should have received a copy of the GNU Lesser General Public
+- License along with the GNU C Library; if not, see
+- <http://www.gnu.org/licenses/>. */
+-
+-#include_next "symbol-hacks.h"
+-
+-/* A very dirty trick: gcc emits references to __divdi3, __udivdi3,
+- __moddi3, and __umoddi3. These functions are exported and
+- therefore we get PLTs. Unnecessarily so. Changing gcc is a big
+- task which might not be worth it so we play tricks with the
+- assembler. */
+-#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) && defined SHARED
+-asm ("__divdi3 = __divdi3_internal");
+-asm ("__udivdi3 = __udivdi3_internal");
+-asm ("__moddi3 = __moddi3_internal");
+-asm ("__umoddi3 = __umoddi3_internal");
+-#endif