Re: [patch] reduce namespace polloution from sys/ucontext.h on arm
Joseph S. Myers wrote: The most obvious users of these definitions would be (native) GDB and gdbserver - do those still build OK (i.e. include the correct headers to get the definitions they need and not rely on any definitions that were removed) after this patch? I have built the debian gdb package (which builds both gdb and gdbserver) sucessfully on a system with this patch. Have you verified that it still works to include both and in the same source file, in either order? I had already tried that in one order, just tried the other order too. Both work fine. When I copied a structure definition over to remove the dependency I made sure to rename it (following the name used for the equivilent structure on amd64). -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4eeff00c.3060...@p10link.net
Processed: Re: please use argument-safe bswap macros on all architectures
Processing commands for cont...@bugs.debian.org: > tags 652356 + fixed-upstream Bug #652356 [src:eglibc] please use argument-safe bswap macros on all architectures Added tag(s) fixed-upstream. > thanks Stopping processing here. Please contact me if you need assistance. -- 652356: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652356 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.13243422315456.transcr...@bugs.debian.org
Bug#652356: please use argument-safe bswap macros on all architectures
Dixi quod… >Jonathan Nieder dixit: > >>Thorsten, can you test this patch or arrange for it to be tested? > >Will do that Built, WFM. bye, //mirabilos -- “Having a smoking section in a restaurant is like having a peeing section in a swimming pool.” -- Edward Burr -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/pine.bsm.4.64l.1112192220430@herc.mirbsd.org
Re: [patch] reduce namespace polloution from sys/ucontext.h on arm
On Mon, 19 Dec 2011, peter green wrote: > On the issue of the R? definitions I proposed renaming them > to REG_R?. The use of a REG_ prefix is consistent with > x86, x64 and sparc (I couldn't find any comparable definitions > at all on other architectures I looked at) I asked what the > impact of this change would be on the aforementioned mailing > lists and got the following reply from Konstantinos Margaritis > > >at worst the packages that had to be workaround on arm* for this, can > >have the workaround removed. The most obvious users of these definitions would be (native) GDB and gdbserver - do those still build OK (i.e. include the correct headers to get the definitions they need and not rely on any definitions that were removed) after this patch? Have you verified that it still works to include both and in the same source file, in either order? -- Joseph S. Myers jos...@codesourcery.com -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/pine.lnx.4.64.1112192002051.2...@digraph.polyomino.org.uk
[patch] reduce namespace polloution from sys/ucontext.h on arm
On arm linux sys/ucontext.h heavilly polloutes the global
namespace firstly by including sys/user.h (which defines
among other things a type called "struct user" and secondly
by defining symbols and #defines named R? to represent
the processor registers.
That issue in itself is nothing new but fairly recently*
signal.h started including sys/ucontext.h by default
causing programs that (quite reasonable IMO) used those
names for their own symbols to fail to build on arm. This
has been especially noticable recently because debian is
trying to build the new "armhf" port.
After discussions on debian-arm/debian-glibc/linaro-dev
(I do not know which responders came from which list)
I was given the following advice on the "struct user"
issue by Ulrich Weigand.
>Now, glibc also provides a file that defines
>layouts of register sets for use with signal handlers as well
>as the makecontext/setcontext/getcontext family of routines.
>
>Usually, those layouts tend to be in fact identical to the
>layouts described in / . Apparently,
>whoever implemented the ARM version of was
>trying to avoid some seemingly unnecessary code duplication
>by making *include* and using
>the information from there directly. This is not done on other
>platforms, for precisely the reason that the
>and headers do pollute the name space ...
>
>So I think the right thing to do in the short term would be to
>stop including , and instead add the
>register set information there directly, even if that means some
>duplication of code. (Again, since this is never-changing ABI,
>duplication isn't actually all that bad. Also, all the other
>platforms do it that way too, so why should ARM be different ...)
On the issue of the R? definitions I proposed renaming them
to REG_R?. The use of a REG_ prefix is consistent with
x86, x64 and sparc (I couldn't find any comparable definitions
at all on other architectures I looked at) I asked what the
impact of this change would be on the aforementioned mailing
lists and got the following reply from Konstantinos Margaritis
>at worst the packages that had to be workaround on arm* for this, can
>have the workaround removed.
The attached patch implements these changes.
My tests do not show any new failures in the libc testsuite (though
I do get failures that debian considers "unexpected" regardless
of whether this patch is applied or not)
* I have not investigated exactly when this change occoured
but it was somewhere between the version in debian squeeze
and the version in debian wheezy.
Index: eglibc-2.13/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
===
--- eglibc-2.13.orig/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2006-08-17 01:23:58.0 +
+++ eglibc-2.13/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2011-12-17 12:52:43.0 +
@@ -23,7 +23,6 @@
#include
#include
-#include
/* We need the signal context definitions even if they are not used
included in . */
@@ -35,47 +34,64 @@
#define NGREG 18
/* Container for all general registers. */
-typedef elf_gregset_t gregset_t;
+typedef greg_t gregset_t[NGREG];
/* Number of each register is the `gregset_t' array. */
enum
{
- R0 = 0,
-#define R0 R0
- R1 = 1,
-#define R1 R1
- R2 = 2,
-#define R2 R2
- R3 = 3,
-#define R3 R3
- R4 = 4,
-#define R4 R4
- R5 = 5,
-#define R5 R5
- R6 = 6,
-#define R6 R6
- R7 = 7,
-#define R7 R7
- R8 = 8,
-#define R8 R8
- R9 = 9,
-#define R9 R9
- R10 = 10,
-#define R10 R10
- R11 = 11,
-#define R11 R11
- R12 = 12,
-#define R12 R12
- R13 = 13,
-#define R13 R13
- R14 = 14,
-#define R14 R14
- R15 = 15
-#define R15 R15
+ REG_R0 = 0,
+#define REG_R0 REG_R0
+ REG_R1 = 1,
+#define REG_R1 REG_R1
+ REG_R2 = 2,
+#define REG_R2 REG_R2
+ REG_R3 = 3,
+#define REG_R3 REG_R3
+ REG_R4 = 4,
+#define REG_R4 REG_R4
+ REG_R5 = 5,
+#define REG_R5 REG_R5
+ REG_R6 = 6,
+#define REG_R6 REG_R6
+ REG_R7 = 7,
+#define REG_R7 REG_R7
+ REG_R8 = 8,
+#define REG_R8 REG_R8
+ REG_R9 = 9,
+#define REG_R9 REG_R9
+ REG_R10 = 10,
+#define REG_R10 REG_R10
+ REG_R11 = 11,
+#define REG_R11 REG_R11
+ REG_R12 = 12,
+#define REG_R12 REG_R12
+ REG_R13 = 13,
+#define REG_R13 REG_R13
+ REG_R14 = 14,
+#define REG_R14 REG_R14
+ REG_R15 = 15
+#define REG_R15 REG_R15
};
+struct _libc_fpstate
+{
+ struct
+ {
+unsigned int sign1:1;
+unsigned int unused:15;
+unsigned int sign2:1;
+unsigned int exponent:14;
+unsigned int j:1;
+unsigned int mantissa1:31;
+unsigned int mantissa0:32;
+ } fpregs[8];
+ unsigned int fpsr:32;
+ unsigned int fpcr:32;
+ unsigned char ftype[8];
+ unsigned int init_flag;
+};
/* Structure to describe FPU registers. */
-typedef elf_fpregset_t fpregset_t;
+typedef struct _libc_fpstate fpregset_t;
/* Context to describe whole processor state. This only describes
the core registers; coprocessor registers get saved elsewhere
r5101 - glibc-package/trunk/debian/patches/any
Author: aurel32 Date: 2011-12-19 17:38:40 + (Mon, 19 Dec 2011) New Revision: 5101 Modified: glibc-package/trunk/debian/patches/any/cvs-tzfile.diff Log: Fix bugs in cvs-tzfile.diff Modified: glibc-package/trunk/debian/patches/any/cvs-tzfile.diff === --- glibc-package/trunk/debian/patches/any/cvs-tzfile.diff 2011-12-19 17:33:56 UTC (rev 5100) +++ glibc-package/trunk/debian/patches/any/cvs-tzfile.diff 2011-12-19 17:38:40 UTC (rev 5101) @@ -7,6 +7,14 @@ index 144e20b..402389c 100644 --- a/time/tzfile.c +++ b/time/tzfile.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #define NOID + #include @@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap) goto read_again; } @@ -64,7 +72,7 @@ + if (__builtin_expect (tzspec_len < num_isstd, 0)) + goto lose; + tzspec_len -= num_isstd; -+ if (__builtin_expect (tzspec == 0 || tzspec_len - 1 < num_isgmt, 0)) ++ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0)) + goto lose; + tzspec_len -= num_isgmt + 1; + if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0)) -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rchae-00026d...@vasks.debian.org
r5099 - in glibc-package/trunk/debian: . patches/hurd-i386
Author: aurel32 Date: 2011-12-19 15:11:32 + (Mon, 19 Dec 2011) New Revision: 5099 Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/hurd-i386/tg-struct_stat.diff Log: * patches/hurd/tg-struct_stat.diff: fix #ifdef typos. Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2011-12-19 13:27:45 UTC (rev 5098) +++ glibc-package/trunk/debian/changelog2011-12-19 15:11:32 UTC (rev 5099) @@ -11,6 +11,7 @@ packages to avoid conflicts with multiarch. * sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling. * Update Dutch debconf translation, by Jeroen Schot. Closes: #652632. + * patches/hurd/tg-struct_stat.diff: fix #ifdef typos. -- Aurelien Jarno Wed, 14 Dec 2011 00:42:25 +0100 Modified: glibc-package/trunk/debian/patches/hurd-i386/tg-struct_stat.diff === --- glibc-package/trunk/debian/patches/hurd-i386/tg-struct_stat.diff 2011-12-19 13:27:45 UTC (rev 5098) +++ glibc-package/trunk/debian/patches/hurd-i386/tg-struct_stat.diff 2011-12-19 15:11:32 UTC (rev 5099) @@ -39,7 +39,7 @@ -unsigned long int st_mtime_usec; /* and microseconds. */ -__time_t st_ctime;/* Status change time, seconds */ -unsigned long int st_ctime_usec; /* and microseconds. */ -+#ifdef __USE_MISC || __USE_XOPEN2K8 ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) +/* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the @@ -73,7 +73,7 @@ -unsigned long int st_mtime_usec; /* and microseconds. */ -__time_t st_ctime;/* Status change time, seconds */ -unsigned long int st_ctime_usec; /* and microseconds. */ -+#ifdef __USE_MISC || __USE_XOPEN2K8 ++#if defined(__USE_MISC) || defined(__USE_XOPEN2K8) +/* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rcesg-00037x...@vasks.debian.org
r5098 - in glibc-package/trunk/debian: . po
Author: aurel32 Date: 2011-12-19 13:27:45 + (Mon, 19 Dec 2011) New Revision: 5098 Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/po/nl.po Log: * Update Dutch debconf translation, by Jeroen Schot. Closes: #652632. Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2011-12-19 12:06:03 UTC (rev 5097) +++ glibc-package/trunk/debian/changelog2011-12-19 13:27:45 UTC (rev 5098) @@ -10,6 +10,7 @@ * Don't provide debugging symbols for libc-bin, libc-dev-bin and nscd packages to avoid conflicts with multiarch. * sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling. + * Update Dutch debconf translation, by Jeroen Schot. Closes: #652632. -- Aurelien Jarno Wed, 14 Dec 2011 00:42:25 +0100 Modified: glibc-package/trunk/debian/po/nl.po === --- glibc-package/trunk/debian/po/nl.po 2011-12-19 12:06:03 UTC (rev 5097) +++ glibc-package/trunk/debian/po/nl.po 2011-12-19 13:27:45 UTC (rev 5098) @@ -1,14 +1,15 @@ -# Dutch eglibc po-debconf translation, -# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER +# Dutch translation of eglibc po-debconf templates. +# Copyright (C) 2008-2011 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the eglibc package. +# Bart Cornelis , 2008. # Vincent Zweije , 2011. # msgid "" msgstr "" -"Project-Id-Version: eglibc 2.13-21\n" -"Report-Msgid-Bugs-To: gl...@packages.debian.org\n" -"POT-Creation-Date: 2009-03-08 15:23+0100\n" -"PO-Revision-Date: 2011-11-22 14:56+0100\n" +"Project-Id-Version: eglibc 2.13-23\n" +"Report-Msgid-Bugs-To: egl...@packages.debian.org\n" +"POT-Creation-Date: 2011-10-30 11:52-0700\n" +"PO-Revision-Date: 2011-12-19 13:23+0100\n" "Last-Translator: Vincent Zweije \n" "Language-Team: Debian l10n Dutch \n" "Language: nl\n" @@ -216,3 +217,30 @@ "deze actieve instanties te authenticeren. U wordt sterk aangeraden om deze " "instanties te herstarten of stoppen voordat u de opwaardering van GNU libc " "voortzet, anders kunnen gebruikers van hun sessies worden buitengesloten." + +#. Type: boolean +#. Description +#: ../debhelper.in/libc.templates:5001 +msgid "Restart services during package upgrades without asking?" +msgstr "Diensten zonder vragen herstarten bij het opwaarderen van pakketten?" + +#. Type: boolean +#. Description +#: ../debhelper.in/libc.templates:5001 +msgid "" +"There are services installed on your system which need to be restarted when " +"certain libraries, such as libpam, libc, and libssl, are upgraded. Since " +"these restarts may cause interruptions of service for the system, you will " +"normally be prompted on each upgrade for the list of services you wish to " +"restart. You can choose this option to avoid being prompted; instead, all " +"necessary restarts will be done for you automatically so you can avoid being " +"asked questions on each library upgrade." +msgstr "" +"Er zijn diensten op uw systeem geïnstalleerd die moeten worden herstart " +"wanneer bepaalde bibliotheken, zoals libpam, libc en libssl, worden " +"opgewaardeerd. Omdat deze herstarts dienstonderbrekingen op uw systeem " +"kunnen veroorzaken wordt u normaal gesproken bij elke opwaardering gevraagd " +"welke diensten u wilt herstarten. Als u voor deze optie kiest wordt dit niet " +"meer aan u gevraagd. In plaats daarvan worden alle noodzakelijke herstarts " +"automatisch gedaan zodat u geen vragen krijgt bij elke opwaardering van een " +"bibliotheek." -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rcdfq-00047h...@vasks.debian.org
Processed: tagging 652632
Processing commands for cont...@bugs.debian.org: > tags 652632 + pending Bug #652632 [eglibc] eglibc: [INTL:nl] Dutch translation of debconf templates Added tag(s) pending. > thanks Stopping processing here. Please contact me if you need assistance. -- 652632: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652632 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.132430128618062.transcr...@bugs.debian.org
Bug#652632: eglibc: [INTL:nl] Dutch translation of debconf templates
Package: eglibc
Severity: wishlist
Tags: patch l10n
Hello,
Attached is the updated Dutch translation of the eglibc debconf templates.
Please include it in your next upload.
Regards,
--
Jeroen Schot
# Dutch translation of eglibc po-debconf templates.
# Copyright (C) 2008-2011 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the eglibc package.
# Bart Cornelis , 2008.
# Vincent Zweije , 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: eglibc 2.13-23\n"
"Report-Msgid-Bugs-To: egl...@packages.debian.org\n"
"POT-Creation-Date: 2011-10-30 11:52-0700\n"
"PO-Revision-Date: 2011-12-19 13:23+0100\n"
"Last-Translator: Vincent Zweije \n"
"Language-Team: Debian l10n Dutch \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: multiselect
#. Choices
#: ../debhelper.in/locales.templates:1001
msgid "All locales"
msgstr "Alle lokalisaties"
#. Type: multiselect
#. Description
#: ../debhelper.in/locales.templates:1002
msgid "Locales to be generated:"
msgstr "Te genereren lokalisaties:"
#. Type: multiselect
#. Description
#: ../debhelper.in/locales.templates:1002
msgid ""
"Locales are a framework to switch between multiple languages and allow users "
"to use their language, country, characters, collation order, etc."
msgstr ""
"Lokalisatie is het raamwerk om om te schakelen tussen verschillende talen en "
"laat gebruikers toe om hun eigen taal, land, karakterset, enzovoort te "
"gebruiken."
#. Type: multiselect
#. Description
#: ../debhelper.in/locales.templates:1002
msgid ""
"Please choose which locales to generate. UTF-8 locales should be chosen by "
"default, particularly for new installations. Other character sets may be "
"useful for backwards compatibility with older systems and software."
msgstr ""
"Welke lokalisaties wilt u laten genereren? Standaard kiest u, zeker voor "
"nieuwe installaties, best UTF-8 lokalisaties. Andere karaktersets kunnen "
"nuttig zijn voor compatibiliteit met oudere systemen of software."
#. Type: select
#. Choices
#: ../debhelper.in/locales.templates:2001
msgid "None"
msgstr "Geen"
#. Type: select
#. Description
#: ../debhelper.in/locales.templates:2002
msgid "Default locale for the system environment:"
msgstr "Standaardlokalisatie voor dit systeem:"
#. Type: select
#. Description
#: ../debhelper.in/locales.templates:2002
msgid ""
"Many packages in Debian use locales to display text in the correct language "
"for the user. You can choose a default locale for the system from the "
"generated locales."
msgstr ""
"Veel Debian-pakketten gebruiken lokalisaties om de tekst in de voor de "
"gebruiker juiste taal weer te geven. U kunt u de standaardlokalisatie voor "
"het systeem kiezen uit de gegeneerde lokalisaties."
#. Type: select
#. Description
#: ../debhelper.in/locales.templates:2002
msgid ""
"This will select the default language for the entire system. If this system "
"is a multi-user system where not all users are able to speak the default "
"language, they will experience difficulties."
msgstr ""
"Dit bepaalt de standaardtaal voor het volledige systeem. Op systemen met "
"meerdere gebruikers kunt u problemen krijgen als niet alle gebruikers de "
"gekozen taal spreken; in dat geval kunt u misschien beter de "
"standaardlokalisatie niet veranderen."
#. Type: boolean
#. Description
#: ../debhelper.in/libc.templates:1001
msgid "Do you want to upgrade glibc now?"
msgstr "Wilt u glibc nu opwaarderen?"
#. Type: boolean
#. Description
#: ../debhelper.in/libc.templates:1001
msgid ""
"Running services and programs that are using NSS need to be restarted, "
"otherwise they might not be able to do lookup or authentication any more. "
"The installation process is able to restart some services (such as ssh or "
"telnetd), but other programs cannot be restarted automatically. One such "
"program that needs manual stopping and restart after the glibc upgrade by "
"yourself is xdm - because automatic restart might disconnect your active X11 "
"sessions."
msgstr ""
"actieve diensten en programma's die NSS gebruiken dienen herstart te worden. "
"Zo niet kunnen ze mogelijk geen opzoekingen en authenticatie meer doen. Het "
"Installatieproces kan sommige diensten (zoals ssh en telnetd) herstarten, "
"maar andere diensten kunnen niet automatisch herstart worden. Een zo'n "
"dienst die handmatig dient gestopt en gestart te worden na de opwaardering "
"van glibc is xdm, dit omdat een automatische herstart uw actieve X11-sessies "
"verbreekt."
#. Type: boolean
#. Description
#: ../debhelper.in/libc.templates:1001
msgid ""
"This script detected the following installed services which must be stopped "
"before the upgrade: ${services}"
msgstr ""
"Dit script heeft de volgende diensten ontdekt die gestopt moeten worden voor "
"de opwaardering: ${services}"
#. Type: boolean
#. Description
#: ../debhelper.in/libc.templates:1001
msgid ""
"If you want to interrupt the upgrade now and continue later
r5097 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32 Date: 2011-12-19 12:06:03 + (Mon, 19 Dec 2011) New Revision: 5097 Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/sysdeps/armel.mk glibc-package/trunk/debian/sysdeps/armhf.mk Log: * sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling. Modified: glibc-package/trunk/debian/changelog === --- glibc-package/trunk/debian/changelog2011-12-19 06:28:35 UTC (rev 5096) +++ glibc-package/trunk/debian/changelog2011-12-19 12:06:03 UTC (rev 5097) @@ -9,6 +9,7 @@ Closes: #650790. * Don't provide debugging symbols for libc-bin, libc-dev-bin and nscd packages to avoid conflicts with multiarch. + * sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling. -- Aurelien Jarno Wed, 14 Dec 2011 00:42:25 +0100 Modified: glibc-package/trunk/debian/sysdeps/armel.mk === --- glibc-package/trunk/debian/sysdeps/armel.mk 2011-12-19 06:28:35 UTC (rev 5096) +++ glibc-package/trunk/debian/sysdeps/armel.mk 2011-12-19 12:06:03 UTC (rev 5097) @@ -3,8 +3,8 @@ #EGLIBC_PASSES += armhf #DEB_ARCH_REGULAR_PACKAGES += libc6-armhf libc6-dev-armhf #armhf_add-ons = ports nptl $(add-ons) -#armhf_CC = $(BUILD_CC) -mfloat-abi=hard -#armhf_CXX = $(BUILD_CXX) -mfloat-abi=hard +#armhf_CC = $(CC) -mfloat-abi=hard +#armhf_CXX = $(CXX) -mfloat-abi=hard #armhf_slibdir = /lib/arm-linux-gnueabihf #armhf_libdir = /usr/lib/arm-linux-gnueabihf ## To be coinstallable with armel, we install ld.so to a multiarch directory Modified: glibc-package/trunk/debian/sysdeps/armhf.mk === --- glibc-package/trunk/debian/sysdeps/armhf.mk 2011-12-19 06:28:35 UTC (rev 5096) +++ glibc-package/trunk/debian/sysdeps/armhf.mk 2011-12-19 12:06:03 UTC (rev 5097) @@ -1,10 +1,7 @@ libc_add-ons = ports nptl $(add-ons) # Use gcc-4.6 on armhf to get correct atomic operations in thumb-2 mode -ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) -CC = $(DEB_HOST_GNU_TYPE)-gcc -CXX= $(DEB_HOST_GNU_TYPE)-g++ -else +ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) CC = gcc-4.6 CXX= g++-4.6 endif @@ -23,8 +20,8 @@ #EGLIBC_PASSES += armel #DEB_ARCH_REGULAR_PACKAGES += libc6-armel libc6-dev-armel #armel_add-ons = ports nptl $(add-ons) -#armel_CC = $(BUILD_CC) -mfloat-abi=softfp -#armel_CXX = $(BUILD_CXX) -mfloat-abi=softfp +#armel_CC = $(CC) -mfloat-abi=softfp +#armel_CXX = $(CXX) -mfloat-abi=softfp #armel_slibdir = /lib/arm-linux-gnueabi #armel_libdir = /usr/lib/arm-linux-gnueabi #armel_rtlddir = /lib -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rcbyl-0005ru...@vasks.debian.org
Re: Enable hardening for cross builds
On Mon, Dec 19, 2011 at 11:47:11AM +0100, Marcin Juszkiewicz wrote: > > Default Debian/Ubuntu cross compiler did not had hardening support > enabled but this got changed in gcc-4.6 4.6.2-6 version. Due to this > eglibc is no longer cross buildable as "-fno-stack-protector > -U_FORTIFY_SOURCE" are set only for native builds. > > This change sets those flags for both native and cross builds. > > I am not subscribed to ML. This patch seems to be for Ubuntu only, it doesn't apply to the debian sources, and we are not building with -fno-stack-protector -U_FORTIFY_SOURCE, even for the native build. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20111219113238.gl9...@hall.aurel32.net
Enable hardening for cross builds
Default Debian/Ubuntu cross compiler did not had hardening support enabled but this got changed in gcc-4.6 4.6.2-6 version. Due to this eglibc is no longer cross buildable as "-fno-stack-protector -U_FORTIFY_SOURCE" are set only for native builds. This change sets those flags for both native and cross builds. I am not subscribed to ML. === modified file 'debian/rules' --- debian/rules 2011-08-09 20:34:55 + +++ debian/rules 2011-12-07 12:56:21 + @@ -109,9 +109,6 @@ slibdir=/lib/$(DEB_HOST_MULTIARCH) libdir=/usr/lib/$(DEB_HOST_MULTIARCH) -BUILD_CC = gcc-4.6 -fno-stack-protector -U_FORTIFY_SOURCE -BUILD_CXX = g++-4.6 -fno-stack-protector -U_FORTIFY_SOURCE - RUN_TESTSUITE = yes # Set CC and CXX for cross-compiling @@ -119,10 +116,13 @@ CC = $(DEB_HOST_GNU_TYPE)-gcc CXX= $(DEB_HOST_GNU_TYPE)-g++ else -CC = $(BUILD_CC) -CXX= $(BUILD_CXX) +CC = gcc-4.6 +CXX= g++-4.6 endif +CC += -fno-stack-protector -U_FORTIFY_SOURCE +CXX += -fno-stack-protector -U_FORTIFY_SOURCE + BUILD_CFLAGS = -O2 -g HOST_CFLAGS = -pipe -O2 -fstrict-aliasing -g $(call xx,extra_cflags)
