Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 70 insertions, 55 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index de934def410f..faa9a4701b6f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
 else
-Kconfig := arch/$(SRCARCH)/Kconfig
+Kconfig := Kconfig
 endif
 
 xconfig: $(obj)/qconf
@@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 # The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)echo "  GEN config"
-        $(Q)xgettext --default-domain=linux              \
-            --add-comments --keyword=_ --keyword=N_      \
-            --from-code=UTF-8                            \
-            --files-from=scripts/kconfig/POTFILES.in     \
+        $(Q)xgettext --default-domain=linux                         \
+            --add-comments --keyword=_ --keyword=N_                 \
+            --from-code=UTF-8                                       \
+            --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
+            --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-        $(Q)(for i in `ls arch/*/Kconfig`;               \
+        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
             do                                           \
                 echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
-        $(Q)rm -f arch/um/Kconfig.arch
+        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -145,11 +146,8 @@ check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
 
 # Use recursively expanded variables so we do not call gcc unless
 # we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-
-HOST_EXTRACFLAGS += -DLOCALE
-
+HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                    -DLOCALE
 
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
@@ -171,8 +169,11 @@ conf-objs	:= conf.o  zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs  := kxgettext.o zconf.tab.o
+qconf-cxxobjs   := qconf.o
+qconf-objs      := kconfig_load.o zconf.tab.o
+gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
 
-hostprogs-y := conf qconf gconf kxgettext
+hostprogs-y := conf
 
 ifeq ($(MAKECMDGOALS),nconfig)
         hostprogs-y += nconf
@@ -182,6 +183,10 @@ ifeq ($(MAKECMDGOALS),menuconfig)
         hostprogs-y += mconf
 endif
 
+ifeq ($(MAKECMDGOALS),update-po-config)
+        hostprogs-y += kxgettext
+endif
+
 ifeq ($(MAKECMDGOALS),xconfig)
         qconf-target := 1
 endif
@@ -191,16 +196,15 @@ endif
 
 
 ifeq ($(qconf-target),1)
-qconf-cxxobjs   := qconf.o
-qconf-objs      := kconfig_load.o zconf.tab.o
+        hostprogs-y += qconf
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
+        hostprogs-y += gconf
 endif
 
-clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
-                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files     += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -208,7 +212,7 @@ clean-files     += config.pot linux.pot
 PHONY += $(obj)/dochecklxdialog
 $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
 $(obj)/dochecklxdialog:
-        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
+        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
 
 always := dochecklxdialog
 
@@ -226,6 +230,8 @@ HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
 HOSTCFLAGS_gconf.o      = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
                           -D LKC_DIRECT_LINK
 
+HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+
 HOSTLOADLIBES_nconf     = -lmenu -lpanel -lncurses
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
 
@@ -236,40 +242,48 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
         @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
-        pkg-config --exists qt 2> /dev/null && pkg=qt; \
-        pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
-        if [ -n "$$pkg" ]; then \
-          cflags="\$$(shell pkg-config $$pkg --cflags)"; \
-          libs="\$$(shell pkg-config $$pkg --libs)"; \
-          moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
-          dir="$$(pkg-config $$pkg --variable=prefix)"; \
+        if ! pkg-config --exists QtCore 2> /dev/null; then \
+            echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
+            pkg-config --exists qt 2> /dev/null && pkg=qt; \
+            pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
+            if [ -n "$$pkg" ]; then \
+              cflags="\$$(shell pkg-config $$pkg --cflags)"; \
+              libs="\$$(shell pkg-config $$pkg --libs)"; \
+              moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
+              dir="$$(pkg-config $$pkg --variable=prefix)"; \
+            else \
+              for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+                if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
+              done; \
+              if [ -z "$$dir" ]; then \
+                echo "*"; \
+                echo "* Unable to find any QT installation. Please make sure that"; \
+                echo "* the QT4 or QT3 development package is correctly installed and"; \
+                echo "* either qmake can be found or install pkg-config or set"; \
+                echo "* the QTDIR environment variable to the correct location."; \
+                echo "*"; \
+                false; \
+              fi; \
+              libpath=$$dir/lib; lib=qt; osdir=""; \
+              $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
+                osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
+              test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
+              test -f $$libpath/libqt-mt.so && lib=qt-mt; \
+              cflags="-I$$dir/include"; \
+              libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
+              moc="$$dir/bin/moc"; \
+            fi; \
+            if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
+              echo "*"; \
+              echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
+              echo "*"; \
+              moc="/usr/bin/moc"; \
+            fi; \
         else \
-          for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
-            if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
-          done; \
-          if [ -z "$$dir" ]; then \
-            echo "*"; \
-            echo "* Unable to find the QT3 installation. Please make sure that"; \
-            echo "* the QT3 development package is correctly installed and"; \
-            echo "* either install pkg-config or set the QTDIR environment"; \
-            echo "* variable to the correct location."; \
-            echo "*"; \
-            false; \
-          fi; \
-          libpath=$$dir/lib; lib=qt; osdir=""; \
-          $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-            osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
-          test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
-          test -f $$libpath/libqt-mt.so && lib=qt-mt; \
-          cflags="-I$$dir/include"; \
-          libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
-          moc="$$dir/bin/moc"; \
-        fi; \
-        if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
-          echo "*"; \
-          echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
-          echo "*"; \
-          moc="/usr/bin/moc"; \
+          cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
+          libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
+          binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
+          moc="$$binpath/bin/moc"; \
         fi; \
         echo "KC_QT_CFLAGS=$$cflags" > $@; \
         echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -314,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h
         $(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
-        sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+        $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
-        intltool-extract --type=gettext/glade $(obj)/gconf.glade
+        $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+        $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf