From: Mauricio Faria de Oliveira <[email protected]> This affects ppc64el architecture, and the option that causes it to fail is actually a powerpc flag.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93631 Signed-off-by: Fernando Seiti Furusato <[email protected]> --- Imake.tmpl | 2 ++ linux.cf | 1 + 2 files changed, 3 insertions(+) diff --git a/Imake.tmpl b/Imake.tmpl index 9d02cb6..3e5c28e 100644 --- a/Imake.tmpl +++ b/Imake.tmpl @@ -2064,6 +2064,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags CDEBUGFLAGS = DefaultCDebugFlags CCOPTIONS = DefaultCCOptions /* to distinguish from param flags */ + NOTLDOPTIONS = DefaultNotLDOptions /* not to be used as linker options */ /* * STD_INCLUDES contains system-specific includes * TOP_INCLUDES specifies how to get to /usr/include or its build substitute @@ -2078,6 +2079,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags LDPRELIB = LdPreLib $(INSTALLED_LIBS) LDPOSTLIB = LdPostLib LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + LDOPTIONS := $(filter-out $(NOTLDOPTIONS),$(LDOPTIONS)) CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) diff --git a/linux.cf b/linux.cf index 7845325..e2f28fa 100644 --- a/linux.cf +++ b/linux.cf @@ -898,6 +898,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef Ppc64Architecture # define DefaultCCOptions -mminimal-toc +# define DefaultNotLDOptions -mminimal-toc # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2Ppc64Opt # endif -- 2.7.0.rc3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
