mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
0fdb4a458b
This replaces the musl patches for gcc with the versions which are in gcc trunk. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46873
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
--- a/gcc/config/arm/linux-eabi.h
|
|
+++ b/gcc/config/arm/linux-eabi.h
|
|
@@ -131,10 +131,6 @@
|
|
#define ENDFILE_SPEC \
|
|
LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
|
|
|
|
-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
|
|
- do not use -lfloat. */
|
|
-#undef LIBGCC_SPEC
|
|
-
|
|
/* Clear the instruction cache from `beg' to `end'. This is
|
|
implemented in lib1funcs.S, so ensure an error if this definition
|
|
is used. */
|
|
--- a/gcc/config/linux.h
|
|
+++ b/gcc/config/linux.h
|
|
@@ -53,6 +53,10 @@ see the files COPYING3 and COPYING.RUNTI
|
|
builtin_assert ("system=posix"); \
|
|
} while (0)
|
|
|
|
+#ifndef LIBGCC_SPEC
|
|
+#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
|
|
+#endif
|
|
+
|
|
/* Determine which dynamic linker to use depending on whether GLIBC or
|
|
uClibc or Bionic or musl is the default C library and whether
|
|
-muclibc or -mglibc or -mbionic or -mmusl has been passed to change
|
|
--- a/libgcc/mkmap-symver.awk
|
|
+++ b/libgcc/mkmap-symver.awk
|
|
@@ -132,5 +132,5 @@ function output(lib) {
|
|
else if (inherit[lib])
|
|
printf("} %s;\n", inherit[lib]);
|
|
else
|
|
- printf ("\n local:\n\t*;\n};\n");
|
|
+ printf ("\n\t*;\n};\n");
|
|
}
|
|
--- a/gcc/config/rs6000/linux.h
|
|
+++ b/gcc/config/rs6000/linux.h
|
|
@@ -60,6 +60,9 @@
|
|
#undef CPP_OS_DEFAULT_SPEC
|
|
#define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)"
|
|
|
|
+#undef LIBGCC_SPEC
|
|
+#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
|
|
+
|
|
#undef LINK_SHLIB_SPEC
|
|
#define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
|
|
|