diff options
Diffstat (limited to 'Tools/gtk/patches')
15 files changed, 0 insertions, 2583 deletions
diff --git a/Tools/gtk/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch b/Tools/gtk/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch deleted file mode 100644 index b4e0a541d..000000000 --- a/Tools/gtk/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Sun, 22 Apr 2012 21:40:44 +0900 -Subject: [PATCH] C++11 requires a space between literal and identifier - -Reported by Buganini ---- - fontconfig/fontconfig.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index 0e2ca50..b27ccb5 100644 ---- a/fontconfig/fontconfig.h -+++ b/fontconfig/fontconfig.h -@@ -112,9 +112,9 @@ typedef int FcBool; - #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ - #define FC_LCD_FILTER "lcdfilter" /* Int */ - --#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION --#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION --#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION -+#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION -+#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION -+#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ - #define FC_CHAR_WIDTH "charwidth" /* Int */ --- -1.8.3.2 - diff --git a/Tools/gtk/patches/freetype6-2.4.11-truetype-font-height-fix.patch b/Tools/gtk/patches/freetype6-2.4.11-truetype-font-height-fix.patch deleted file mode 100644 index 0ffe76b4e..000000000 --- a/Tools/gtk/patches/freetype6-2.4.11-truetype-font-height-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e0469372be3870a5ad60b2c4586e9c281357bd28 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Tue, 22 Jan 2013 10:07:07 +0000 -Subject: [truetype] Fix font height. - -* src/truetype/ttobjs.c (tt_size_reset): The Windows rendering -engine uses rounded values of the ascender and descender to compute -the TrueType font height. ---- -diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c -index c61b218..590b66c 100644 ---- a/src/truetype/ttobjs.c -+++ b/src/truetype/ttobjs.c -@@ -4,7 +4,7 @@ - /* */ - /* Objects manager (body). */ - /* */ --/* Copyright 1996-2012 */ -+/* Copyright 1996-2013 */ - /* David Turner, Robert Wilhelm, and Werner Lemberg. */ - /* */ - /* This file is part of the FreeType project, and may only be used, */ -@@ -1177,11 +1177,12 @@ - FT_PIX_ROUND( FT_MulFix( face->root.ascender, metrics->y_scale ) ); - metrics->descender = - FT_PIX_ROUND( FT_MulFix( face->root.descender, metrics->y_scale ) ); -- metrics->height = -- FT_PIX_ROUND( FT_MulFix( face->root.height, metrics->y_scale ) ); - metrics->max_advance = - FT_PIX_ROUND( FT_MulFix( face->root.max_advance_width, - metrics->x_scale ) ); -+ -+ /* the height is derived from rounded values */ -+ metrics->height = metrics->ascender - metrics->descender; - } - - /* compute new transformation */ --- -cgit v0.9.0.2 diff --git a/Tools/gtk/patches/glib-warning-fix.patch b/Tools/gtk/patches/glib-warning-fix.patch deleted file mode 100644 index 8faf4d11f..000000000 --- a/Tools/gtk/patches/glib-warning-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9f90ee5eeccd47f39c7a03dcd786b125a19c195d Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@gnome.org> -Date: Sat, 13 Jun 2015 22:52:33 -0500 -Subject: [PATCH] genmarshal: silence register storage class warnings - -Using the register keyword triggers warnings on noteworthy compilers -(clang), since it's deprecated in C++ and at danger of being removed -from the language. There is no reason to use it since it isn't 1980 -anymore. - -https://bugzilla.gnome.org/show_bug.cgi?id=750918 ---- - gobject/glib-genmarshal.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c -index be4151a..ca78a6f 100644 ---- a/gobject/glib-genmarshal.c -+++ b/gobject/glib-genmarshal.c -@@ -412,9 +412,9 @@ generate_marshal (const gchar *signame, - g_fprintf (fout, "%s%s data2);\n", indent (ind), pad ("gpointer")); - - /* cfile marshal variables */ -- g_fprintf (fout, " register GMarshalFunc_%s callback;\n", signame); -- g_fprintf (fout, " register GCClosure *cc = (GCClosure*) closure;\n"); -- g_fprintf (fout, " register gpointer data1, data2;\n"); -+ g_fprintf (fout, " GMarshalFunc_%s callback;\n", signame); -+ g_fprintf (fout, " GCClosure *cc = (GCClosure*) closure;\n"); -+ g_fprintf (fout, " gpointer data1, data2;\n"); - if (sig->rarg->setter) - g_fprintf (fout, " %s v_return;\n", sig->rarg->ctype); - --- -2.4.2
\ No newline at end of file diff --git a/Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch b/Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch deleted file mode 100644 index fb2ab2509..000000000 --- a/Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch +++ /dev/null @@ -1,325 +0,0 @@ -From 13c8517570c3550b5c46a3cb0ff7f8b7888a4ddf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> -Date: Thu, 13 Nov 2014 11:58:07 +0100 -Subject: gl/cocoa: Remove GNUStep support - -Until gcc and GNUStep properly support Objective-C blocks and other -"new" features of Objective-C we can't properly support them without -making the code much more ugly. - -https://bugzilla.gnome.org/show_bug.cgi?id=739152 - -diff --git a/configure.ac b/configure.ac -index fdb6c88..120cd44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -611,7 +611,7 @@ AC_ARG_ENABLE([glx], - esac],[NEED_GLX=auto]) - - AC_ARG_ENABLE([cocoa], -- [ --enable-cocoa Enable Cocoa support (using GNUstep on non OS X platforms) @<:@default=auto@:>@], -+ [ --enable-cocoa Enable Cocoa support @<:@default=auto@:>@], - [case "${enableval}" in - yes) NEED_COCOA=yes ;; - no) NEED_COCOA=no ;; -@@ -653,7 +653,6 @@ save_LIBS="$LIBS" - HAVE_GL=no - HAVE_GLES2=no - HAVE_GLU=no --HAVE_GNUSTEP_COCOA=no - HAVE_WAYLAND_EGL=no - - HAVE_EGL_RPI=no -@@ -744,35 +743,6 @@ case $host in - ;; - esac - --case $host in -- *-darwin* ) ;; -- *) -- AC_PATH_PROG([GNUSTEP_CONFIG],[gnustep-config]) -- if test "x$GNUSTEP_CONFIG" != "x"; then -- GNUSTEP_HOST="`$GNUSTEP_CONFIG --variable=GNUSTEP_HOST`" -- case $host in -- *-mingw* ) -- case $GNUSTEP_HOST in -- *-mingw* ) -- HAVE_GNUSTEP_COCOA=yes -- ;; -- esac -- ;; -- * ) -- HAVE_GNUSTEP_COCOA=yes -- ;; -- esac -- fi -- ;; --esac -- --AC_MSG_CHECKING([for GNUstep]) --if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([no]) --fi -- - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" - -@@ -1009,19 +979,6 @@ case $host in - fi - fi - fi -- -- dnl GNUstep provides the Cocoa API on unix -- if test "x$NEED_COCOA" != "xno"; then -- if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then -- GNUSTEP_OBJCFLAGS="`$GNUSTEP_CONFIG --objc-flags`" -- GNUSTEP_LIBS="`$GNUSTEP_CONFIG --gui-libs`" -- GL_LIBS="$GL_LIBS $GNUSTEP_LIBS -lgnustep-gui -lgnustep-base" -- GL_OBJCFLAGS="$GL_OBJCFLAGS $GNUSTEP_OBJCFLAGS" -- -- USE_COCOA=yes -- HAVE_WINDOW_COCOA=yes -- fi -- fi - ;; - *-darwin*) - if test "x$HAVE_IOS" = "xyes"; then -@@ -1114,17 +1071,6 @@ case $host in - fi - fi - fi -- -- dnl GNUstep provides the Cocoa API on win32 -- if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then -- GNUSTEP_CFLAGS="`$GNUSTEP_CONFIG --objc-flags`" -- GNUSTEP_LIBS="`$GNUSTEP_CONFIG --gui-libs`" -- GL_LIBS="$GL_LIBS $GNUSTEP_LIBS -lgnustep-gui -lgnustep-base" -- GL_OBJCFLAGS="$OBJCFLAGS $GNUSTEP_CFLAGS" -- -- USE_COCOA=yes -- HAVE_WINDOW_COCOA=yes -- fi - ;; - *) - AC_MSG_WARN([Don't know how to check for OpenGL on your platform.]) -diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m -index 94da0bc..84e3a99 100644 ---- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m -+++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m -@@ -40,7 +40,6 @@ static GstGLPlatform gst_gl_context_cocoa_get_gl_platform (GstGLContext * contex - - G_DEFINE_TYPE (GstGLContextCocoa, gst_gl_context_cocoa, GST_GL_TYPE_CONTEXT); - --#ifndef GNUSTEP - static GMutex nsapp_lock; - static GCond nsapp_cond; - -@@ -96,16 +95,12 @@ gst_gl_window_cocoa_nsapp_iteration (gpointer data) - - return TRUE; - } --#endif - - static void - gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass) - { - GstGLContextClass *context_class = (GstGLContextClass *) klass; -- --#ifndef GNUSTEP - NSAutoreleasePool* pool = nil; --#endif - - g_type_class_add_private (klass, sizeof (GstGLContextCocoaPrivate)); - -@@ -121,7 +116,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass) - context_class->get_gl_platform = - GST_DEBUG_FUNCPTR (gst_gl_context_cocoa_get_gl_platform); - --#ifndef GNUSTEP - pool = [[NSAutoreleasePool alloc] init]; - - /* [NSApplication sharedApplication] will usually be -@@ -191,7 +185,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass) - } - - [pool release]; --#endif - } - - static void -@@ -219,9 +212,7 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api, - GstGLWindowCocoa *window_cocoa = GST_GL_WINDOW_COCOA (window); - __block NSOpenGLContext *glContext = nil; - --#ifndef GNUSTEP - priv->source_id = g_timeout_add (200, gst_gl_window_cocoa_nsapp_iteration, NULL); --#endif - - priv->gl_context = nil; - if (other_context) -@@ -243,9 +234,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api, - - pool = [[NSAutoreleasePool alloc] init]; - --#ifdef GNUSTEP -- [NSApplication sharedApplication]; --#endif - rect.origin.x = 0; - rect.origin.y = 0; - rect.size.width = 320; -@@ -265,7 +253,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api, - - [window_handle setContentView:glView]; - --#ifndef GNUSTEP - glContext = [[NSOpenGLContext alloc] initWithFormat:fmt - shareContext:context_cocoa->priv->external_gl_context]; - -@@ -275,10 +262,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api, - - [glContext setView:glView]; - --#else -- /* FIXME try to make context sharing work in GNUstep */ -- context_cocoa->priv->gl_context = glContext; --#endif - [pool release]; - }); - -@@ -300,11 +283,7 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api, - */ - NS_DURING { - if (glContext) { --#ifdef GNUSTEP -- const long swapInterval = 1; --#else - const GLint swapInterval = 1; --#endif - [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; - } - } NS_HANDLER { -diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m -index 0771662..d776477 100644 ---- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m -+++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m -@@ -257,11 +257,9 @@ draw_cb (gpointer data) - x += 20; - y += 20; - --#ifndef GNUSTEP - [priv->internal_win_id setFrame:windowRect display:NO]; - GST_DEBUG ("make the window available\n"); - [priv->internal_win_id makeMainWindow]; --#endif - - [priv->internal_win_id orderFrontRegardless]; - -@@ -457,17 +455,6 @@ close_window_cb (gpointer data) - } - - - (void) applicationWillTerminate:(NSNotification *)aNotification { --#ifdef GNUSTEP -- /* fixes segfault with gst-launch-1.0 -e ... and sending SIGINT (Ctrl-C) -- * which causes GNUstep to run a signal handler in the main thread. -- * However that thread has never been 'registered' with GNUstep so -- * the autorelease magic of objective-c causes a segfault from accessing -- * a null NSThread object somewhere deep in GNUstep. -- * -- * I put it here because this is the first time we can register the thread. -- */ -- GSRegisterCurrentThread(); --#endif - } - - @end -@@ -488,9 +475,7 @@ close_window_cb (gpointer data) - - window_cocoa = window; - --#ifndef GNUSTEP - [self setWantsLayer:NO]; --#endif - - /* Get notified about changes */ - [self setPostsFrameChangedNotifications:YES]; -diff --git a/tests/examples/gl/cocoa/cocoa-videooverlay.m b/tests/examples/gl/cocoa/cocoa-videooverlay.m -index 683abe1..9c5fc9a 100755 ---- a/tests/examples/gl/cocoa/cocoa-videooverlay.m -+++ b/tests/examples/gl/cocoa/cocoa-videooverlay.m -@@ -136,15 +136,8 @@ static void end_stream_cb(GstBus* bus, GstMessage* message, MainWindow* window) - - static gpointer thread_func (MainWindow* window) - { --#ifdef GNUSTEP -- GSRegisterCurrentThread(); --#endif -- - g_main_loop_run ([window loop]); - --#ifdef GNUSTEP -- GSUnregisterCurrentThread(); --#endif - return NULL; - } - -@@ -172,10 +165,6 @@ int main(int argc, char **argv) - NSAutoreleasePool *pool=nil; - NSRect rect; - MainWindow *window=nil; -- --#ifdef GNUSTEP -- GstState state; --#endif - - g_print("app created\n"); - -@@ -203,18 +192,8 @@ int main(int argc, char **argv) - if (!ok) - g_warning("could not link videosrc to videosink\n"); - --#ifdef GNUSTEP -- gst_element_set_state (pipeline, GST_STATE_PAUSED); -- state = GST_STATE_PAUSED; -- gst_element_get_state (pipeline, &state, &state, GST_CLOCK_TIME_NONE); -- g_print("pipeline paused\n"); -- GSRegisterCurrentThread(); --#endif -- - pool = [[NSAutoreleasePool alloc] init]; --#ifndef GNUSTEP - [NSApplication sharedApplication]; --#endif - - rect.origin.x = 0; rect.origin.y = 0; - rect.size.width = width; rect.size.height = height; -@@ -236,7 +215,6 @@ int main(int argc, char **argv) - - [window orderFront:window]; - --#ifndef GNUSTEP - while (![window isClosed]) { - NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask - untilDate:[NSDate dateWithTimeIntervalSinceNow:1] -@@ -244,7 +222,6 @@ int main(int argc, char **argv) - if (event) - [NSApp sendEvent:event]; - } --#endif - - g_thread_join (loop_thread); - -@@ -252,9 +229,5 @@ int main(int argc, char **argv) - - [pool release]; - --#ifdef GNUSTEP -- GSUnregisterCurrentThread(); --#endif -- - return 0; - } --- -2.0.0.rc2 - diff --git a/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch b/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch deleted file mode 100644 index e3ddb7238..000000000 --- a/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Tue, 7 Apr 2015 16:43:59 +0100 -Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum - -and in docs. Spotted by Rob Swain. ---- - gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h -index b5ff4a1..47378cf 100644 ---- a/gst-libs/gst/rtp/gstrtcpbuffer.h -+++ b/gst-libs/gst/rtp/gstrtcpbuffer.h -@@ -59,6 +59,9 @@ typedef enum - GST_RTCP_TYPE_PSFB = 206 - } GstRTCPType; - -+/* FIXME 2.0: backwards compatibility define for enum typo */ -+#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ -+ - /** - * GstRTCPFBType: - * @GST_RTCP_FB_TYPE_INVALID: Invalid type -@@ -66,7 +69,7 @@ typedef enum - * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request - * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate - * Notification -- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early -+ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early - * synchronization - * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication - * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication -@@ -89,7 +92,7 @@ typedef enum - GST_RTCP_RTPFB_TYPE_TMMBR = 3, - GST_RTCP_RTPFB_TYPE_TMMBN = 4, - /* RTPFB types assigned in RFC 6051 */ -- GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5, -+ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5, - /* PSFB types */ - GST_RTCP_PSFB_TYPE_PLI = 1, - GST_RTCP_PSFB_TYPE_SLI = 2, --- -2.1.4 - diff --git a/Tools/gtk/patches/librsvg-2.36.1-bump-up-config.guess-to-support-aarch64.patch b/Tools/gtk/patches/librsvg-2.36.1-bump-up-config.guess-to-support-aarch64.patch deleted file mode 100644 index a20af4ce1..000000000 --- a/Tools/gtk/patches/librsvg-2.36.1-bump-up-config.guess-to-support-aarch64.patch +++ /dev/null @@ -1,1581 +0,0 @@ -diff -ur librsvg-2.36.1-orig/config.guess librsvg-2.36.1/config.guess ---- librsvg-2.36.1-orig/config.guess 2012-02-03 13:14:58.000000000 +0100 -+++ librsvg-2.36.1/config.guess 2014-09-25 18:36:54.000000000 +0200 -@@ -1,14 +1,12 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -+# Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2014-03-23' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +15,22 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see <http://www.gnu.org/licenses/>. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to <config-patches@gnu.org> and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,8 +50,7 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright 1992-2014 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -139,12 +132,33 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+case "${UNAME_SYSTEM}" in -+Linux|GNU|GNU/*) -+ # If the system lacks a compiler, then just pick glibc. -+ # We could probably try harder. -+ LIBC=gnu -+ -+ eval $set_cc_for_build -+ cat <<-EOF > $dummy.c -+ #include <features.h> -+ #if defined(__UCLIBC__) -+ LIBC=uclibc -+ #elif defined(__dietlibc__) -+ LIBC=dietlibc -+ #else -+ LIBC=gnu -+ #endif -+ EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` -+ ;; -+esac -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -180,7 +194,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +215,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -223,7 +241,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +287,10 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -295,12 +316,12 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -394,23 +415,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -480,8 +501,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -494,7 +515,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -551,7 +572,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -594,52 +615,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include <stdlib.h> -+ #include <unistd.h> -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- #define _HPUX_SOURCE -- #include <stdlib.h> -- #include <unistd.h> -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -730,22 +751,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -769,14 +790,14 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -788,30 +809,35 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ *:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -848,15 +874,22 @@ - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -866,52 +899,56 @@ - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ arc:Linux:*:* | arceb:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) -- LIBC=gnu -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build -@@ -930,51 +967,63 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -- or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ openrisc*:Linux:*:*) -+ echo or1k-unknown-linux-${LIBC} -+ exit ;; -+ or32:Linux:*:* | or1k*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) -- echo sparc-unknown-linux-gnu -+ echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} -+ exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-${LIBC} -+ exit ;; -+ ppcle:Linux:*:*) -+ echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux -+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-gnu -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -983,11 +1032,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1019,7 +1068,7 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1047,13 +1096,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1088,8 +1137,8 @@ - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1132,10 +1181,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says <Richard.M.Bartel@ccMail.Census.GOV> -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says <Richard.M.Bartel@ccMail.Census.GOV> -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm -@@ -1161,11 +1210,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1178,6 +1227,9 @@ - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1204,19 +1256,31 @@ - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -- i386) -- eval $set_cc_for_build -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -- grep IS_64BIT_ARCH >/dev/null -- then -- UNAME_PROCESSOR="x86_64" -- fi -- fi ;; -- unknown) UNAME_PROCESSOR=powerpc ;; -- esac -+ eval $set_cc_for_build -+ if test "$UNAME_PROCESSOR" = unknown ; then -+ UNAME_PROCESSOR=powerpc -+ fi -+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac -+ fi -+ fi -+ elif test "$UNAME_PROCESSOR" = i386 ; then -+ # Avoid executing cc on OS X 10.9, as it ships with a stub -+ # that puts up a graphical alert prompting to install -+ # developer tools. Any system running Mac OS X 10.7 or -+ # later (Darwin 11 and later) is required to have a 64-bit -+ # processor. This is not true of the ARM version of Darwin -+ # that Apple uses in portable devices. -+ UNAME_PROCESSOR=x86_64 -+ fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1230,7 +1294,10 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1275,13 +1342,13 @@ - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1299,158 +1366,10 @@ - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; --esac -- --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- --eval $set_cc_for_build --cat >$dummy.c <<EOF --#ifdef _SEQUENT_ --# include <sys/types.h> --# include <sys/utsname.h> --#endif --main () --{ --#if defined (sony) --#if defined (MIPSEB) -- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, -- I don't know.... */ -- printf ("mips-sony-bsd\n"); exit (0); --#else --#include <sys/param.h> -- printf ("m68k-sony-newsos%s\n", --#ifdef NEWSOS4 -- "4" --#else -- "" --#endif -- ); exit (0); --#endif --#endif -- --#if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix\n"); exit (0); --#endif -- --#if defined (hp300) && !defined (hpux) -- printf ("m68k-hp-bsd\n"); exit (0); --#endif -- --#if defined (NeXT) --#if !defined (__ARCHITECTURE__) --#define __ARCHITECTURE__ "m68k" --#endif -- int version; -- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; -- if (version < 4) -- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); -- else -- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); -- exit (0); --#endif -- --#if defined (MULTIMAX) || defined (n16) --#if defined (UMAXV) -- printf ("ns32k-encore-sysv\n"); exit (0); --#else --#if defined (CMU) -- printf ("ns32k-encore-mach\n"); exit (0); --#else -- printf ("ns32k-encore-bsd\n"); exit (0); --#endif --#endif --#endif -- --#if defined (__386BSD__) -- printf ("i386-pc-bsd\n"); exit (0); --#endif -- --#if defined (sequent) --#if defined (i386) -- printf ("i386-sequent-dynix\n"); exit (0); --#endif --#if defined (ns32000) -- printf ("ns32k-sequent-dynix\n"); exit (0); --#endif --#endif -- --#if defined (_SEQUENT_) -- struct utsname un; -- -- uname(&un); -- -- if (strncmp(un.version, "V2", 2) == 0) { -- printf ("i386-sequent-ptx2\n"); exit (0); -- } -- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ -- printf ("i386-sequent-ptx1\n"); exit (0); -- } -- printf ("i386-sequent-ptx\n"); exit (0); -- --#endif -- --#if defined (vax) --# if !defined (ultrix) --# include <sys/param.h> --# if defined (BSD) --# if BSD == 43 -- printf ("vax-dec-bsd4.3\n"); exit (0); --# else --# if BSD == 199006 -- printf ("vax-dec-bsd4.3reno\n"); exit (0); --# else -- printf ("vax-dec-bsd\n"); exit (0); --# endif --# endif --# else -- printf ("vax-dec-bsd\n"); exit (0); --# endif --# else -- printf ("vax-dec-ultrix\n"); exit (0); --# endif --#endif -- --#if defined (alliant) && defined (i860) -- printf ("i860-alliant-bsd\n"); exit (0); --#endif -- -- exit (1); --} --EOF -- --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -- { echo "$SYSTEM_NAME"; exit; } -- --# Apollos put the system type in the environment. -- --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } -- --# Convex versions that predate uname can use getsysinfo(1) -- --if [ -x /usr/convex/getsysinfo ] --then -- case `getsysinfo -f cpu_type` in -- c1*) -- echo c1-convex-bsd -- exit ;; -- c2*) -- if getsysinfo -f scalar_acc -- then echo c32-convex-bsd -- else echo c2-convex-bsd -- fi -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx - exit ;; -- c34*) -- echo c34-convex-bsd -- exit ;; -- c38*) -- echo c38-convex-bsd -- exit ;; -- c4*) -- echo c4-convex-bsd -- exit ;; -- esac --fi -+esac - - cat >&2 <<EOF - $0: unable to guess system type -diff -ur librsvg-2.36.1-orig/config.sub librsvg-2.36.1/config.sub ---- librsvg-2.36.1-orig/config.sub 2012-02-03 13:14:58.000000000 +0100 -+++ librsvg-2.36.1/config.sub 2014-09-25 18:37:12.000000000 +0200 -@@ -1,38 +1,31 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -- --timestamp='2009-11-20' -- --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# This file is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# Copyright 1992-2014 Free Software Foundation, Inc. -+ -+timestamp='2014-09-11' -+ -+# This file is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see <http://www.gnu.org/licenses/>. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to <config-patches@gnu.org>. Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -75,8 +68,7 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright 1992-2014 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -123,13 +115,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -152,12 +149,12 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -173,10 +170,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -221,6 +218,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -245,20 +248,28 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arceb \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -+ | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ -- | c4x | clipper \ -+ | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | k1om \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -272,38 +283,51 @@ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ -- | nios | nios2 \ -+ | nds32 | nds32le | nds32be \ -+ | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ -- | or32 \ -+ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | riscv32 | riscv64 \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -313,6 +337,21 @@ - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -327,25 +366,31 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | craynv-* | cydra-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | k1om-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -359,33 +404,41 @@ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ -- | nios-* | nios2-* \ -+ | nds32-* | nds32le-* | nds32be-* \ -+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ -+ | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -410,7 +463,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -480,11 +533,20 @@ - basic_machine=powerpc-ibm - os=-cnk - ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -516,7 +578,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -674,7 +736,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -732,11 +793,15 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) -- basic_machine=i386-pc -+ basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) -@@ -764,6 +829,10 @@ - basic_machine=powerpc-unknown - os=-morphos - ;; -+ moxiebox) -+ basic_machine=moxie-unknown -+ os=-moxiebox -+ ;; - msdos) - basic_machine=i386-pc - os=-msdos -@@ -771,10 +840,18 @@ - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i686-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -839,6 +916,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -921,9 +1004,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -948,7 +1032,11 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -- rdos) -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ os=-rdos -+ ;; -+ rdos32) - basic_machine=i386-pc - os=-rdos - ;; -@@ -1017,6 +1105,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1073,20 +1164,8 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1156,6 +1235,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1253,11 +1335,11 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1281,28 +1363,29 @@ - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -- | -sym* | -kopensolaris* \ -+ | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -- | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1341,7 +1424,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1390,7 +1473,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1426,15 +1509,14 @@ - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1457,10 +1539,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1472,8 +1554,23 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ c8051-*) -+ os=-elf -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1493,14 +1590,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1527,7 +1621,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) diff --git a/Tools/gtk/patches/llvm-elf-add-stackmaps-arm64.patch b/Tools/gtk/patches/llvm-elf-add-stackmaps-arm64.patch deleted file mode 100644 index caa8c1f1b..000000000 --- a/Tools/gtk/patches/llvm-elf-add-stackmaps-arm64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/Target/AArch64/AArch64AsmPrinter.cpp b/lib/Target/AArch64/AArch64AsmPrinter.cpp -index 8bee4f5..bfbbaac 100644 ---- a/lib/Target/AArch64/AArch64AsmPrinter.cpp -+++ b/lib/Target/AArch64/AArch64AsmPrinter.cpp -@@ -154,6 +154,8 @@ void AArch64AsmPrinter::EmitEndOfAsmFile(Module &M) { - } - Stubs.clear(); - } -+ -+ SM.serializeToStackMapSection(); - } - - } diff --git a/Tools/gtk/patches/llvm-elf-add-stackmaps.patch b/Tools/gtk/patches/llvm-elf-add-stackmaps.patch deleted file mode 100644 index 877214d97..000000000 --- a/Tools/gtk/patches/llvm-elf-add-stackmaps.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit ec9de4677ac61f2164d7c80cae5da0008189efa3 -Author: Philip Reames <listmail@philipreames.com> -Date: Fri Aug 1 18:47:09 2014 +0000 - - Add support for StackMap section for ELF/Linux systems - - This patch adds code to emits the StackMap section on ELF systems. This section is required to support llvm.experimental.stackmap and llvm.experimental.patchpoint intrinsics. - - Reviewers: ributzka, echristo - - Differential Revision: http://reviews.llvm.org/D4574 - - - - git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214538 91177308-0d34-0410-b5e6-96231b3b80d8 - -diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp -index df5787c..da707d8 100644 ---- a/lib/MC/MCObjectFileInfo.cpp -+++ b/lib/MC/MCObjectFileInfo.cpp -@@ -583,6 +583,12 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { - DwarfAddrSection = - Ctx->getELFSection(".debug_addr", ELF::SHT_PROGBITS, 0, - SectionKind::getMetadata()); -+ -+ StackMapSection = -+ Ctx->getELFSection(".llvm_stackmaps", ELF::SHT_PROGBITS, -+ ELF::SHF_ALLOC, -+ SectionKind::getMetadata()); -+ - } - - -diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp -index 3c22e88..fc0d408 100644 ---- a/lib/Target/X86/X86AsmPrinter.cpp -+++ b/lib/Target/X86/X86AsmPrinter.cpp -@@ -736,6 +736,8 @@ void X86AsmPrinter::EmitEndOfAsmFile(Module &M) { - } - Stubs.clear(); - } -+ -+ SM.serializeToStackMapSection(); - } - } - diff --git a/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch b/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch deleted file mode 100644 index be4412adf..000000000 --- a/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch +++ /dev/null @@ -1,23 +0,0 @@ - -diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp -index 7886ab6..96929e5 100644 ---- a/lib/MC/MCObjectFileInfo.cpp -+++ b/lib/MC/MCObjectFileInfo.cpp -@@ -284,6 +284,17 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { - ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr; - } - break; -+ case Triple::aarch64: -+ if (RelocM == Reloc::PIC_) { -+ FDECFIEncoding = dwarf::DW_EH_PE_pcrel | -+ ((CMModel == CodeModel::Small || CMModel == CodeModel::Medium) -+ ? dwarf::DW_EH_PE_sdata4 : dwarf::DW_EH_PE_sdata8); -+ } else { -+ FDECFIEncoding = -+ (CMModel == CodeModel::Small || CMModel == CodeModel::Medium) -+ ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr; -+ } -+ break; - default: - FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4; - break; diff --git a/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range.patch b/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range.patch deleted file mode 100644 index 63004eb1f..000000000 --- a/Tools/gtk/patches/llvm-elf-allow-fde-references-outside-the-2gb-range.patch +++ /dev/null @@ -1,281 +0,0 @@ -commit 21bcdeb1d65b4be0d716693f3dcabd2e8a7c6386 -Author: Joerg Sonnenberger <joerg@bec.de> -Date: Tue Nov 25 13:37:55 2014 +0000 - - Reapply 222538 and update tests to explicitly request small code model - and PIC: - - Allow FDE references outside the +/-2GB range supported by PC relative - offsets for code models other than small/medium. For JIT application, - memory layout is less controlled and can result in truncations - otherwise. - - Patch from Akos Kiss. - - Differential Revision: http://reviews.llvm.org/D6079 - - - git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222760 91177308-0d34-0410-b5e6-96231b3b80d8 - -diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp -index 7886ab6..96929e5 100644 ---- a/lib/MC/MCObjectFileInfo.cpp -+++ b/lib/MC/MCObjectFileInfo.cpp -@@ -273,6 +273,17 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { - case Triple::mips64el: - FDECFIEncoding = dwarf::DW_EH_PE_sdata8; - break; -+ case Triple::x86_64: -+ if (RelocM == Reloc::PIC_) { -+ FDECFIEncoding = dwarf::DW_EH_PE_pcrel | -+ ((CMModel == CodeModel::Small || CMModel == CodeModel::Medium) -+ ? dwarf::DW_EH_PE_sdata4 : dwarf::DW_EH_PE_sdata8); -+ } else { -+ FDECFIEncoding = -+ (CMModel == CodeModel::Small || CMModel == CodeModel::Medium) -+ ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr; -+ } -+ break; - default: - FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4; - break; -diff --git a/test/MC/ELF/cfi-adjust-cfa-offset.s b/test/MC/ELF/cfi-adjust-cfa-offset.s -index 9d639f7..f31a6b0 100644 ---- a/test/MC/ELF/cfi-adjust-cfa-offset.s -+++ b/test/MC/ELF/cfi-adjust-cfa-offset.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-advance-loc2.s b/test/MC/ELF/cfi-advance-loc2.s -index 98caa018..c11ccaf 100644 ---- a/test/MC/ELF/cfi-advance-loc2.s -+++ b/test/MC/ELF/cfi-advance-loc2.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - // test that this produces a correctly encoded cfi_advance_loc2 - -diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s -index 59f7400..93158ce 100644 ---- a/test/MC/ELF/cfi-def-cfa-offset.s -+++ b/test/MC/ELF/cfi-def-cfa-offset.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-def-cfa-register.s b/test/MC/ELF/cfi-def-cfa-register.s -index 178ba32..8c55053 100644 ---- a/test/MC/ELF/cfi-def-cfa-register.s -+++ b/test/MC/ELF/cfi-def-cfa-register.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-def-cfa.s b/test/MC/ELF/cfi-def-cfa.s -index dfb0d4b..f0b4934 100644 ---- a/test/MC/ELF/cfi-def-cfa.s -+++ b/test/MC/ELF/cfi-def-cfa.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-escape.s b/test/MC/ELF/cfi-escape.s -index 5394ee4..3b76746 100644 ---- a/test/MC/ELF/cfi-escape.s -+++ b/test/MC/ELF/cfi-escape.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s -index a65b4fc..02f31ba 100644 ---- a/test/MC/ELF/cfi-offset.s -+++ b/test/MC/ELF/cfi-offset.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-register.s b/test/MC/ELF/cfi-register.s -index 9441770..3433bef 100644 ---- a/test/MC/ELF/cfi-register.s -+++ b/test/MC/ELF/cfi-register.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-rel-offset.s b/test/MC/ELF/cfi-rel-offset.s -index 0dc69c8..f51b2d3 100644 ---- a/test/MC/ELF/cfi-rel-offset.s -+++ b/test/MC/ELF/cfi-rel-offset.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-rel-offset2.s b/test/MC/ELF/cfi-rel-offset2.s -index 360e7b0..0ce8d03 100644 ---- a/test/MC/ELF/cfi-rel-offset2.s -+++ b/test/MC/ELF/cfi-rel-offset2.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s -index 3a38948..c98695a 100644 ---- a/test/MC/ELF/cfi-remember.s -+++ b/test/MC/ELF/cfi-remember.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-restore.s b/test/MC/ELF/cfi-restore.s -index e225797..99a74e7 100644 ---- a/test/MC/ELF/cfi-restore.s -+++ b/test/MC/ELF/cfi-restore.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-same-value.s b/test/MC/ELF/cfi-same-value.s -index 2d37f4d..b7329d1 100644 ---- a/test/MC/ELF/cfi-same-value.s -+++ b/test/MC/ELF/cfi-same-value.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-signal-frame.s b/test/MC/ELF/cfi-signal-frame.s -index 98deb0a..9558d7b 100644 ---- a/test/MC/ELF/cfi-signal-frame.s -+++ b/test/MC/ELF/cfi-signal-frame.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-undefined.s b/test/MC/ELF/cfi-undefined.s -index 568b315..09000c9 100644 ---- a/test/MC/ELF/cfi-undefined.s -+++ b/test/MC/ELF/cfi-undefined.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f: - .cfi_startproc -diff --git a/test/MC/ELF/cfi-window-save.s b/test/MC/ELF/cfi-window-save.s -index b083901..dd20164 100644 ---- a/test/MC/ELF/cfi-window-save.s -+++ b/test/MC/ELF/cfi-window-save.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - # Should use SPARC as the target to test this. However, SPARC does not - # use MC yet. -diff --git a/test/MC/ELF/cfi-zero-addr-delta.s b/test/MC/ELF/cfi-zero-addr-delta.s -index 8662839..61118ec 100644 ---- a/test/MC/ELF/cfi-zero-addr-delta.s -+++ b/test/MC/ELF/cfi-zero-addr-delta.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - // Test that we don't produce a DW_CFA_advance_loc 0 - -diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s -index 21be615..42b0189 100644 ---- a/test/MC/ELF/cfi.s -+++ b/test/MC/ELF/cfi.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s -+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -s -sr -sd | FileCheck %s - - f1: - .cfi_startproc -diff --git a/test/MC/ELF/pr19430.s b/test/MC/ELF/pr19430.s -index a1e5246..528193d 100644 ---- a/test/MC/ELF/pr19430.s -+++ b/test/MC/ELF/pr19430.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o - | llvm-readobj -r | FileCheck %s -+// RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o - \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-readobj -r | FileCheck %s - - // Test that we can use .cfi_startproc without a global symbol. - -diff --git a/test/MC/X86/fde-reloc.s b/test/MC/X86/fde-reloc.s -index 63ac976..9b5de15 100644 ---- a/test/MC/X86/fde-reloc.s -+++ b/test/MC/X86/fde-reloc.s -@@ -1,4 +1,6 @@ --// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-objdump -r - | FileCheck --check-prefix=X86-64 %s -+// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux \ -+// RUN: -relocation-model=pic -code-model=small \ -+// RUN: | llvm-objdump -r - | FileCheck --check-prefix=X86-64 %s - // RUN: llvm-mc -filetype=obj %s -o - -triple i686-pc-linux | llvm-objdump -r - | FileCheck --check-prefix=I686 %s - - // PR15448 diff --git a/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch b/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch deleted file mode 100644 index 75f38e552..000000000 --- a/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001 -From: Aaron Watry <awatry@gmail.com> -Date: Fri, 20 Jun 2014 19:13:30 -0500 -Subject: [PATCH] gallivm: Fix build after LLVM commit 211259 - -Signed-off-by: Aaron Watry <awatry@gmail.com> -Reviewed-by: Tom Stellard <thomas.stellard@amd.com> ---- - src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index df26883..413a0c2 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -51,7 +51,9 @@ - #include <llvm/MC/MCInstPrinter.h> - #include <llvm/MC/MCRegisterInfo.h> - --#if HAVE_LLVM >= 0x0303 -+#if HAVE_LLVM >= 0x0305 -+#define OwningPtr std::unique_ptr -+#elif HAVE_LLVM >= 0x0303 - #include <llvm/ADT/OwningPtr.h> - #endif - --- -2.1.0 - diff --git a/Tools/gtk/patches/rtspsrc-timeout-on-udpsrc-is-in-nanoseconds.patch b/Tools/gtk/patches/rtspsrc-timeout-on-udpsrc-is-in-nanoseconds.patch deleted file mode 100644 index 87ed49087..000000000 --- a/Tools/gtk/patches/rtspsrc-timeout-on-udpsrc-is-in-nanoseconds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e0bb1fe30985aa0784825388500cc4fa92c1ff9c Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wim.taymans@collabora.co.uk> -Date: Wed, 12 Dec 2012 11:09:42 +0100 -Subject: [PATCH 2/2] rtspsrc: timeout on udpsrc is in nanoseconds - ---- - gst/rtsp/gstrtspsrc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c -index 98577b8..902d8ff 100644 ---- a/gst/rtsp/gstrtspsrc.c -+++ b/gst/rtsp/gstrtspsrc.c -@@ -2812,8 +2812,8 @@ gst_rtspsrc_stream_configure_udp (GstRTSPSrc * src, GstRTSPStream * stream, - /* configure a timeout on the UDP port. When the timeout message is - * posted, we assume UDP transport is not possible. We reconnect using TCP - * if we can. */ -- g_object_set (G_OBJECT (stream->udpsrc[0]), "timeout", src->udp_timeout, -- NULL); -+ g_object_set (G_OBJECT (stream->udpsrc[0]), "timeout", -+ src->udp_timeout * 1000, NULL); - - /* get output pad of the UDP source. */ - *outpad = gst_element_get_static_pad (stream->udpsrc[0], "src"); --- -1.8.1.2 - diff --git a/Tools/gtk/patches/udpsrc-improve-timeouts.patch b/Tools/gtk/patches/udpsrc-improve-timeouts.patch deleted file mode 100644 index d26e346a8..000000000 --- a/Tools/gtk/patches/udpsrc-improve-timeouts.patch +++ /dev/null @@ -1,53 +0,0 @@ -From dbbdf54778771535dfea5ddbdeeaba89d9bc7be6 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wim.taymans@collabora.co.uk> -Date: Wed, 12 Dec 2012 11:08:13 +0100 -Subject: [PATCH 1/2] udpsrc: improve timeouts - -Make it possible to set the timeout after we went to the READY state by using -the timeout when checking the condition. This also makes it possible to set the -timeout with a higher granularity than seconds. ---- - gst/udp/gstudpsrc.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c -index bdad5b3..5b54021 100644 ---- a/gst/udp/gstudpsrc.c -+++ b/gst/udp/gstudpsrc.c -@@ -397,13 +397,20 @@ retry: - goto no_select; - - do { -+ gint64 timeout; -+ - try_again = FALSE; - -+ if (udpsrc->timeout) -+ timeout = udpsrc->timeout / 1000; -+ else -+ timeout = -1; -+ - GST_LOG_OBJECT (udpsrc, "doing select, timeout %" G_GUINT64_FORMAT, -- udpsrc->timeout); -+ timeout); - -- if (!g_socket_condition_wait (udpsrc->used_socket, G_IO_IN | G_IO_PRI, -- udpsrc->cancellable, &err)) { -+ if (!g_socket_condition_timed_wait (udpsrc->used_socket, G_IO_IN | G_IO_PRI, -+ timeout, udpsrc->cancellable, &err)) { - if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_BUSY) - || g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - goto stopped; -@@ -823,9 +830,6 @@ gst_udpsrc_start (GstBaseSrc * bsrc) - goto getsockname_error; - } - -- if (src->timeout) -- g_socket_set_timeout (src->used_socket, src->timeout / GST_SECOND); -- - #if GLIB_CHECK_VERSION (2, 35, 7) - { - gint val = 0; --- -1.8.1.2 - diff --git a/Tools/gtk/patches/xserver-fix-glx-init.patch b/Tools/gtk/patches/xserver-fix-glx-init.patch deleted file mode 100644 index 2dc965bbe..000000000 --- a/Tools/gtk/patches/xserver-fix-glx-init.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/mi/miinitext.c b/mi/miinitext.c -index 6ceae05..cda4e43 100644 ---- a/mi/miinitext.c -+++ b/mi/miinitext.c -@@ -540,6 +540,9 @@ static ExtensionModule staticExtensions[] = { - #ifdef DAMAGE - {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL}, - #endif -+#ifdef GLXEXT -+ {GlxExtensionInit, "GLX", &noGlxExtension, NULL}, -+#endif - {NULL, NULL, NULL, NULL, NULL} - }; - diff --git a/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch b/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch deleted file mode 100644 index 97b1a1314..000000000 --- a/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 879f42531ff04be578c39f9d44548aeb3ded67fd Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gustavo.noronha@collabora.com> -Date: Wed, 8 May 2013 19:44:15 -0300 -Subject: [PATCH 2/2] Filter out -l parameters when setting dependencies - -Newer make (Fedora 19) gets confused when it finds a -l parameter in a -dependency, and tries to make it as a target, causing the build to fail. - -Signed-off-by: Gustavo Noronha Silva <gustavo.noronha@collabora.com> ---- - hw/vfb/Makefile.am | 2 +- - test/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am -index 9f4992c..06830ae 100644 ---- a/hw/vfb/Makefile.am -+++ b/hw/vfb/Makefile.am -@@ -25,7 +25,7 @@ XVFB_LIBS = \ - $(XSERVER_LIBS) - - Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) --Xvfb_DEPENDENCIES = $(XVFB_LIBS) -+Xvfb_DEPENDENCIES = $(filter-out -l%,$(XVFB_LIBS)) - Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - - relink: -diff --git a/test/Makefile.am b/test/Makefile.am -index 34f53fc..3509306 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -117,7 +117,7 @@ libxservertest_la_LIBADD += \ - endif - endif - --libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) -+libxservertest_la_DEPENDENCIES = $(filter-out -l%,$(libxservertest_la_LIBADD)) - endif - - EXTRA_DIST = ddxstubs.c --- -1.8.2.1 - |