Hello community,

here is the log from the commit of package glibc for openSUSE:Factory checked 
in at 2013-10-17 14:05:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
 and      /work/SRC/openSUSE:Factory/.glibc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glibc"

Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes    2013-09-26 
19:33:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes       
2013-10-17 14:05:41.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Oct 14 09:32:44 UTC 2013 - [email protected]
+
+- Depend on gcc defaults for base powerpc optimisations (bnc#844824)
+
+-------------------------------------------------------------------
+Fri Oct 11 08:37:38 UTC 2013 - [email protected]
+
+- Enable ports addon for m68k and adapt file list
+- m68k-Scrt1.patch: Use PIC for Scrt1.o
+
+-------------------------------------------------------------------
glibc-utils.changes: same change
glibc.changes: same change

New:
----
  m68k-Scrt1.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glibc-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.6z0x4z/_old  2013-10-17 14:05:53.000000000 +0200
+++ /var/tmp/diff_new_pack.6z0x4z/_new  2013-10-17 14:05:53.000000000 +0200
@@ -78,11 +78,11 @@
 %ifarch ppc ppc64
  %define optimize_power 1
  %ifarch ppc
- %define powerpc_optimize_base power3
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_tune power3
  %define powerpc_optimize_cpu_power4 %{normal_build}
  %else
- %define powerpc_optimize_base power4
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_tune power5
  %define powerpc_optimize_cpu_power4 0
  %endif
@@ -92,7 +92,7 @@
  %define powerpc_optimize_cpu_cell 0
 %else
  %define optimize_power 0
- %define powerpc_optimize_base 0
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_cpu_power4 0
  %define powerpc_optimize_cpu_power6 0
  %define powerpc_optimize_cpu_power7 0
@@ -246,6 +246,8 @@
 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 @@
 
 %patch1000 -p1
 %patch1001 -p1
+%patch1002 -p1
 
 # XXX Disable, it breaks the testsuite, test elf/tst-audit2 
 # %patch2008 -p1
@@ -585,7 +588,7 @@
 %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
@@ -655,8 +658,11 @@
        # Build POWER-optimized glibc
        #
        # First, base build:
-       pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} 
-mtune=%{powerpc_optimize_tune}"
-       %if %{powerpc_optimize_base} != "power3"
+       pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
+       %if "%{powerpc_optimize_base}" != ""
+       pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
+       %endif
+       %if "%{powerpc_optimize_base}" != ""
        configure_and_build_glibc base "$pBuildFlags" "$add_ons" 
--with-cpu=%{powerpc_optimize_base}
        %else
        # Use no default CPU
@@ -1057,7 +1063,7 @@
 %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 +1162,7 @@
 %{_bindir}/getent
 %{_bindir}/iconv
 %attr(755,root,root) %{_bindir}/ldd
-%ifarch %ix86 sparc sparcv9
+%ifarch %ix86 sparc sparcv9 m68k
        %{_bindir}/lddlibc4
 %endif
 %{_bindir}/locale

glibc-utils.spec: same change
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.6z0x4z/_old  2013-10-17 14:05:53.000000000 +0200
+++ /var/tmp/diff_new_pack.6z0x4z/_new  2013-10-17 14:05:53.000000000 +0200
@@ -78,11 +78,11 @@
 %ifarch ppc ppc64
  %define optimize_power 1
  %ifarch ppc
- %define powerpc_optimize_base power3
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_tune power3
  %define powerpc_optimize_cpu_power4 %{normal_build}
  %else
- %define powerpc_optimize_base power4
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_tune power5
  %define powerpc_optimize_cpu_power4 0
  %endif
@@ -92,7 +92,7 @@
  %define powerpc_optimize_cpu_cell 0
 %else
  %define optimize_power 0
- %define powerpc_optimize_base 0
+ %define powerpc_optimize_base %{nil}
  %define powerpc_optimize_cpu_power4 0
  %define powerpc_optimize_cpu_power6 0
  %define powerpc_optimize_cpu_power7 0
@@ -246,6 +246,8 @@
 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 @@
 
 %patch1000 -p1
 %patch1001 -p1
+%patch1002 -p1
 
 # XXX Disable, it breaks the testsuite, test elf/tst-audit2 
 # %patch2008 -p1
@@ -585,7 +588,7 @@
 %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
@@ -655,8 +658,11 @@
        # Build POWER-optimized glibc
        #
        # First, base build:
-       pBuildFlags="$BuildFlags -mcpu=%{powerpc_optimize_base} 
-mtune=%{powerpc_optimize_tune}"
-       %if %{powerpc_optimize_base} != "power3"
+       pBuildFlags="$BuildFlags -mtune=%{powerpc_optimize_tune}"
+       %if "%{powerpc_optimize_base}" != ""
+       pBuildFlags+=" -mcpu=%{powerpc_optimize_base}"
+       %endif
+       %if "%{powerpc_optimize_base}" != ""
        configure_and_build_glibc base "$pBuildFlags" "$add_ons" 
--with-cpu=%{powerpc_optimize_base}
        %else
        # Use no default CPU
@@ -1057,7 +1063,7 @@
 %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 +1162,7 @@
 %{_bindir}/getent
 %{_bindir}/iconv
 %attr(755,root,root) %{_bindir}/ldd
-%ifarch %ix86 sparc sparcv9
+%ifarch %ix86 sparc sparcv9 m68k
        %{_bindir}/lddlibc4
 %endif
 %{_bindir}/locale


++++++ m68k-Scrt1.patch ++++++
2013-10-08  Andreas Schwab  <[email protected]>

        * 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.  */
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to