r5627 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2013-06-08 22:10:51 +0000 (Sat, 08 Jun 2013)
New Revision: 5627
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Log:
* control.in/main, sysdeps/mips.mk, sysdeps/mipsel.mk: build the libc
back with gcc-4.7, but using -mno-plt.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-06-05 07:46:37 UTC (rev 5626)
+++ glibc-package/trunk/debian/changelog 2013-06-08 22:10:51 UTC (rev 5627)
@@ -1,6 +1,8 @@
eglibc (2.17-6) UNRELEASED; urgency=low
- *
+ [ Aurelien Jarno ]
+ * control.in/main, sysdeps/mips.mk, sysdeps/mipsel.mk: build the libc
+ back with gcc-4.7, but using -mno-plt.
-- Aurelien Jarno <aurel32@debian.org> Wed, 05 Jun 2013 09:46:30 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2013-06-05 07:46:37 UTC (rev 5626)
+++ glibc-package/trunk/debian/control 2013-06-08 22:10:51 UTC (rev 5627)
@@ -8,7 +8,6 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.4 [mips mipsel], g++-4.4-multilib [mips mipsel],
g++-4.6 [ia64],
g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32]
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2013-06-05 07:46:37 UTC (rev 5626)
+++ glibc-package/trunk/debian/control.in/main 2013-06-08 22:10:51 UTC (rev 5627)
@@ -8,7 +8,6 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.4 [mips mipsel], g++-4.4-multilib [mips mipsel],
g++-4.6 [ia64],
g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32]
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2013-06-05 07:46:37 UTC (rev 5626)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2013-06-08 22:10:51 UTC (rev 5627)
@@ -1,15 +1,14 @@
libc_add-ons = ports nptl $(add-ons)
+extra_cflags = -mno-plt
-CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.4
-CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.4
-
# build 32-bit (n32) alternative library
EGLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips32-linux-gnu
-mipsn32_CC = $(CC) -mabi=n32 -mno-plt
-mipsn32_CXX = $(CXX) -mabi=n32 -mno-plt
+mipsn32_extra_cflags = -mno-plt
+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
@@ -21,8 +20,9 @@
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64-linux-gnu
-mips64_CC = $(CC) -mabi=64 -mno-plt
-mips64_CXX = $(CXX) -mabi=64 -mno-plt
+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
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2013-06-05 07:46:37 UTC (rev 5626)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2013-06-08 22:10:51 UTC (rev 5627)
@@ -1,15 +1,14 @@
libc_add-ons = ports nptl $(add-ons)
+extra_cflags = -mno-plt
-CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.4
-CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.4
-
# build 32-bit (n32) alternative library
EGLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips32el-linux-gnu
-mipsn32_CC = $(CC) -mabi=n32 -mno-plt
-mipsn32_CXX = $(CXX) -mabi=n32 -mno-plt
+mipsn32_extra_cflags = -mno-plt
+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
@@ -21,8 +20,9 @@
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64el-linux-gnu
-mips64_CC = $(CC) -mabi=64 -mno-plt
-mips64_CXX = $(CXX) -mabi=64 -mno-plt
+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
Reply to: