r6818 - in glibc-package/branches/glibc-2.22/debian: . sysdeps
Author: aurel32
Date: 2015-12-13 18:27:16 +0000 (Sun, 13 Dec 2015)
New Revision: 6818
Removed:
glibc-package/branches/glibc-2.22/debian/sysdeps/armeb.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/m68k.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/powerpcspe.mk
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/sysdeps/alpha.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/arm64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/hppa.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/hurd-i386.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-i386.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mips64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mips64el.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32el.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/powerpc.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64el.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/s390x.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/sh4.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/sparc.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/sparc64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk
Log:
* debian/sysdeps/*.mk: cleanup and homogenize:
- define options common to all flavours using the non-flavour specific
variable.
- reorganize to not mix generic variables with flavour specific variables.
- move -march and -mtune options from extra_cflags to CC and CXX as they
might slightly change the ABI and the configure script needs to detect
that.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-13 18:27:16 UTC (rev 6818)
@@ -25,6 +25,13 @@
* debian/control, debian/rules.d/control.mk, debian/sysdeps/arm.mk: remove
support for the ARM old-ABI architecture, it is not supported upstream
anymore.
+ * debian/sysdeps/*.mk: cleanup and homogenize:
+ - define options common to all flavours using the non-flavour specific
+ variable.
+ - reorganize to not mix generic variables with flavour specific variables.
+ - move -march and -mtune options from extra_cflags to CC and CXX as they
+ might slightly change the ABI and the configure script needs to detect
+ that.
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:41:13 +0100
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/alpha.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/alpha.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,12 +1,10 @@
-libc_add-ons = $(add-ons)
-
+# configuration options for all flavours
libc = libc6.1
# build an ev67 optimized library
GLIBC_PASSES += alphaev67
DEB_ARCH_REGULAR_PACKAGES += libc6.1-alphaev67
-alphaev67_add-ons = $(add-ons)
alphaev67_configure_target = alphaev67-linux-gnu
-alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2
-alphaev67_extra_config_options = $(extra_config_options)
+alphaev67_CC = $(CC) -mcpu=ev67 -mtune=ev67
+alphaev67_CXX = $(CXX) -mcpu=ev67 -mtune=ev67
alphaev67_slibdir = /lib/$(DEB_HOST_MULTIARCH)/ev67
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,18 +1,18 @@
-libc_rtlddir = /lib64
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
mvec = yes
MIN_KERNEL_SUPPORTED := 2.6.32
+# main library
+libc_rtlddir = /lib64
+
# build 32-bit (i386) alternative library
GLIBC_MULTILIB_PASSES += i386
DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
-i386_add-ons = $(add-ons)
i386_configure_target = i686-linux-gnu
-i386_CC = $(CC) -m32
-i386_CXX = $(CXX) -m32
-i386_extra_cflags = -march=pentium4 -mtune=generic
-i386_extra_config_options = $(extra_config_options)
+i386_CC = $(CC) -m32 -march=pentium4 -mtune=generic
+i386_CXX = $(CXX) -m32 -march=pentium4 -mtune=generic
i386_slibdir = /lib32
i386_libdir = /usr/lib32
@@ -43,11 +43,9 @@
GLIBC_MULTILIB_PASSES += x32
DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-x32_add-ons = $(add-ons)
x32_configure_target = x86_64-linux-gnux32
x32_CC = $(CC) -mx32
x32_CXX = $(CXX) -mx32
-x32_extra_config_options = $(extra_config_options)
x32_rtlddir = /libx32
x32_slibdir = /libx32
x32_libdir = /usr/libx32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/arm64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/arm64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/arm64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,2 +1,2 @@
-libc_add-ons = $(add-ons)
+# configuration options for all flavours
extra_config_options = --enable-multi-arch
Deleted: glibc-package/branches/glibc-2.22/debian/sysdeps/armeb.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/armeb.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/armeb.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1 +0,0 @@
-libc_add-ons = $(add-ons)
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,9 +1,9 @@
-libc_add-ons = $(add-ons)
+# configuration options for all flavours
extra_config_options = --enable-multi-arch
+# build hard-float (armhf) alternative library
#GLIBC_MULTILIB_PASSES += armhf
#DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf
-#armhf_add-ons = $(add-ons)
#armhf_configure_target = arm-linux-gnueabihf
#armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
#armhf_CXX = $(CXX) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,4 +1,4 @@
-libc_add-ons = $(add-ons)
+# configuration options for all flavours
extra_config_options = --enable-multi-arch
# Install a compat symlink so old binaries keep working:
@@ -12,9 +12,9 @@
ln -sf /lib/ld-linux-armhf.so.3 debian/libc6-udeb/lib/arm-linux-gnueabihf/ld-linux.so.3
endef
+# build soft-float (armel) alternative library
#GLIBC_MULTILIB_PASSES += armel
#DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel
-#armel_add-ons = $(add-ons)
#armel_configure_target = arm-linux-gnueabi
#armel_CC = $(CC) -mfloat-abi=soft
#armel_CXX = $(CXX) -mfloat-abi=soft
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/hppa.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/hppa.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,6 +1,3 @@
-libc_add-ons = $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
-
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/hurd-i386.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/hurd-i386.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/hurd-i386.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -2,9 +2,9 @@
## A Debian-local glibc patch adds cmov to the search path.
#GLIBC_PASSES += i686
#DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686
-#i686_add-ons = $(libc_add-ons)
#i686_configure_target=i686-gnu
-#i686_extra_cflags = -march=i686 -mtune=generic
+#i686_CC = $(CC) -march=i686 -mtune=generic
+#i686_CXX = $(CXX) -march=i686 -mtune=generic
#i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
#i686_extra_config_options = $(extra_config_options) --disable-compatible-utmp
#
@@ -12,11 +12,11 @@
## greatly increase the speed when running under the 32bit Xen hypervisor.
#GLIBC_PASSES += xen
#DEB_ARCH_REGULAR_PACKAGES += libc0.3-xen
-#xen_add-ons = $(libc_add-ons)
#xen_configure_target=i686-gnu
-#xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+#xen_CC = $(CC) -march=i686 -mtune=generic
+#xen_CXX = $(CXX) -march=i686 -mtune=generic
+#xen_extra_cflags = -mno-tls-direct-seg-refs
#xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
-#xen_extra_config_options = $(extra_config_options)
#
#ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
#define libc0.3-dev_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -13,7 +13,6 @@
libc_add-ons = libpthread $(add-ons)
# MIG generates a lot of warnings
extra_config_options = --disable-werror
-libc_extra_config_options := $(extra_config_options)
ifndef HURD_SOURCE
HURD_HEADERS := /usr/include
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,3 +1,4 @@
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
MIN_KERNEL_SUPPORTED := 2.6.32
@@ -3,22 +4,20 @@
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
-# The optimized libraries also use NPTL!
GLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc6-i686
-i686_add-ons = $(add-ons)
i686_configure_target=i686-linux-gnu
-i686_extra_cflags = -march=i686 -mtune=generic
+i686_CC = $(CC) -march=i686 -mtune=generic
+i686_CXX = $(CXX) -march=i686 -mtune=generic
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
-i686_extra_config_options = $(extra_config_options)
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
DEB_ARCH_REGULAR_PACKAGES += libc6-xen
-xen_add-ons = $(add-ons)
xen_configure_target=i686-linux-gnu
-xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+xen_CC = $(CC) -march=i686 -mtune=generic
+xen_CXX = $(CXX) -march=i686 -mtune=generic
+xen_extra_cflags = -mno-tls-direct-seg-refs
xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
-xen_extra_config_options = $(extra_config_options)
define libc6-xen_extra_pkg_install
@@ -36,13 +35,11 @@
GLIBC_MULTILIB_PASSES += amd64
DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
-amd64_add-ons = $(add-ons)
amd64_configure_target = x86_64-linux-gnu
# __x86_64__ is defined here because Makeconfig uses -undef and the
# /usr/include/asm wrappers need that symbol.
amd64_CC = $(CC) -m64 -D__x86_64__
amd64_CXX = $(CXX) -m64 -D__x86_64__
-amd64_extra_config_options = $(extra_config_options)
amd64_rtlddir = /lib64
amd64_slibdir = /lib64
amd64_libdir = /usr/lib64
@@ -82,11 +79,9 @@
GLIBC_MULTILIB_PASSES += x32
DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-x32_add-ons = $(add-ons)
x32_configure_target = x86_64-linux-gnux32
x32_CC = $(CC) -mx32
x32_CXX = $(CXX) -mx32
-x32_extra_config_options = $(extra_config_options)
x32_rtlddir = /libx32
x32_slibdir = /libx32
x32_libdir = /usr/libx32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-amd64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-amd64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,17 +1,12 @@
-# Main library
-extra_config_options = --disable-compatible-utmp --disable-multi-arch --disable-werror
-
# build 32-bit (i386) alternative library
GLIBC_MULTILIB_PASSES += i386
DEB_ARCH_MULTILIB_PACKAGES += libc0.1-i386 libc0.1-dev-i386
libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
+i386_add-ons = $(libc_add-ons)
i386_configure_target = i686-kfreebsd-gnu
-i386_CC = $(CC) -m32
-i386_CXX = $(CXX) -m32
-i386_add-ons = fbtl $(add-ons)
-i386_extra_cflags = -march=pentium4 -mtune=generic
-i386_extra_config_options = $(extra_config_options)
+i386_CC = $(CC) -m32 -march=pentium4 -mtune=generic
+i386_CXX = $(CXX) -m32 -march=pentium4 -mtune=generic
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-i386.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd-i386.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,14 +1,11 @@
-# Main library
-extra_config_options = --disable-compatible-utmp --disable-multi-arch --disable-werror
-
# Build a 32-bit optimized library
GLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc0.1-i686
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
-i686_add-ons = fbtl $(add-ons)
+i686_add-ons = $(libc_add-ons)
i686_configure_target=i686-kfreebsd-gnu
-i686_extra_cflags = -march=i686 -mtune=generic
+i686_CC = $(CC) -march=i686 -mtune=generic
+i686_CXX = $(CXX) -march=i686 -mtune=generic
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
-i686_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -11,8 +11,8 @@
# NPTL Config
threads = yes
+extra_config_options = --disable-compatible-utmp --disable-multi-arch --disable-werror
libc_add-ons = fbtl $(add-ons)
-libc_extra_config_options = $(extra_config_options)
ifndef KFREEBSD_SOURCE
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -11,11 +11,8 @@
# NPTL Config
threads = yes
-libc_add-ons = $(add-ons)
-ifneq ($(filter stage1 stage2,$(DEB_BUILD_PROFILES)),)
- libc_extra_config_options = $(extra_config_options)
-else
+ifeq ($(filter stage1 stage2,$(DEB_BUILD_PROFILES)),)
libc_extra_config_options = --with-selinux $(extra_config_options)
endif
Deleted: glibc-package/branches/glibc-2.22/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/m68k.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/m68k.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1 +0,0 @@
-libc_add-ons = $(add-ons)
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mips.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mips.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,33 +1,27 @@
-libc_add-ons = $(add-ons)
-extra_cflags = -mno-plt -march=mips32r2
+# configuration options for all flavours
+extra_cflags = -mno-plt
# build 32-bit (n32) alternative library
GLIBC_MULTILIB_PASSES += mipsn32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
-mipsn32_add-ons = $(add-ons)
mipsn32_configure_target = mips64-linux-gnuabin32
-mipsn32_extra_cflags = -mno-plt -march=mips64r2
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
-mipsn32_extra_config_options := $(extra_config_options)
# build 64-bit alternative library
GLIBC_MULTILIB_PASSES += mips64
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
-mips64_add-ons = $(add-ons)
mips64_configure_target = mips64-linux-gnuabi64
-mips64_extra_cflags = -mno-plt -march=mips64r2
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
-mips64_extra_config_options := $(extra_config_options)
define libc6-dev-mips64_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mips64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mips64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mips64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,34 +1,30 @@
-libc_add-ons = $(add-ons)
+# configuration options for all flavours
+extra_cflags = -mno-plt
+
+# main library
libc_rtlddir = /lib64
-extra_cflags = -mno-plt -march=mips64r2
# build 32-bit (n32) alternative library
GLIBC_MULTILIB_PASSES += mipsn32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
-mipsn32_add-ons = $(add-ons)
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_configure_target = mips64-linux-gnuabin32
-mipsn32_extra_cflags = -mno-plt -march=mips64r2
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
-libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
-mipsn32_extra_config_options := $(extra_config_options)
# build 32-bit (o32) alternative library
GLIBC_MULTILIB_PASSES += mips32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
-mips32_add-ons = $(add-ons)
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mips-linux-gnu
-mips32_extra_cflags = -mno-plt -march=mips32r2
mips32_CC = $(CC) -mabi=32
mips32_CXX = $(CXX) -mabi=32
-libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_rtlddir = /lib
mips32_slibdir = /libo32
mips32_libdir = /usr/libo32
-mips32_extra_config_options := $(extra_config_options)
define libc6-dev-mipsn32_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mips64el.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mips64el.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mips64el.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,34 +1,32 @@
-libc_add-ons = $(add-ons)
+# configuration options for all flavours
+extra_cflags = -mno-plt
+
+# main library
libc_rtlddir = /lib64
-extra_cflags = -mno-plt -march=mips3 -mtune=mips64r2
+libc_CC = $(CC) -march=mips3 -mtune=mips64r2
+libc_CXX = $(CXX) -march=mips3 -mtune=mips64r2
# build 32-bit (n32) alternative library
GLIBC_MULTILIB_PASSES += mipsn32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
-mipsn32_add-ons = $(add-ons)
-mipsn32_configure_target = mips64el-linux-gnuabin32
-mipsn32_extra_cflags = -mno-plt -march=mips3 -mtune=mips64r2
-mipsn32_CC = $(CC) -mabi=n32
-mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_configure_target = mips64el-linux-gnuabin32
+mipsn32_CC = $(CC) -mabi=n32 -march=mips3 -mtune=mips64r2
+mipsn32_CXX = $(CXX) -mabi=n32 -march=mips3 -mtune=mips64r2
mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
-mipsn32_extra_config_options := $(extra_config_options)
# build 32-bit (o32) alternative library
GLIBC_MULTILIB_PASSES += mips32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
-mips32_add-ons = $(add-ons)
-mips32_configure_target = mipsel-linux-gnu
-mips32_extra_cflags = -mno-plt -march=mips2 -mtune=mips32r2
-mips32_CC = $(CC) -mabi=32
-mips32_CXX = $(CXX) -mabi=32
libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
+mips32_configure_target = mipsel-linux-gnu
+mips32_CC = $(CC) -mabi=32 -march=mips2 -mtune=mips32r2
+mips32_CXX = $(CXX) -mabi=32 -march=mips2 -mtune=mips32r2
mips32_rtlddir = /lib
mips32_slibdir = /libo32
mips32_libdir = /usr/libo32
-mips32_extra_config_options := $(extra_config_options)
define libc6-dev-mipsn32_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mipsel.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mipsel.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,33 +1,31 @@
-libc_add-ons = $(add-ons)
-extra_cflags = -mno-plt -march=mips2 -mtune=mips32r2
+# configuration options for all flavours
+extra_cflags = -mno-plt
+# main library
+libc_CC = $(CC) -march=mips2 -mtune=mips32r2
+libc_CXX = $(CXX) -march=mips2 -mtune=mips32r2
+
# build 32-bit (n32) alternative library
GLIBC_MULTILIB_PASSES += mipsn32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
-mipsn32_add-ons = $(add-ons)
-mipsn32_configure_target = mips64el-linux-gnuabin32
-mipsn32_extra_cflags = -mno-plt -march=mips3 -mtune=mips64r2
-mipsn32_CC = $(CC) -mabi=n32
-mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_configure_target = mips64el-linux-gnuabin32
+mipsn32_CC = $(CC) -mabi=n32 -march=mips3 -mtune=mips64r2
+mipsn32_CXX = $(CXX) -mabi=n32 -march=mips3 -mtune=mips64r2
mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
-mipsn32_extra_config_options := $(extra_config_options)
# build 64-bit alternative library
GLIBC_MULTILIB_PASSES += mips64
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
-mips64_add-ons = $(add-ons)
-mips64_configure_target = mips64el-linux-gnuabi64
-mips64_extra_cflags = -mno-plt -march=mips3 -mtune=mips64r2
-mips64_CC = $(CC) -mabi=64
-mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_configure_target = mips64el-linux-gnuabi64
+mips64_CC = $(CC) -mabi=64 -march=mips3 -mtune=mips64r2
+mips64_CXX = $(CXX) -mabi=64 -march=mips3 -mtune=mips64r2
mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
-mips64_extra_config_options := $(extra_config_options)
define libc6-dev-mips64_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,34 +1,32 @@
-libc_add-ons = $(add-ons)
-libc_rtlddir = /lib32
+# configuration options for all flavours
extra_cflags = -mno-plt
+# main library
+libc_rtlddir = /lib32
+
# build 64-bit alternative library
GLIBC_MULTILIB_PASSES += mips64
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
-mips64_add-ons = $(add-ons)
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_configure_target = mips64-linux-gnuabi64
mips64_extra_cflags = -mno-plt
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
-libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
-mips64_extra_config_options := $(extra_config_options)
# build 32-bit (o32) alternative library
GLIBC_MULTILIB_PASSES += mips32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
-mips32_add-ons = $(add-ons)
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mips-linux-gnu
mips32_extra_cflags = -mno-plt
mips32_CC = $(CC) -mabi=32
mips32_CXX = $(CXX) -mabi=32
-libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_rtlddir = /lib
mips32_slibdir = /libo32
mips32_libdir = /usr/libo32
-mips32_extra_config_options := $(extra_config_options)
define libc6-dev-mips64_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32el.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32el.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/mipsn32el.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,34 +1,30 @@
-libc_add-ons = $(add-ons)
-libc_rtlddir = /lib32
+# configuration options for all flavours
extra_cflags = -mno-plt
+# main library
+libc_rtlddir = /lib32
+
# build 64-bit alternative library
GLIBC_MULTILIB_PASSES += mips64
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
-mips64_add-ons = $(add-ons)
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_configure_target = mips64el-linux-gnuabi64
-mips64_extra_cflags = -mno-plt
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
-libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
-mips64_extra_config_options := $(extra_config_options)
# build 32-bit (o32) alternative library
GLIBC_MULTILIB_PASSES += mips32
DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
-mips32_add-ons = $(add-ons)
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mipsel-linux-gnu
-mips32_extra_cflags = -mno-plt
mips32_CC = $(CC) -mabi=32
mips32_CXX = $(CXX) -mabi=32
-libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_rtlddir = /lib
mips32_slibdir = /libo32
mips32_libdir = /usr/libo32
-mips32_extra_config_options := $(extra_config_options)
define libc6-dev-mips64_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/powerpc.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/powerpc.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,3 +1,4 @@
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
# build 64-bit (ppc64) alternative library
@@ -3,10 +4,8 @@
GLIBC_MULTILIB_PASSES += ppc64
DEB_ARCH_MULTILIB_PACKAGES += libc6-ppc64 libc6-dev-ppc64
-ppc64_add-ons = $(add-ons)
ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
ppc64_CXX = $(CXX) -m64
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
-ppc64_extra_config_options := $(extra_config_options)
ppc64_rtlddir = /lib64
ppc64_slibdir = /lib64
Deleted: glibc-package/branches/glibc-2.22/debian/sysdeps/powerpcspe.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/powerpcspe.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/powerpcspe.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1 +0,0 @@
-libc_add-ons = $(add-ons)
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,15 +1,16 @@
-libc_rtlddir = /lib64
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
+# main library
+libc_rtlddir = /lib64
+
# build 32-bit (powerpc) alternative library
GLIBC_MULTILIB_PASSES += powerpc
DEB_ARCH_MULTILIB_PACKAGES += libc6-powerpc libc6-dev-powerpc
libc6-powerpc_shlib_dep = libc6-powerpc (>= $(shlib_dep_ver))
-powerpc_add-ons = $(add-ons)
powerpc_configure_target = powerpc-linux-gnu
powerpc_CC = $(CC) -m32
powerpc_CXX = $(CXX) -m32
-powerpc_extra_config_options := $(extra_config_options)
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64el.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64el.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/ppc64el.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,2 +1,5 @@
+# configuration options for all flavours
+extra_config_options = --enable-multi-arch --enable-lock-elision --with-cpu=power8
+
+# main library
libc_rtlddir = /lib64
-extra_config_options = --enable-multi-arch --enable-lock-elision --with-cpu=power8
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/s390x.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/s390x.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,14 +1,16 @@
-libc_rtlddir = /lib
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
+# main library
+libc_rtlddir = /lib
+
# build 32-bit (s390) alternative library
GLIBC_MULTILIB_PASSES += s390
DEB_ARCH_MULTILIB_PACKAGES += libc6-s390 libc6-dev-s390
-s390_add-ons = $(add-ons)
+libc6-s390_shlib_dep = libc6-s390 (>= $(shlib_dep_ver))
s390_configure_target = s390-linux-gnu
s390_CC = $(CC) -m31
s390_CXX = $(CXX) -m31
-s390_extra_config_options := $(extra_config_options)
s390_slibdir = /lib32
s390_libdir = /usr/lib32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/sh4.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/sh4.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/sh4.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,4 +1,2 @@
-libc_add-ons = $(add-ons)
-
# Renesas SH enabled -ffinte-math-only. Some software need -mieee.
extra_cflags = -mieee
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/sparc.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/sparc.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,3 +1,4 @@
+# configuration options for all flavours
extra_config_options = --disable-multi-arch
# build 64-bit (sparc64) alternative library
@@ -3,10 +4,8 @@
GLIBC_MULTILIB_PASSES += sparc64
DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc64 libc6-dev-sparc64
-sparc64_add-ons = $(add-ons)
+libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_configure_target=sparc64-linux-gnu
sparc64_CC = $(CC) -m64
sparc64_CXX = $(CXX) -m64
-libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
-sparc64_extra_config_options = $(extra_config_options)
sparc64_rtlddir = /lib64
sparc64_slibdir = /lib64
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/sparc64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/sparc64.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/sparc64.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,16 +1,17 @@
+# configuration options for all flavours
extra_config_options = --disable-multi-arch
+
+# main library
libc_rtlddir = /lib64
libc_extra_cflags = -mcpu=ultrasparc
# build 32-bit (sparc) alternative library
GLIBC_MULTILIB_PASSES += sparc
DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc libc6-dev-sparc
-sparc_add-ons = $(add-ons)
+libc6-sparc_shlib_dep = libc6-sparc (>= $(shlib_dep_ver))
sparc_configure_target=sparc-linux-gnu
sparc_CC = $(CC) -m32
sparc_CXX = $(CXX) -m32
-libc6-sparc_shlib_dep = libc6-sparc (>= $(shlib_dep_ver))
-sparc_extra_config_options = $(extra_config_options)
sparc_rtlddir = /lib
sparc_slibdir = /lib32
sparc_libdir = /usr/lib32
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk 2015-12-13 18:19:20 UTC (rev 6817)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk 2015-12-13 18:27:16 UTC (rev 6818)
@@ -1,16 +1,17 @@
-libc_rtlddir = /libx32
+# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
mvec = yes
+# main library
+libc_rtlddir = /libx32
+
# build 64-bit (amd64) alternative library
GLIBC_MULTILIB_PASSES += amd64
DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
-amd64_add-ons = $(add-ons)
amd64_configure_target = x86_64-linux-gnu
amd64_CC = $(CC) -m64
amd64_CXX = $(CXX) -m64
-amd64_extra_config_options = $(extra_config_options)
amd64_rtlddir = /lib64
amd64_slibdir = /lib64
amd64_libdir = /usr/lib64
@@ -37,12 +38,9 @@
GLIBC_MULTILIB_PASSES += i386
DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
-i386_add-ons = $(add-ons)
i386_configure_target = i686-linux-gnu
-i386_CC = $(CC) -m32
-i386_CXX = $(CXX) -m32
-i386_extra_cflags = -march=pentium4 -mtune=generic
-i386_extra_config_options = $(extra_config_options)
+i386_CC = $(CC) -m32 -march=pentium4 -mtune=generic
+i386_CXX = $(CXX) -m32 -march=pentium4 -mtune=generic
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Reply to: