forked from pool/glibc
Accepting request 202951 from home:Andreas_Schwab:Factory
- Enable ports addon for m68k and adapt file list - m68k-Scrt1.patch: Use PIC for Scrt1.o OBS-URL: https://build.opensuse.org/request/show/202951 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=313
This commit is contained in:
Andreas Schwab
Git OBS Bridge
parent
177143a5e4
commit
f765de7465
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de
|
||||
|
||||
- Enable ports addon for m68k and adapt file list
|
||||
- m68k-Scrt1.patch: Use PIC for Scrt1.o
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
|
||||
|
||||
|
||||
@ -246,6 +246,8 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
Patch1000: fcntl-o-tmpfile.patch
|
||||
# PATCH-FIX-UPSTREAM Integer overflows in malloc
|
||||
Patch1001: malloc-overflows.patch
|
||||
# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
|
||||
Patch1002: m68k-Scrt1.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -472,6 +474,7 @@ rm nscd/s-stamp
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
|
||||
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
|
||||
# %patch2008 -p1
|
||||
@ -585,7 +588,7 @@ add_ons=",libidn"
|
||||
%ifarch %ix86
|
||||
add_ons=$add_ons,noversion
|
||||
%endif
|
||||
%ifarch %arm aarch64 mipsel ia64
|
||||
%ifarch %arm aarch64 mipsel ia64 m68k
|
||||
add_ons=$add_ons,ports
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
@ -1057,7 +1060,7 @@ exit 0
|
||||
%ifarch ia64
|
||||
/%{_lib}/ld-linux-ia64.so.2
|
||||
%endif
|
||||
%ifarch ppc s390 mips hppa
|
||||
%ifarch ppc s390 mips hppa m68k
|
||||
/%{_lib}/ld.so.1
|
||||
%endif
|
||||
%ifarch ppc64
|
||||
@ -1156,7 +1159,7 @@ exit 0
|
||||
%{_bindir}/getent
|
||||
%{_bindir}/iconv
|
||||
%attr(755,root,root) %{_bindir}/ldd
|
||||
%ifarch %ix86 sparc sparcv9
|
||||
%ifarch %ix86 sparc sparcv9 m68k
|
||||
%{_bindir}/lddlibc4
|
||||
%endif
|
||||
%{_bindir}/locale
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de
|
||||
|
||||
- Enable ports addon for m68k and adapt file list
|
||||
- m68k-Scrt1.patch: Use PIC for Scrt1.o
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
|
||||
|
||||
|
||||
@ -245,6 +245,8 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
Patch1000: fcntl-o-tmpfile.patch
|
||||
# PATCH-FIX-UPSTREAM Integer overflows in malloc
|
||||
Patch1001: malloc-overflows.patch
|
||||
# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
|
||||
Patch1002: m68k-Scrt1.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -472,6 +474,7 @@ rm nscd/s-stamp
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
|
||||
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
|
||||
# %patch2008 -p1
|
||||
@ -585,7 +588,7 @@ add_ons=",libidn"
|
||||
%ifarch %ix86
|
||||
add_ons=$add_ons,noversion
|
||||
%endif
|
||||
%ifarch %arm aarch64 mipsel ia64
|
||||
%ifarch %arm aarch64 mipsel ia64 m68k
|
||||
add_ons=$add_ons,ports
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
@ -1057,7 +1060,7 @@ exit 0
|
||||
%ifarch ia64
|
||||
/%{_lib}/ld-linux-ia64.so.2
|
||||
%endif
|
||||
%ifarch ppc s390 mips hppa
|
||||
%ifarch ppc s390 mips hppa m68k
|
||||
/%{_lib}/ld.so.1
|
||||
%endif
|
||||
%ifarch ppc64
|
||||
@ -1156,7 +1159,7 @@ exit 0
|
||||
%{_bindir}/getent
|
||||
%{_bindir}/iconv
|
||||
%attr(755,root,root) %{_bindir}/ldd
|
||||
%ifarch %ix86 sparc sparcv9
|
||||
%ifarch %ix86 sparc sparcv9 m68k
|
||||
%{_bindir}/lddlibc4
|
||||
%endif
|
||||
%{_bindir}/locale
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 11 08:37:38 UTC 2013 - schwab@suse.de
|
||||
|
||||
- Enable ports addon for m68k and adapt file list
|
||||
- m68k-Scrt1.patch: Use PIC for Scrt1.o
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
|
||||
|
||||
|
||||
@ -246,6 +246,8 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
Patch1000: fcntl-o-tmpfile.patch
|
||||
# PATCH-FIX-UPSTREAM Integer overflows in malloc
|
||||
Patch1001: malloc-overflows.patch
|
||||
# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
|
||||
Patch1002: m68k-Scrt1.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -472,6 +474,7 @@ rm nscd/s-stamp
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
|
||||
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
|
||||
# %patch2008 -p1
|
||||
@ -585,7 +588,7 @@ add_ons=",libidn"
|
||||
%ifarch %ix86
|
||||
add_ons=$add_ons,noversion
|
||||
%endif
|
||||
%ifarch %arm aarch64 mipsel ia64
|
||||
%ifarch %arm aarch64 mipsel ia64 m68k
|
||||
add_ons=$add_ons,ports
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
@ -1057,7 +1060,7 @@ exit 0
|
||||
%ifarch ia64
|
||||
/%{_lib}/ld-linux-ia64.so.2
|
||||
%endif
|
||||
%ifarch ppc s390 mips hppa
|
||||
%ifarch ppc s390 mips hppa m68k
|
||||
/%{_lib}/ld.so.1
|
||||
%endif
|
||||
%ifarch ppc64
|
||||
@ -1156,7 +1159,7 @@ exit 0
|
||||
%{_bindir}/getent
|
||||
%{_bindir}/iconv
|
||||
%attr(755,root,root) %{_bindir}/ldd
|
||||
%ifarch %ix86 sparc sparcv9
|
||||
%ifarch %ix86 sparc sparcv9 m68k
|
||||
%{_bindir}/lddlibc4
|
||||
%endif
|
||||
%{_bindir}/locale
|
||||
|
||||
50
m68k-Scrt1.patch
Normal file
50
m68k-Scrt1.patch
Normal file
@ -0,0 +1,50 @@
|
||||
2013-10-08 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* sysdeps/m68k/start.S [SHARED]: Use PIC.
|
||||
|
||||
Index: glibc-2.18/ports/sysdeps/m68k/start.S
|
||||
===================================================================
|
||||
--- glibc-2.18.orig/ports/sysdeps/m68k/start.S
|
||||
+++ glibc-2.18/ports/sysdeps/m68k/start.S
|
||||
@@ -52,6 +52,8 @@
|
||||
NULL
|
||||
*/
|
||||
|
||||
+#include <sysdep.h>
|
||||
+
|
||||
.text
|
||||
.globl _start
|
||||
.type _start,@function
|
||||
@@ -74,6 +76,24 @@ _start:
|
||||
pea (%a1) /* Push address of the shared library
|
||||
termination function. */
|
||||
|
||||
+#ifdef SHARED
|
||||
+ /* Load PIC register. */
|
||||
+ LOAD_GOT (%a5)
|
||||
+
|
||||
+ /* Push the address of our own entry points to `.fini' and
|
||||
+ `.init'. */
|
||||
+ move.l __libc_csu_fini@GOT(%a5), -(%sp)
|
||||
+ move.l __libc_csu_init@GOT(%a5), -(%sp)
|
||||
+
|
||||
+ pea (%a0) /* Push second argument: argv. */
|
||||
+ move.l %d0, -(%sp) /* Push first argument: argc. */
|
||||
+
|
||||
+ move.l main@GOT(%a5), -(%sp)
|
||||
+
|
||||
+ /* Call the user's main function, and exit with its value. But
|
||||
+ let the libc call main. */
|
||||
+ jbsr __libc_start_main@PLTPC
|
||||
+#else
|
||||
/* Push the address of our own entry points to `.fini' and
|
||||
`.init'. */
|
||||
pea __libc_csu_fini
|
||||
@@ -87,6 +107,7 @@ _start:
|
||||
/* Call the user's main function, and exit with its value. But
|
||||
let the libc call main. */
|
||||
jbsr __libc_start_main
|
||||
+#endif
|
||||
|
||||
illegal /* Crash if somehow `exit' does return. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user