[Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Qemu-devel] [PATCH v5 0/3] DTC as submodule

[peter.crosthwaite]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

These two patches add and use dtc as a submodule as per the RFC:

http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html

There is a remaining action item to mandate libfdt for arm/microblaze and PPC
which is left as follow up work for after review of this series.

Also fixed the configure to properly build pixman when cross compiling.

changed since v4:
Use error_exit in configure
changed since v3:
Rebase against recent configure devls.
changed since v2:
Fixed P1 implementation (PMM review)
Fixed CC/AR/LD quoting issue P3 (PMM review)
Addressed PMM review
changed since v1:
Fixed cross compilation of submodules (new P1)
Fixed passing of ARFLAGS to dtc submake


Peter Crosthwaite (3):
  configure: Put cross compile flags in EXTRA_CFLAGS
  dtc: add submodule
  configure/Make: Build libfdt from submodule DTC

 .gitmodules |    3 +++
 Makefile    |   10 ++++++++++
 configure   |   46 +++++++++++++++++++++++++++++++++++-----------
 dtc         |    1 +
 4 files changed, 49 insertions(+), 11 deletions(-)
 create mode 160000 dtc

[Qemu-devel] [PATCH v5 1/3] configure: Put cross compile flags in EXTRA_CFLAGS

[peter.crosthwaite]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

The cross compile CFLAGS are needed to properly build pixman (and any other
submodules). Only the EXTRA_CFLAGS set is passed to submodules not QEMU_CFLAGS,
so put the cross compile flags in EXTRA_CFLAGS instead.

Signed-off-by: Peter Crosthwaite peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
Changed from v2:
Reverted first hunk to keep early CFLAGS settings (PMM review)
Pretty much a completely different implementation now.

 configure |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index de93345..d5f1516 100755
--- a/configure
+++ b/configure
@@ -941,33 +941,36 @@ done
 case "$cpu" in
     sparc)
            LDFLAGS="-m32 $LDFLAGS"
-           QEMU_CFLAGS="-m32 -mcpu=ultrasparc $QEMU_CFLAGS"
+           CPU_CFLAGS="-m32 -mcpu=ultrasparc"
            ;;
     sparc64)
            LDFLAGS="-m64 $LDFLAGS"
-           QEMU_CFLAGS="-m64 -mcpu=ultrasparc $QEMU_CFLAGS"
+           CPU_CFLAGS="-m64 -mcpu=ultrasparc"
            ;;
     s390)
-           QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"
+           CPU_CFLAGS="-m31 -march=z990"
            LDFLAGS="-m31 $LDFLAGS"
            ;;
     s390x)
-           QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS"
+           CPU_CFLAGS="-m64 -march=z990"
            LDFLAGS="-m64 $LDFLAGS"
            ;;
     i386)
-           QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
+           CPU_CFLAGS="-m32"
            LDFLAGS="-m32 $LDFLAGS"
            cc_i386='$(CC) -m32'
            ;;
     x86_64)
-           QEMU_CFLAGS="-m64 $QEMU_CFLAGS"
+           CPU_CFLAGS="-m64"
            LDFLAGS="-m64 $LDFLAGS"
            cc_i386='$(CC) -m32'
            ;;
     # No special flags required for other host CPUs
 esac
 
+QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS"
+EXTRA_CFLAGS="$CPU_CFLAGS $EXTRA_CFLAGS"
+
 default_target_list=""
 
 # these targets are portable
-- 
1.7.0.4

[Qemu-devel] [PATCH v5 2/3] dtc: add submodule

[peter.crosthwaite]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Add dtc submodule as a fallback for old distros.
Picking version 1.3.0. as this is the most recently tagged stable version.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---

 .gitmodules |    3 +++
 dtc         |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
 create mode 160000 dtc

diff --git a/.gitmodules b/.gitmodules
index cfa2af9..b426ea6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "pixman"]
 	path = pixman
 	url = git://anongit.freedesktop.org/pixman
+[submodule "dtc"]
+	path = dtc
+	url = git://git.qemu.org/dtc.git
diff --git a/dtc b/dtc
new file mode 160000
index 0000000..bc895d6
--- /dev/null
+++ b/dtc
@@ -0,0 +1 @@
+Subproject commit bc895d6d09695d05ceb8b52486ffe861d6cfbdde
-- 
1.7.0.4

[Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[peter.crosthwaite]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Configure to use the DTC submodule to build libfdt when no system libfdt
is found. Prompt to install the DTC submodule if --enable-fdt is set but
no DTC can be found.

DTC has no out-of-tree build capability, so the configure will symlink
the Makefile and scripts directory in the out of tree build directory
and pass in all the needed DTC arguments to make out of tree build happen.
Ideally we fix the DTC make to support out of tree, but did it this way to
avoid commits to DTC.

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
changed from v4:
Use error_exit fn (PMM review)
changed from v3:
Rebased against recent devls.
Fixed some cosmetics.
changed from v2:
Fixed quoting of Make arguments (PMM review)
Fixed comment styling and typos (PMM review)

 Makefile  |   10 ++++++++++
 configure |   31 ++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 67f19f2..88375dc 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,15 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure
 $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
 
+DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
+DTC_CFLAGS=$(CFLAGS) $(extra_cflags) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
+
+subdir-dtc:dtc/libfdt dtc/tests
+	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,)
+
+dtc/%:
+	mkdir -p $@
+
 $(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y)
 
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
@@ -262,6 +271,7 @@ distclean: clean
 	rm -rf $$d || exit 1 ; \
         done
 	if test -f pixman/config.log; then make -C pixman distclean; fi
+	if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi
 
 KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
 ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
diff --git a/configure b/configure
index d5f1516..7546799 100755
--- a/configure
+++ b/configure
@@ -2496,17 +2496,34 @@ if test "$fdt" != "no" ; then
 int main(void) { return 0; }
 EOF
   if compile_prog "" "$fdt_libs" ; then
+    # system DTC is good - use it
     fdt=yes
-    libs_softmmu="$libs_softmmu $fdt_libs"
-  else
-    if test "$fdt" = "yes" ; then
-      feature_not_found "fdt"
+  elif test -d ${source_path}/dtc/libfdt ; then
+    # have submodule DTC - use it
+    fdt=yes
+    dtc_internal="yes"
+    mkdir -p dtc
+    if [ "$source_path" != `pwd` ] ; then
+       symlink "$source_path/dtc/Makefile" "dtc/Makefile"
+       symlink "$source_path/dtc/scripts" "dtc/scripts"
     fi
+    fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
+    fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"
+  elif test "$fdt" = "yes" ; then
+    # have neither and want - prompt for system/submodule install
+    error_exit "ERROR: DTC not present. Your options:" \
+        "  (1) Preferred: Install the DTC devel package" \
+        "  (2) Fetch the DTC submodule, using:" \
+        "      git submodule update --init dtc"
+  else
+    # don't have and don't want
     fdt_libs=
     fdt=no
   fi
 fi
 
+libs_softmmu="$libs_softmmu $fdt_libs"
+
 ##########################################
 # GLX probe, used by milkymist-tmu2
 if test "$glx" != "no" ; then
@@ -3452,7 +3469,7 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then
 fi
 
 # add pixman flags after all config tests are done
-QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
+QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
 libs_softmmu="$libs_softmmu $pixman_libs"
 
 echo "Install prefix    $prefix"
@@ -4515,6 +4532,10 @@ if [ "$pixman" = "internal" ]; then
   echo "config-host.h: subdir-pixman" >> $config_host_mak
 fi
 
+if [ "$dtc_internal" = "yes" ]; then
+  echo "config-host.h: subdir-dtc" >> $config_host_mak
+fi
+
 # build tree in object directory in case the source is not in the current directory
 DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos"
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Edgar E. Iglesias]

On Thu, Apr 18, 2013 at 02:45:35PM +1000, peter.crosthwaite@xilinx.com wrote:
> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> 
> These two patches add and use dtc as a submodule as per the RFC:
> 
> http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html
> 
> There is a remaining action item to mandate libfdt for arm/microblaze and PPC
> which is left as follow up work for after review of this series.
> 
> Also fixed the configure to properly build pixman when cross compiling.
> 
> changed since v4:
> Use error_exit in configure
> changed since v3:
> Rebase against recent configure devls.
> changed since v2:
> Fixed P1 implementation (PMM review)
> Fixed CC/AR/LD quoting issue P3 (PMM review)
> Addressed PMM review
> changed since v1:
> Fixed cross compilation of submodules (new P1)
> Fixed passing of ARFLAGS to dtc submake



Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

CC: Anthony and Bonzini

