[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1205 - in glibc-package/trunk/debian: . control.in sysdeps



Author: aurel32
Date: 2006-02-21 23:56:32 +0000 (Tue, 21 Feb 2006)
New Revision: 1205

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
   glibc-package/trunk/debian/sysdeps/powerpc.mk
Log:
  * Switch to gcc-4.0 on powerpc.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-02-21 23:02:15 UTC (rev 1204)
+++ glibc-package/trunk/debian/changelog	2006-02-21 23:56:32 UTC (rev 1205)
@@ -72,6 +72,7 @@
     - Use policy compliant links in libc6-dev-amd64
     - Use an absolute symlink for /lib64 on amd64
   * Add myself to Uploaders.
+  * Switch to gcc-4.0 on powerpc.
 
  -- Clint Adams <schizo@debian.org>  Sun, 12 Feb 2006 11:04:38 -0500
 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2006-02-21 23:02:15 UTC (rev 1204)
+++ glibc-package/trunk/debian/control	2006-02-21 23:56:32 UTC (rev 1205)
@@ -6,7 +6,7 @@
  linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-i386],
- gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k !hppa !hurd-i386], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc],
  quilt

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2006-02-21 23:02:15 UTC (rev 1204)
+++ glibc-package/trunk/debian/control.in/main	2006-02-21 23:56:32 UTC (rev 1205)
@@ -6,7 +6,7 @@
  linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-i386],
- gcc-4.0 [!powerpc !m68k !hppa !hurd-i386], gcc-3.4 (>= 3.4.4-6) [powerpc], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k !hppa !hurd-i386], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc],
  quilt

Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk	2006-02-21 23:02:15 UTC (rev 1204)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk	2006-02-21 23:56:32 UTC (rev 1205)
@@ -1,23 +1,11 @@
-# work around to build ppc32/ppc64, gcc-4.0 is not ready.
-CC = gcc-3.4
-BUILD_CC = gcc-3.4
-
 GLIBC_PASSES += ppc64 nptl
 DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
 
-# nptl/ppc64 extra_cfalgs needs -g2 because of gcc-3.4 bug.
-BUILD_CC_VERSION := $(shell $(BUILD_CC) -dumpversion | sed 's/\([0-9]*\.[0-9]*\)\(.*\)/\1/')
-ifeq ($(BUILD_CC_VERSION),3.4)
-	nptl_extra_cflags += -g2
-	ppc64_extra_cflags += -g2
-endif
-
 ppc64_MIN_KERNEL_SUPPORTED = 2.6.0
 ppc64_configure_target = powerpc64-linux
 ppc64_CC = $(CC) -m64
 ppc64_add-ons = nptl $(add-ons)
 libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
-# remove -g1 because of gcc-3.4 problem.  it should be enabled again.
-ppc64_extra_cflags = -O3  #-g1
+ppc64_extra_cflags = -O3 -g1
 ppc64_LIBDIR = 64
 ppc64_extra_config_options := $(extra_config_options) --with-tls --with-__thread --disable-profile



Reply to: