From: "Daniel Cegiełka" <daniel.cegielka@gmail.com>
To: musl@lists.openwall.com
Subject: Re: musl and gcc-4.8 (sabotage)
Date: Sat, 30 Mar 2013 10:51:41 +0100 [thread overview]
Message-ID: <CAPLrYES+LpZ6u+J7G4ijksSSFVeuxMk5qBmFSz8rt+JxojnTXA@mail.gmail.com> (raw)
In-Reply-To: <20130329151954.GF30576@port70.net>
[-- Attachment #1.1: Type: text/plain, Size: 3118 bytes --]
2013/3/29 Szabolcs Nagy <nsz@port70.net>
> for some reason the diff got attached as octet stream
>
> i'd cc gregor since it was his work originally and he
> is not subscribed to the ml
>
> this part seems to change the behaviour for other
> libcs, is that necessary?
>
>
glibc, bionic and uclib have special definitions to be able to detect which
libc is used (__GLIBC__, __UCLIBC__). musl doesn't support such solutions,
so we can use host_os (gcc-4.8-musl.diff):
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/configure.host
gcc-4.8-20130321/libstdc++-v3/configure.host
--- gcc-4.8-20130321.orig/libstdc++-v3/configure.host Sat Mar 30
00:29:39 2013
+++ gcc-4.8-20130321/libstdc++-v3/configure.host Sat Mar 30 00:31:28 2013
@@ -268,6 +268,8 @@
os_include_dir="os/uclibc"
elif [ "$bionic" = "yes" ]; then
os_include_dir="os/bionic"
+ elif [ "$host_os" = "linux-musl" ]; then
+ os_include_dir="os/generic"
else
os_include_dir="os/gnu-linux"
fi
or detect glibc in gcc way (gcc-4.8-musl2.diff):
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/acinclude.m4
gcc-4.8-20130321/libstdc++-v3/acinclude.m4
--- gcc-4.8-20130321.orig/libstdc++-v3/acinclude.m4 Fri Mar 29 22:23:14
2013
+++ gcc-4.8-20130321/libstdc++-v3/acinclude.m4 Fri Mar 29 22:30:53 2013
@@ -99,6 +99,13 @@
# Check for C library flavor since GNU/Linux platforms use different
# configuration directories depending on the C library in use.
+ AC_EGREP_CPP([_using_glibc], [
+ #include <features.h>
+ #if __GLIBC__
+ _using_glibc
+ #endif
+ ], glibc=yes, glibc=no)
+
AC_EGREP_CPP([_using_uclibc], [
#include <stdio.h>
#if __UCLIBC__
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/configure
gcc-4.8-20130321/libstdc++-v3/configure
--- gcc-4.8-20130321.orig/libstdc++-v3/configure Fri Mar 29 22:23:14 2013
+++ gcc-4.8-20130321/libstdc++-v3/configure Fri Mar 29 22:29:23 2013
@@ -5243,6 +5243,24 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+ #include <features.h>
+ #if __GLIBC__
+ _using_glibc
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "_using_glibc" >/dev/null 2>&1; then :
+ glibc=yes
+else
+ glibc=no
+fi
+rm -f conftest*
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
#include <stdio.h>
#if __UCLIBC__
_using_uclibc
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/configure.host
gcc-4.8-20130321/libstdc++-v3/configure.host
--- gcc-4.8-20130321.orig/libstdc++-v3/configure.host Fri Mar 29
22:23:14 2013
+++ gcc-4.8-20130321/libstdc++-v3/configure.host Fri Mar 29 22:36:15 2013
@@ -264,12 +264,14 @@
os_include_dir="os/bsd/freebsd"
;;
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
- if [ "$uclibc" = "yes" ]; then
+ if [ "$glibc" = "yes" ]; then
+ os_include_dir="os/gnu-linux"
+ elif [ "$uclibc" = "yes" ]; then
os_include_dir="os/uclibc"
elif [ "$bionic" = "yes" ]; then
os_include_dir="os/bionic"
else
- os_include_dir="os/gnu-linux"
+ os_include_dir="os/generic"
fi
;;
hpux*)
Daniel
[-- Attachment #1.2: Type: text/html, Size: 4151 bytes --]
[-- Attachment #2: gcc-4.8-musl.diff --]
[-- Type: application/octet-stream, Size: 14375 bytes --]
[-- Attachment #3: gcc-4.8-musl2.diff --]
[-- Type: application/octet-stream, Size: 15902 bytes --]
diff -urN gcc-4.8-20130321.orig/gcc/config/arm/linux-eabi.h gcc-4.8-20130321/gcc/config/arm/linux-eabi.h
--- gcc-4.8-20130321.orig/gcc/config/arm/linux-eabi.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/arm/linux-eabi.h Fri Mar 29 11:47:34 2013
@@ -77,6 +77,10 @@
%{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
%{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+/* musl has no "classic" (i.e. broken) mode */
+#undef MUSL_DYNAMIC_LINKER
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
+
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
use the GNU/Linux version, not the generic BPABI version. */
#undef LINK_SPEC
diff -urN gcc-4.8-20130321.orig/gcc/config/i386/linux.h gcc-4.8-20130321/gcc/config/i386/linux.h
--- gcc-4.8-20130321.orig/gcc/config/i386/linux.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/i386/linux.h Fri Mar 29 11:55:01 2013
@@ -21,3 +21,4 @@
#define GNU_USER_LINK_EMULATION "elf_i386"
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
diff -urN gcc-4.8-20130321.orig/gcc/config/i386/linux64.h gcc-4.8-20130321/gcc/config/i386/linux64.h
--- gcc-4.8-20130321.orig/gcc/config/i386/linux64.h Fri Mar 29 11:45:28 2013
+++ gcc-4.8-20130321/gcc/config/i386/linux64.h Fri Mar 29 11:47:35 2013
@@ -30,3 +30,7 @@
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
diff -urN gcc-4.8-20130321.orig/gcc/config/linux.h gcc-4.8-20130321/gcc/config/linux.h
--- gcc-4.8-20130321.orig/gcc/config/linux.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/linux.h Fri Mar 29 11:54:13 2013
@@ -32,10 +32,12 @@
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
#else
#define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
#endif
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
@@ -53,18 +55,21 @@
uClibc or Bionic is the default C library and whether
-muclibc or -mglibc or -mbionic has been passed to change the default. */
-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
#if DEFAULT_LIBC == LIBC_GLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
#elif DEFAULT_LIBC == LIBC_UCLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
#elif DEFAULT_LIBC == LIBC_BIONIC
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
+#elif DEFAULT_LIBC == LIBC_MUSL
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
#else
#error "Unsupported DEFAULT_LIBC"
#endif /* DEFAULT_LIBC */
@@ -84,16 +89,16 @@
#define GNU_USER_DYNAMIC_LINKER \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
- BIONIC_DYNAMIC_LINKER)
+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
#define GNU_USER_DYNAMIC_LINKER32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
- BIONIC_DYNAMIC_LINKER32)
+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
#define GNU_USER_DYNAMIC_LINKER64 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
- BIONIC_DYNAMIC_LINKER64)
+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
#define GNU_USER_DYNAMIC_LINKERX32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
- BIONIC_DYNAMIC_LINKERX32)
+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
/* Determine whether the entire c99 runtime
is present in the runtime library. */
diff -urN gcc-4.8-20130321.orig/gcc/config/linux.opt gcc-4.8-20130321/gcc/config/linux.opt
--- gcc-4.8-20130321.orig/gcc/config/linux.opt Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/linux.opt Fri Mar 29 11:47:34 2013
@@ -30,3 +30,7 @@
muclibc
Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
Use uClibc C library
+
+mmusl
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
+Use musl C library
diff -urN gcc-4.8-20130321.orig/gcc/config/mips/linux.h gcc-4.8-20130321/gcc/config/mips/linux.h
--- gcc-4.8-20130321.orig/gcc/config/mips/linux.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/mips/linux.h Fri Mar 29 11:47:34 2013
@@ -18,3 +18,5 @@
<http://www.gnu.org/licenses/>. */
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
diff -urN gcc-4.8-20130321.orig/gcc/config/rs6000/linux64.h gcc-4.8-20130321/gcc/config/rs6000/linux64.h
--- gcc-4.8-20130321.orig/gcc/config/rs6000/linux64.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/rs6000/linux64.h Fri Mar 29 11:47:34 2013
@@ -364,17 +364,21 @@
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
#if DEFAULT_LIBC == LIBC_UCLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
#elif DEFAULT_LIBC == LIBC_GLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+#elif DEFAULT_LIBC == LIBC_MUSL
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
#else
#error "Unsupported DEFAULT_LIBC"
#endif
#define GNU_USER_DYNAMIC_LINKER32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
#define GNU_USER_DYNAMIC_LINKER64 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
diff -urN gcc-4.8-20130321.orig/gcc/config/rs6000/secureplt.h gcc-4.8-20130321/gcc/config/rs6000/secureplt.h
--- gcc-4.8-20130321.orig/gcc/config/rs6000/secureplt.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/rs6000/secureplt.h Fri Mar 29 11:47:34 2013
@@ -18,3 +18,4 @@
<http://www.gnu.org/licenses/>. */
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
diff -urN gcc-4.8-20130321.orig/gcc/config/rs6000/sysv4.h gcc-4.8-20130321/gcc/config/rs6000/sysv4.h
--- gcc-4.8-20130321.orig/gcc/config/rs6000/sysv4.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/config/rs6000/sysv4.h Fri Mar 29 11:47:34 2013
@@ -551,6 +551,9 @@
#ifndef CC1_SECURE_PLT_DEFAULT_SPEC
#define CC1_SECURE_PLT_DEFAULT_SPEC ""
#endif
+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
+#endif
/* Pass -G xxx to the compiler and set correct endian mode. */
#define CC1_SPEC "%{G*} %(cc1_cpu) \
@@ -611,7 +614,8 @@
%{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
%{mcall-i960-old: --oformat elf32-powerpcle} \
- }}}}"
+ }}}} \
+%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
/* Any specific OS flags. */
#define LINK_OS_SPEC "\
@@ -789,15 +793,18 @@
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
#if DEFAULT_LIBC == LIBC_UCLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+#elif DEFAULT_LIBC == LIBC_MUSL
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
#else
#error "Unsupported DEFAULT_LIBC"
#endif
#define GNU_USER_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
%{rdynamic:-export-dynamic} \
@@ -923,6 +930,7 @@
{ "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
{ "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff -urN gcc-4.8-20130321.orig/gcc/config.gcc gcc-4.8-20130321/gcc/config.gcc
--- gcc-4.8-20130321.orig/gcc/config.gcc Wed Mar 13 09:47:41 2013
+++ gcc-4.8-20130321/gcc/config.gcc Fri Mar 29 11:47:34 2013
@@ -549,7 +549,7 @@
esac
# Common C libraries.
-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
# Common parts for widely ported systems.
case ${target} in
@@ -652,6 +652,9 @@
*-*-*uclibc*)
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
;;
+ *-*-*musl*)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
+ ;;
*)
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
;;
@@ -2108,6 +2111,10 @@
tm_file="${tm_file} rs6000/linuxspe.h rs6000/e500.h" ;;
powerpc*-*-linux*paired*)
tm_file="${tm_file} rs6000/750cl.h" ;;
+ esac
+ case ${target} in
+ *-linux*-musl*)
+ enable_secureplt=yes ;;
esac
if test x${enable_secureplt} = xyes; then
tm_file="rs6000/secureplt.h ${tm_file}"
diff -urN gcc-4.8-20130321.orig/gcc/ginclude/stddef.h gcc-4.8-20130321/gcc/ginclude/stddef.h
--- gcc-4.8-20130321.orig/gcc/ginclude/stddef.h Thu Jan 10 20:38:27 2013
+++ gcc-4.8-20130321/gcc/ginclude/stddef.h Fri Mar 29 11:47:34 2013
@@ -181,6 +181,7 @@
#ifndef _GCC_SIZE_T
#ifndef _SIZET_
#ifndef __size_t
+#ifndef __DEFINED_size_t /* musl */
#define __size_t__ /* BeOS */
#define __SIZE_T__ /* Cray Unicos/Mk */
#define _SIZE_T
@@ -197,6 +198,7 @@
#define ___int_size_t_h
#define _GCC_SIZE_T
#define _SIZET_
+#define __DEFINED_size_t /* musl */
#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
|| defined(__FreeBSD_kernel__)
/* __size_t is a typedef on FreeBSD 5, must not trash it. */
@@ -231,6 +233,7 @@
#endif /* _SIZE_T */
#endif /* __SIZE_T__ */
#endif /* __size_t__ */
+#endif /* musl */
#undef __need_size_t
#endif /* _STDDEF_H or __need_size_t. */
diff -urN gcc-4.8-20130321.orig/libgomp/config/posix/time.c gcc-4.8-20130321/libgomp/config/posix/time.c
--- gcc-4.8-20130321.orig/libgomp/config/posix/time.c Mon Jan 14 18:18:49 2013
+++ gcc-4.8-20130321/libgomp/config/posix/time.c Fri Mar 29 11:47:34 2013
@@ -28,6 +28,8 @@
The following implementation uses the most simple POSIX routines.
If present, POSIX 4 clocks should be used instead. */
+#define _POSIX_C_SOURCE 199309L /* for clocks */
+
#include "libgomp.h"
#include <unistd.h>
#if TIME_WITH_SYS_TIME
diff -urN gcc-4.8-20130321.orig/libitm/config/arm/hwcap.cc gcc-4.8-20130321/libitm/config/arm/hwcap.cc
--- gcc-4.8-20130321.orig/libitm/config/arm/hwcap.cc Sun Feb 3 17:46:11 2013
+++ gcc-4.8-20130321/libitm/config/arm/hwcap.cc Fri Mar 29 11:56:22 2013
@@ -40,7 +40,7 @@
#ifdef __linux__
#include <unistd.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <elf.h>
static void __attribute__((constructor))
diff -urN gcc-4.8-20130321.orig/libitm/config/linux/x86/tls.h gcc-4.8-20130321/libitm/config/linux/x86/tls.h
--- gcc-4.8-20130321.orig/libitm/config/linux/x86/tls.h Sun Feb 3 17:46:11 2013
+++ gcc-4.8-20130321/libitm/config/linux/x86/tls.h Fri Mar 29 11:47:34 2013
@@ -25,16 +25,19 @@
#ifndef LIBITM_X86_TLS_H
#define LIBITM_X86_TLS_H 1
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
+#if defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 10)
/* Use slots in the TCB head rather than __thread lookups.
GLIBC has reserved words 10 through 13 for TM. */
#define HAVE_ARCH_GTM_THREAD 1
#define HAVE_ARCH_GTM_THREAD_DISP 1
#endif
+#endif
#include "config/generic/tls.h"
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
+#if defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 10)
namespace GTM HIDDEN {
#ifdef __x86_64__
@@ -101,5 +104,6 @@
} // namespace GTM
#endif /* >= GLIBC 2.10 */
+#endif
#endif // LIBITM_X86_TLS_H
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/acinclude.m4 gcc-4.8-20130321/libstdc++-v3/acinclude.m4
--- gcc-4.8-20130321.orig/libstdc++-v3/acinclude.m4 Fri Mar 29 22:23:14 2013
+++ gcc-4.8-20130321/libstdc++-v3/acinclude.m4 Fri Mar 29 22:30:53 2013
@@ -99,6 +99,13 @@
# Check for C library flavor since GNU/Linux platforms use different
# configuration directories depending on the C library in use.
+ AC_EGREP_CPP([_using_glibc], [
+ #include <features.h>
+ #if __GLIBC__
+ _using_glibc
+ #endif
+ ], glibc=yes, glibc=no)
+
AC_EGREP_CPP([_using_uclibc], [
#include <stdio.h>
#if __UCLIBC__
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/configure gcc-4.8-20130321/libstdc++-v3/configure
--- gcc-4.8-20130321.orig/libstdc++-v3/configure Fri Mar 29 22:23:14 2013
+++ gcc-4.8-20130321/libstdc++-v3/configure Fri Mar 29 22:29:23 2013
@@ -5243,6 +5243,24 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+ #include <features.h>
+ #if __GLIBC__
+ _using_glibc
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "_using_glibc" >/dev/null 2>&1; then :
+ glibc=yes
+else
+ glibc=no
+fi
+rm -f conftest*
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
#include <stdio.h>
#if __UCLIBC__
_using_uclibc
diff -urN gcc-4.8-20130321.orig/libstdc++-v3/configure.host gcc-4.8-20130321/libstdc++-v3/configure.host
--- gcc-4.8-20130321.orig/libstdc++-v3/configure.host Fri Mar 29 22:23:14 2013
+++ gcc-4.8-20130321/libstdc++-v3/configure.host Fri Mar 29 22:36:15 2013
@@ -264,12 +264,14 @@
os_include_dir="os/bsd/freebsd"
;;
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
- if [ "$uclibc" = "yes" ]; then
+ if [ "$glibc" = "yes" ]; then
+ os_include_dir="os/gnu-linux"
+ elif [ "$uclibc" = "yes" ]; then
os_include_dir="os/uclibc"
elif [ "$bionic" = "yes" ]; then
os_include_dir="os/bionic"
else
- os_include_dir="os/gnu-linux"
+ os_include_dir="os/generic"
fi
;;
hpux*)
next prev parent reply other threads:[~2013-03-30 9:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 20:38 Daniel Cegiełka
2013-03-28 23:32 ` John Spencer
2013-03-28 23:46 ` Daniel Cegiełka
2013-03-28 23:58 ` Daniel Cegiełka
2013-03-29 0:07 ` Rich Felker
2013-03-29 9:42 ` Szabolcs Nagy
2013-03-29 0:35 ` John Spencer
2013-03-29 1:39 ` Daniel Cegiełka
2013-03-29 1:56 ` Rich Felker
2013-03-29 11:07 ` Daniel Cegiełka
2013-03-29 11:25 ` Szabolcs Nagy
2013-03-29 14:13 ` Daniel Cegiełka
2013-03-29 15:19 ` Szabolcs Nagy
2013-03-29 15:38 ` Daniel Cegiełka
2013-03-30 9:51 ` Daniel Cegiełka [this message]
2013-03-29 2:10 ` John Spencer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPLrYES+LpZ6u+J7G4ijksSSFVeuxMk5qBmFSz8rt+JxojnTXA@mail.gmail.com \
--to=daniel.cegielka@gmail.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).