Shouldn't we in scripts/make_release have a stage that walks the submodules
and makes sure to bootstrap autoconf so that we package release-tarballs
with pre-generated configure scripts?
IIUC, that is standard practice for autoconf tarball releases but I might
be wrong.

Best regards,
Edgar

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Paolo Bonzini]

Il 18/04/2013 12:26, Edgar E. Iglesias ha scritto:
> On Thu, Apr 18, 2013 at 02:45:35PM +1000, peter.crosthwaite@xilinx.com wrote:
>> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>>
>> These two patches add and use dtc as a submodule as per the RFC:
>>
>> http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html
>>
>> There is a remaining action item to mandate libfdt for arm/microblaze and PPC
>> which is left as follow up work for after review of this series.
>>
>> Also fixed the configure to properly build pixman when cross compiling.
>>
>> changed since v4:
>> Use error_exit in configure
>> changed since v3:
>> Rebase against recent configure devls.
>> changed since v2:
>> Fixed P1 implementation (PMM review)
>> Fixed CC/AR/LD quoting issue P3 (PMM review)
>> Addressed PMM review
>> changed since v1:
>> Fixed cross compilation of submodules (new P1)
>> Fixed passing of ARFLAGS to dtc submake
> 
> 
> 
> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

Great, please apply!

> CC: Anthony and Bonzini
> 
> Shouldn't we in scripts/make_release have a stage that walks the submodules
> and makes sure to bootstrap autoconf so that we package release-tarballs
> with pre-generated configure scripts?
> IIUC, that is standard practice for autoconf tarball releases but I might
> be wrong.

It depends.  Some autoconfiscated packages put autoconf-generated
scripts in the repository.  In this case, there is no need to regenerate
the files when brewing the release.  Others leave out all such files
(including for example Bison-generated parsers); in this case of course
you need to include the scripts in the tarball, the user is not supposed
to run autoconf himself.

For submodules that do have autoconf-generated scripts in the repository
(I think both of them do, in our case), we should trust upstream's
configure script.  That's what everyone has been testing the git
repository with.

Paolo

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Edgar E. Iglesias]

On Thu, Apr 18, 2013 at 01:02:41PM +0200, Paolo Bonzini wrote:
> Il 18/04/2013 12:26, Edgar E. Iglesias ha scritto:
> > On Thu, Apr 18, 2013 at 02:45:35PM +1000, peter.crosthwaite@xilinx.com wrote:
> >> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> >>
> >> These two patches add and use dtc as a submodule as per the RFC:
> >>
> >> http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html
> >>
> >> There is a remaining action item to mandate libfdt for arm/microblaze and PPC
> >> which is left as follow up work for after review of this series.
> >>
> >> Also fixed the configure to properly build pixman when cross compiling.
> >>
> >> changed since v4:
> >> Use error_exit in configure
> >> changed since v3:
> >> Rebase against recent configure devls.
> >> changed since v2:
> >> Fixed P1 implementation (PMM review)
> >> Fixed CC/AR/LD quoting issue P3 (PMM review)
> >> Addressed PMM review
> >> changed since v1:
> >> Fixed cross compilation of submodules (new P1)
> >> Fixed passing of ARFLAGS to dtc submake
> > 
> > 
> > 
> > Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> 
> Great, please apply!
> 
> > CC: Anthony and Bonzini
> > 
> > Shouldn't we in scripts/make_release have a stage that walks the submodules
> > and makes sure to bootstrap autoconf so that we package release-tarballs
> > with pre-generated configure scripts?
> > IIUC, that is standard practice for autoconf tarball releases but I might
> > be wrong.
> 
> It depends.  Some autoconfiscated packages put autoconf-generated
> scripts in the repository.  In this case, there is no need to regenerate
> the files when brewing the release.  Others leave out all such files
> (including for example Bison-generated parsers); in this case of course
> you need to include the scripts in the tarball, the user is not supposed
> to run autoconf himself.

OK, thanks.

> 
> For submodules that do have autoconf-generated scripts in the repository
> (I think both of them do, in our case), we should trust upstream's
> configure script.  That's what everyone has been testing the git
> repository with.

I downloaded the qemu-1.4.1 release and looked at the pixman subdir. It
doesnt come with a generated configure script, but has a autogen.sh script to
run autoconf itself. My understanding was that, like you say, the user
shouldn't need to run autoconf to generate configure, it should have been
provided. Am I missing something?

Best regards,
Edgar

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Peter Maydell]

On 18 April 2013 12:08, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote:
> On Thu, Apr 18, 2013 at 01:02:41PM +0200, Paolo Bonzini wrote:
>> For submodules that do have autoconf-generated scripts in the repository
>> (I think both of them do, in our case), we should trust upstream's
>> configure script.  That's what everyone has been testing the git
>> repository with.
>
> I downloaded the qemu-1.4.1 release and looked at the pixman subdir. It
> doesnt come with a generated configure script, but has a autogen.sh script to
> run autoconf itself. My understanding was that, like you say, the user
> shouldn't need to run autoconf to generate configure, it should have been
> provided. Am I missing something?

Our release notes from when we put pixman in:
http://wiki.qemu.org/ChangeLog/1.3#Build_dependencies
say that you need autoconf if you're using the built in submodule.
I think that's just documentation of the current situation rather
than an explicit decision that it's the right approach, though.

-- PMM

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Paolo Bonzini]

Il 18/04/2013 13:08, Edgar E. Iglesias ha scritto:
>> > For submodules that do have autoconf-generated scripts in the repository
>> > (I think both of them do, in our case), we should trust upstream's
>> > configure script.  That's what everyone has been testing the git
>> > repository with.
> I downloaded the qemu-1.4.1 release and looked at the pixman subdir. It
> doesnt come with a generated configure script, but has a autogen.sh script to
> run autoconf itself. My understanding was that, like you say, the user
> shouldn't need to run autoconf to generate configure, it should have been
> provided. Am I missing something?

No, you are right for pixman.  Instead, dtc does not require changes to
scripts/make_release.

Paolo

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Edgar E. Iglesias]

On Thu, Apr 18, 2013 at 02:45:35PM +1000, peter.crosthwaite@xilinx.com wrote:
> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> 
> These two patches add and use dtc as a submodule as per the RFC:
> 
> http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html
> 
> There is a remaining action item to mandate libfdt for arm/microblaze and PPC
> which is left as follow up work for after review of this series.
> 
> Also fixed the configure to properly build pixman when cross compiling.

Applied, thanks Peter.


> 
> changed since v4:
> Use error_exit in configure
> changed since v3:
> Rebase against recent configure devls.
> changed since v2:
> Fixed P1 implementation (PMM review)
> Fixed CC/AR/LD quoting issue P3 (PMM review)
> Addressed PMM review
> changed since v1:
> Fixed cross compilation of submodules (new P1)
> Fixed passing of ARFLAGS to dtc submake
> 
> 
> Peter Crosthwaite (3):
>   configure: Put cross compile flags in EXTRA_CFLAGS
>   dtc: add submodule
>   configure/Make: Build libfdt from submodule DTC
> 
>  .gitmodules |    3 +++
>  Makefile    |   10 ++++++++++
>  configure   |   46 +++++++++++++++++++++++++++++++++++-----------
>  dtc         |    1 +
>  4 files changed, 49 insertions(+), 11 deletions(-)
>  create mode 160000 dtc
> 

Re: [Qemu-devel] [PATCH v5 0/3] DTC as submodule

[Edgar E. Iglesias]

On Thu, Apr 18, 2013 at 12:10:54PM +0100, Peter Maydell wrote:
> On 18 April 2013 12:08, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote:
> > On Thu, Apr 18, 2013 at 01:02:41PM +0200, Paolo Bonzini wrote:
> >> For submodules that do have autoconf-generated scripts in the repository
> >> (I think both of them do, in our case), we should trust upstream's
> >> configure script.  That's what everyone has been testing the git
> >> repository with.
> >
> > I downloaded the qemu-1.4.1 release and looked at the pixman subdir. It
> > doesnt come with a generated configure script, but has a autogen.sh script to
> > run autoconf itself. My understanding was that, like you say, the user
> > shouldn't need to run autoconf to generate configure, it should have been
> > provided. Am I missing something?
> 
> Our release notes from when we put pixman in:
> http://wiki.qemu.org/ChangeLog/1.3#Build_dependencies
> say that you need autoconf if you're using the built in submodule.
> I think that's just documentation of the current situation rather
> than an explicit decision that it's the right approach, though.

Thanks, that explains it.

Cheers,
Edgar

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Blue Swirl]

On Thu, Apr 18, 2013 at 4:47 AM,  <peter.crosthwaite@xilinx.com> wrote:
> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>
> Configure to use the DTC submodule to build libfdt when no system libfdt
> is found. Prompt to install the DTC submodule if --enable-fdt is set but
> no DTC can be found.
>
> DTC has no out-of-tree build capability, so the configure will symlink
> the Makefile and scripts directory in the out of tree build directory
> and pass in all the needed DTC arguments to make out of tree build happen.
> Ideally we fix the DTC make to support out of tree, but did it this way to
> avoid commits to DTC.
>
> Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> changed from v4:
> Use error_exit fn (PMM review)
> changed from v3:
> Rebased against recent devls.
> Fixed some cosmetics.
> changed from v2:
> Fixed quoting of Make arguments (PMM review)
> Fixed comment styling and typos (PMM review)
>
>  Makefile  |   10 ++++++++++
>  configure |   31 ++++++++++++++++++++++++++-----
>  2 files changed, 36 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 67f19f2..88375dc 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -145,6 +145,15 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure
>  $(SRC_PATH)/pixman/configure:
>         (cd $(SRC_PATH)/pixman; autoreconf -v --install)
>
> +DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
> +DTC_CFLAGS=$(CFLAGS) $(extra_cflags) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt

This is not entirely correct, I get these errors:
mingw32:
     CC libfdt/fdt.o
cc1: warnings being treated as errors
/src/qemu/dtc/libfdt/fdt.c:1: warning: -fPIC ignored for target (all
code is position independent)

Other flags, including -fPIC, is missing for Clang:
     LD libfdt/libfdt-1.3.0.so
/usr/bin/ld: libfdt/fdt.o: relocation R_X86_64_32S against `.rodata'
can not be used when making a shared object; recompile with -fPIC

My build script also passes additional CFLAGS to both.

Perhaps the fix is to use QEMU_CFLAGS instead of (or in addition to)
CFLAGS above for DTC_CFLAGS? Or add -fPIC as with pixman?

> +
> +subdir-dtc:dtc/libfdt dtc/tests
> +       $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,)
> +
> +dtc/%:
> +       mkdir -p $@
> +
>  $(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y)
>
>  ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
> @@ -262,6 +271,7 @@ distclean: clean
>         rm -rf $$d || exit 1 ; \
>          done
>         if test -f pixman/config.log; then make -C pixman distclean; fi
> +       if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi
>
>  KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
>  ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
> diff --git a/configure b/configure
> index d5f1516..7546799 100755
> --- a/configure
> +++ b/configure
> @@ -2496,17 +2496,34 @@ if test "$fdt" != "no" ; then
>  int main(void) { return 0; }
>  EOF
>    if compile_prog "" "$fdt_libs" ; then
> +    # system DTC is good - use it
>      fdt=yes
> -    libs_softmmu="$libs_softmmu $fdt_libs"
> -  else
> -    if test "$fdt" = "yes" ; then
> -      feature_not_found "fdt"
> +  elif test -d ${source_path}/dtc/libfdt ; then
> +    # have submodule DTC - use it
> +    fdt=yes
> +    dtc_internal="yes"
> +    mkdir -p dtc
> +    if [ "$source_path" != `pwd` ] ; then
> +       symlink "$source_path/dtc/Makefile" "dtc/Makefile"
> +       symlink "$source_path/dtc/scripts" "dtc/scripts"
>      fi
> +    fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
> +    fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"
> +  elif test "$fdt" = "yes" ; then
> +    # have neither and want - prompt for system/submodule install
> +    error_exit "ERROR: DTC not present. Your options:" \
> +        "  (1) Preferred: Install the DTC devel package" \
> +        "  (2) Fetch the DTC submodule, using:" \
> +        "      git submodule update --init dtc"
> +  else
> +    # don't have and don't want
>      fdt_libs=
>      fdt=no
>    fi
>  fi
>
> +libs_softmmu="$libs_softmmu $fdt_libs"
> +
>  ##########################################
>  # GLX probe, used by milkymist-tmu2
>  if test "$glx" != "no" ; then
> @@ -3452,7 +3469,7 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then
>  fi
>
>  # add pixman flags after all config tests are done
> -QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
> +QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
>  libs_softmmu="$libs_softmmu $pixman_libs"
>
>  echo "Install prefix    $prefix"
> @@ -4515,6 +4532,10 @@ if [ "$pixman" = "internal" ]; then
>    echo "config-host.h: subdir-pixman" >> $config_host_mak
>  fi
>
> +if [ "$dtc_internal" = "yes" ]; then
> +  echo "config-host.h: subdir-dtc" >> $config_host_mak
> +fi
> +
>  # build tree in object directory in case the source is not in the current directory
>  DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos"
>  DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
> --
> 1.7.0.4
>
>

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Paolo Bonzini]

Il 20/04/2013 20:42, Blue Swirl ha scritto:
> This is not entirely correct, I get these errors:
> mingw32:
>      CC libfdt/fdt.o
> cc1: warnings being treated as errors
> /src/qemu/dtc/libfdt/fdt.c:1: warning: -fPIC ignored for target (all
> code is position independent)
> 
> Other flags, including -fPIC, is missing for Clang:
>      LD libfdt/libfdt-1.3.0.so
> /usr/bin/ld: libfdt/fdt.o: relocation R_X86_64_32S against `.rodata'
> can not be used when making a shared object; recompile with -fPIC
> 
> My build script also passes additional CFLAGS to both.
> 
> Perhaps the fix is to use QEMU_CFLAGS instead of (or in addition to)
> CFLAGS above for DTC_CFLAGS? Or add -fPIC as with pixman?

libfdt is not that portable, it doesn't use libtool to build shared
libraries.

Perhaps we can just build the static library?

Paolo

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Peter Crosthwaite]

Hi Paolo, Blue,

On Sun, Apr 21, 2013 at 11:16 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 20/04/2013 20:42, Blue Swirl ha scritto:
>> This is not entirely correct, I get these errors:
>> mingw32:
>>      CC libfdt/fdt.o
>> cc1: warnings being treated as errors
>> /src/qemu/dtc/libfdt/fdt.c:1: warning: -fPIC ignored for target (all
>> code is position independent)
>>

This is coming from the dtc makefile which explicitly passes in -fPIC
via its default CFLAGS. I tried fixing by setting the Make invocation
to replace CFLAGS entirely, which in effect removes the -fPIC: But I
suffer a similar (later) failure to the one you posted below:

  LINK  arm-softmmu/qemu-system-arm
/usr/bin/ld: /home/peterc/Petalogix/Internal/plgx_src/qemu-build/dtc/libfdt/libfdt.a(fdt.o):
relocation R_X86_64_32S against `.rodata' can not be used when making
a shared object; recompile with -fPIC
/home/peterc/Petalogix/Internal/plgx_src/qemu-build/dtc/libfdt/libfdt.a:
could not read symbols: Bad value

Looks like QEMU mandates that all static objects are -fPIC. A bit of
googling suggests that this error is mingw specific in that mingw
can't handle -fPIC.

>> Other flags, including -fPIC, is missing for Clang:
>>      LD libfdt/libfdt-1.3.0.so
>> /usr/bin/ld: libfdt/fdt.o: relocation R_X86_64_32S against `.rodata'
>> can not be used when making a shared object; recompile with -fPIC
>>

Is this the only clang failure? If so, I'd like to favour Paolos
suggestion of just not building the .so and then we can ignore this
altogether.

>> My build script also passes additional CFLAGS to both.
>>
>> Perhaps the fix is to use QEMU_CFLAGS instead of (or in addition to)
>> CFLAGS above for DTC_CFLAGS?

CFLAGS + QEMU_CFLAGS works as of today, although I was hesitant to do
this at first as it exposes us to issues if QEMU specific CFLAGS are
added in the future than cause DTC build breakage. But ive put the fix
on list to pass in QEMU_CFLAGS as it should unbreak your build.

>> Or add -fPIC as with pixman?

Wont that just expose us to the same mingw werror failure above?

>
> libfdt is not that portable, it doesn't use libtool to build shared
> libraries.
>
> Perhaps we can just build the static library?
>

Seems reasonable, and got this working with fairly low effort. Fix on list.

Regards,
Peter

> Paolo
>
>

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Paolo Bonzini]

Il 22/04/2013 06:45, Peter Crosthwaite ha scritto:
> Hi Paolo, Blue,
> 
> On Sun, Apr 21, 2013 at 11:16 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> Il 20/04/2013 20:42, Blue Swirl ha scritto:
>>> This is not entirely correct, I get these errors:
>>> mingw32:
>>>      CC libfdt/fdt.o
>>> cc1: warnings being treated as errors
>>> /src/qemu/dtc/libfdt/fdt.c:1: warning: -fPIC ignored for target (all
>>> code is position independent)
>>>
> 
> This is coming from the dtc makefile which explicitly passes in -fPIC
> via its default CFLAGS. I tried fixing by setting the Make invocation
> to replace CFLAGS entirely, which in effect removes the -fPIC: But I
> suffer a similar (later) failure to the one you posted below:
> 
>   LINK  arm-softmmu/qemu-system-arm
> /usr/bin/ld: /home/peterc/Petalogix/Internal/plgx_src/qemu-build/dtc/libfdt/libfdt.a(fdt.o):
> relocation R_X86_64_32S against `.rodata' can not be used when making
> a shared object; recompile with -fPIC
> /home/peterc/Petalogix/Internal/plgx_src/qemu-build/dtc/libfdt/libfdt.a:
> could not read symbols: Bad value
> 
> Looks like QEMU mandates that all static objects are -fPIC. A bit of
> googling suggests that this error is mingw specific in that mingw
> can't handle -fPIC.

Right, that's because QEMU is built as a position-independent executable.

PIE requirements actually are a bit less strict than -fPIC.  Your
solution of passing the compilation flags sounds good, but do you pass
-Werror too?

Paolo

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Peter Maydell]

On 22 April 2013 05:45, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote:
> On Sun, Apr 21, 2013 at 11:16 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> libfdt is not that portable, it doesn't use libtool to build shared
>> libraries.
>>
>> Perhaps we can just build the static library?
>>
>
> Seems reasonable, and got this working with fairly low effort.
> Fix on list.

Hi -- can you point me at the fix? Did it get committed?
I did a search of my mail archives but couldn't find anything
that looked like it.

(I'm looking at making libfdt mandatory for softmmu targets, for
which purpose we need to make sure all the libfdt build hiccups
are fixed...)

thanks
-- PMM

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Edgar E. Iglesias]

On Fri, May 24, 2013 at 03:16:00PM +0100, Peter Maydell wrote:
> On 22 April 2013 05:45, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote:
> > On Sun, Apr 21, 2013 at 11:16 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >> libfdt is not that portable, it doesn't use libtool to build shared
> >> libraries.
> >>
> >> Perhaps we can just build the static library?
> >>
> >
> > Seems reasonable, and got this working with fairly low effort.
> > Fix on list.
> 
> Hi -- can you point me at the fix? Did it get committed?
> I did a search of my mail archives but couldn't find anything
> that looked like it.
> 
> (I'm looking at making libfdt mandatory for softmmu targets, for
> which purpose we need to make sure all the libfdt build hiccups
> are fixed...)

Hi Peter,

I think it was this one:

Cheers,
Edgar

commit 9005a51b096272e1834638f8e184706548ee7364
Author: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Date:   Mon Apr 22 14:40:49 2013 +1000

    Makefile: Don't build shared libfdt
    
    The submodule DTC should just build and use DTC as static (the whole
    motivation for using submod is lack of widespread distro support).
    
    The .so causes build failures on some platforms, so adjust the make
    target to just build the static lib.
    
    Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

diff --git a/Makefile b/Makefile
index efb1c44..5140c19 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc
 DTC_CFLAGS=$(CFLAGS) $(extra_cflags) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(S
 
 subdir-dtc:dtc/libfdt dtc/tests
-       $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CFLAGS)" L
+       $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CFLAGS)" L
 
 dtc/%:
        mkdir -p $@

Re: [Qemu-devel] [PATCH v5 3/3] configure/Make: Build libfdt from submodule DTC

[Peter Maydell]

On 24 May 2013 15:33, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote:
> On Fri, May 24, 2013 at 03:16:00PM +0100, Peter Maydell wrote:
>> Hi -- can you point me at the fix? Did it get committed?
>> I did a search of my mail archives but couldn't find anything
>> that looked like it.
>>
>> (I'm looking at making libfdt mandatory for softmmu targets, for
>> which purpose we need to make sure all the libfdt build hiccups
>> are fixed...)

> I think it was this one:

> commit 9005a51b096272e1834638f8e184706548ee7364
> Author: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Date:   Mon Apr 22 14:40:49 2013 +1000
>
>     Makefile: Don't build shared libfdt

Yep, that'll be it. Thanks!

-- PMM