Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-09-05 Thread Eric Engestrom 
On Thursday, 2019-09-05 17:58:22 +0200, Mauro Rossi wrote:
> Hi Eric, Emil,
> we have Tapani ok, in my understanding
> 
> Please follow up on this one

Sure, feel free to push the android revert until we can figure out a fix:
Acked-by: Eric Engestrom 


> Mauro
> 
> On Fri, Aug 16, 2019 at 4:29 AM Mauro Rossi  wrote:
> 
> > Hi Tapani, Eric,
> >
> > On Thu, Aug 15, 2019 at 1:00 PM Tapani Pälli 
> > wrote:
> >
> >>
> >> On 8/15/19 12:52 PM, Mauro Rossi wrote:
> >> > Hi Tapani,
> >> >
> >> > On Thu, Aug 15, 2019 at 7:29 AM Tapani Pälli  >> > > wrote:
> >> >
> >> >
> >> > On 8/13/19 9:55 PM, Mauro Rossi wrote:
> >> >  > Hi,
> >> >  >
> >> >  > On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli
> >> > mailto:tapani.pa...@intel.com>
> >> >  > >>
> >> > wrote:
> >> >  >
> >> >  >
> >> >  > On 8/13/19 3:32 PM, Mauro Rossi wrote:
> >> >  >  > Hi,
> >> >  >  >
> >> >  >  > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
> >> >  > mailto:tapani.pa...@intel.com>
> >> > >
> >> >  >  >  >> >   >> >  >> >  > wrote:
> >> >  >  >
> >> >  >  > Hi;
> >> >  >  >
> >> >  >  > On 8/13/19 2:43 PM, Mauro Rossi wrote:
> >> >  >  >  > Hi Tapani,
> >> >  >  >  >
> >> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >> >  >  > mailto:issor.or...@gmail.com>
> >> > >
> >> >  > 
> >> > >>
> >> >  >  >  >  >> > 
> >> >  >  >> >>
> >> > 
> >> >  >  >> >  wrote:
> >> >  >  >  >
> >> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >> >  >  > mailto:issor.or...@gmail.com>
> >> > >
> >> >  > 
> >> > >>
> >> >  >  >  >  >> > 
> >> >  >  >> >>
> >> >  >  >  >> > 
> >> >  >  >> >  wrote:
> >> >  >  >  >  >
> >> >  >  >  >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei
> >> Huang
> >> >  >  >  >  >> > 
> >> >  >  >> > >  >> > 
> >> >  >  >> > >>
> >> >  >  >  >> > 
> >> >  >  >> > >  >> > 
> >> >  >  >> > 
> >> >  >  > wrote:
> >> >  >  >  >  > >
> >> >  >  >  >  > > Mauro Rossi  >> > 
> >> >  >  >> >>
> >> >  >  >  >> >   >> > >>
> >> >  >  >  >  >> > 
> >> >  >  >> >>
> >> >  >  >  >> > 
> >> >  >  >> >  於 2019年7月14日 週日 下午5:17寫道：
> >> >  >  >  >  > > >
> >> >  >  >  >  > > > This patch partially reverts 20294dc
> >> ("mesa:
> >> >  > Enable asm
> >> >  >  >  > unconditionally, ...")
> >> >  >  >  >  > > >
> >> >

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-09-05 Thread Mauro Rossi 
Hi Eric, Emil,
we have Tapani ok, in my understanding

Please follow up on this one
Mauro

On Fri, Aug 16, 2019 at 4:29 AM Mauro Rossi  wrote:

> Hi Tapani, Eric,
>
> On Thu, Aug 15, 2019 at 1:00 PM Tapani Pälli 
> wrote:
>
>>
>> On 8/15/19 12:52 PM, Mauro Rossi wrote:
>> > Hi Tapani,
>> >
>> > On Thu, Aug 15, 2019 at 7:29 AM Tapani Pälli > > > wrote:
>> >
>> >
>> > On 8/13/19 9:55 PM, Mauro Rossi wrote:
>> >  > Hi,
>> >  >
>> >  > On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli
>> > mailto:tapani.pa...@intel.com>
>> >  > >>
>> > wrote:
>> >  >
>> >  >
>> >  > On 8/13/19 3:32 PM, Mauro Rossi wrote:
>> >  >  > Hi,
>> >  >  >
>> >  >  > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
>> >  > mailto:tapani.pa...@intel.com>
>> > >
>> >  >  > > >  > > > >  > wrote:
>> >  >  >
>> >  >  > Hi;
>> >  >  >
>> >  >  > On 8/13/19 2:43 PM, Mauro Rossi wrote:
>> >  >  >  > Hi Tapani,
>> >  >  >  >
>> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
>> >  >  > mailto:issor.or...@gmail.com>
>> > >
>> >  > 
>> > >>
>> >  >  >  > > > 
>> >  > > >>
>> > 
>> >  > > >  wrote:
>> >  >  >  >
>> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
>> >  >  > mailto:issor.or...@gmail.com>
>> > >
>> >  > 
>> > >>
>> >  >  >  > > > 
>> >  > > >>
>> >  >  > > > 
>> >  > > >  wrote:
>> >  >  >  >  >
>> >  >  >  >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei
>> Huang
>> >  >  >  > > > 
>> >  > > > > > > 
>> >  > > > >>
>> >  >  > > > 
>> >  > > > > > > 
>> >  > > > 
>> >  >  > wrote:
>> >  >  >  >  > >
>> >  >  >  >  > > Mauro Rossi > > 
>> >  > > >>
>> >  >  > > >  > > >>
>> >  >  >  > > > 
>> >  > > >>
>> >  >  > > > 
>> >  > > >  於 2019年7月14日 週日 下午5:17寫道：
>> >  >  >  >  > > >
>> >  >  >  >  > > > This patch partially reverts 20294dc
>> ("mesa:
>> >  > Enable asm
>> >  >  >  > unconditionally, ...")
>> >  >  >  >  > > >
>> >  >  >  >  > > > Android makefile build logic needs to
>> > disable
>> >  > assembler
>> >  >  >  > optimization
>> >  >  >  >  > > > in 32bit builds to avoid text
>> > relocations for
>> >  >  > libglapi.so shared
>> >  >  >  >  > > >
>> >  >  >  >  > > > Fixes the following

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-15 Thread Mauro Rossi 
Hi Tapani, Eric,

On Thu, Aug 15, 2019 at 1:00 PM Tapani Pälli  wrote:

>
> On 8/15/19 12:52 PM, Mauro Rossi wrote:
> > Hi Tapani,
> >
> > On Thu, Aug 15, 2019 at 7:29 AM Tapani Pälli  > > wrote:
> >
> >
> > On 8/13/19 9:55 PM, Mauro Rossi wrote:
> >  > Hi,
> >  >
> >  > On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli
> > mailto:tapani.pa...@intel.com>
> >  > >>
> > wrote:
> >  >
> >  >
> >  > On 8/13/19 3:32 PM, Mauro Rossi wrote:
> >  >  > Hi,
> >  >  >
> >  >  > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
> >  > mailto:tapani.pa...@intel.com>
> > >
> >  >  >  >   >  >  > wrote:
> >  >  >
> >  >  > Hi;
> >  >  >
> >  >  > On 8/13/19 2:43 PM, Mauro Rossi wrote:
> >  >  >  > Hi Tapani,
> >  >  >  >
> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >  >  > mailto:issor.or...@gmail.com>
> > >
> >  > 
> > >>
> >  >  >  >  > 
> >  > >
> > 
> >  >  >  wrote:
> >  >  >  >
> >  >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >  >  > mailto:issor.or...@gmail.com>
> > >
> >  > 
> > >>
> >  >  >  >  > 
> >  > >
> >  >  >  > 
> >  >  >  wrote:
> >  >  >  >  >
> >  >  >  >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei
> Huang
> >  >  >  >  > 
> >  >  > >  > 
> >  >  > >>
> >  >  >  > 
> >  >  > >  > 
> >  >  > 
> >  >  > wrote:
> >  >  >  >  > >
> >  >  >  >  > > Mauro Rossi  > 
> >  > >
> >  >  >  >   > >>
> >  >  >  >  > 
> >  > >
> >  >  >  > 
> >  >  >  於 2019年7月14日 週日 下午5:17寫道：
> >  >  >  >  > > >
> >  >  >  >  > > > This patch partially reverts 20294dc
> ("mesa:
> >  > Enable asm
> >  >  >  > unconditionally, ...")
> >  >  >  >  > > >
> >  >  >  >  > > > Android makefile build logic needs to
> > disable
> >  > assembler
> >  >  >  > optimization
> >  >  >  >  > > > in 32bit builds to avoid text
> > relocations for
> >  >  > libglapi.so shared
> >  >  >  >  > > >
> >  >  >  >  > > > Fixes the following build error with
> Android
> >  > x86 32bit
> >  >  > target:
> >  >  >  >  > > >
> >  >  >  >  > > > [  0% 4/477] target SharedLib: libglapi
> >  >  >  >
> >  >  >
> >  >
> >
>  
>

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-15 Thread Tapani Pälli 


On 8/15/19 12:52 PM, Mauro Rossi wrote:

Hi Tapani,

On Thu, Aug 15, 2019 at 7:29 AM Tapani Pälli > wrote:



On 8/13/19 9:55 PM, Mauro Rossi wrote:
 > Hi,
 >
 > On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli
mailto:tapani.pa...@intel.com>
 > >>
wrote:
 >
 >
 >     On 8/13/19 3:32 PM, Mauro Rossi wrote:
 >      > Hi,
 >      >
 >      > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
 >     mailto:tapani.pa...@intel.com>
>
 >      >       wrote:
 >      >
 >      >     Hi;
 >      >
 >      >     On 8/13/19 2:43 PM, Mauro Rossi wrote:
 >      >      > Hi Tapani,
 >      >      >
 >      >      > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
 >      >     mailto:issor.or...@gmail.com>
>
 >     
>>
 >      >      > 
 >     >

 >      wrote:
 >      >      >
 >      >      >     On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
 >      >     mailto:issor.or...@gmail.com>
>
 >     
>>
 >      >      >     
 >     >
 >      >     
 >      wrote:
 >      >      >      >
 >      >      >      > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
 >      >      >     mailto:cwhu...@android-x86.org>
 >     > 
 >     >>
 >      >     
 >     > 
 >     
 >      >     wrote:
 >      >      >      > >
 >      >      >      > > Mauro Rossi mailto:issor.or...@gmail.com>
 >     >
 >      >      >>
 >      >      >     
 >     >
 >      >     
 >      於 2019年7月14日 週日 下午5:17寫道：
 >      >      >      > > >
 >      >      >      > > > This patch partially reverts 20294dc ("mesa:
 >     Enable asm
 >      >      >     unconditionally, ...")
 >      >      >      > > >
 >      >      >      > > > Android makefile build logic needs to
disable
 >     assembler
 >      >      >     optimization
 >      >      >      > > > in 32bit builds to avoid text
relocations for
 >      >     libglapi.so shared
 >      >      >      > > >
 >      >      >      > > > Fixes the following build error with Android
 >     x86 32bit
 >      >     target:
 >      >      >      > > >
 >      >      >      > > > [  0% 4/477] target SharedLib: libglapi
 >      >      >
 >      >
 > 
  (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)

 >      >      >      > > > FAILED:
 >      >      >
 >      >
 > 
  out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so

 >      >      >      > > > ...
 >      >      >      > > >
 >      >      >
 >      >
 > 
  prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:

 >      >      >     warning: shared library text

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-15 Thread Mauro Rossi 
Hi Tapani,

On Thu, Aug 15, 2019 at 7:29 AM Tapani Pälli  wrote:

>
> On 8/13/19 9:55 PM, Mauro Rossi wrote:
> > Hi,
> >
> > On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli  > > wrote:
> >
> >
> > On 8/13/19 3:32 PM, Mauro Rossi wrote:
> >  > Hi,
> >  >
> >  > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
> > mailto:tapani.pa...@intel.com>
> >  > >>
> > wrote:
> >  >
> >  > Hi;
> >  >
> >  > On 8/13/19 2:43 PM, Mauro Rossi wrote:
> >  >  > Hi Tapani,
> >  >  >
> >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >  > mailto:issor.or...@gmail.com>
> > >
> >  >  >  >   >  >  >  >
> >  >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> >  > mailto:issor.or...@gmail.com>
> > >
> >  >  >  > 
> >  >  >  >  >  >  >
> >  >  >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
> >  >  >  >   > >
> >  >  >   >  >  > wrote:
> >  >  >  > >
> >  >  >  > > Mauro Rossi  > 
> >  > >
> >  >  >  > 
> >  >  >  >  >  >  > > >
> >  >  >  > > > This patch partially reverts 20294dc ("mesa:
> > Enable asm
> >  >  > unconditionally, ...")
> >  >  >  > > >
> >  >  >  > > > Android makefile build logic needs to disable
> > assembler
> >  >  > optimization
> >  >  >  > > > in 32bit builds to avoid text relocations for
> >  > libglapi.so shared
> >  >  >  > > >
> >  >  >  > > > Fixes the following build error with Android
> > x86 32bit
> >  > target:
> >  >  >  > > >
> >  >  >  > > > [  0% 4/477] target SharedLib: libglapi
> >  >  >
> >  >
> >
>  
> (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> >  >  >  > > > FAILED:
> >  >  >
> >  >
> >
>  
> out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> >  >  >  > > > ...
> >  >  >  > > >
> >  >  >
> >  >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  >  > warning: shared library text segment is not shareable
> >  >  >  > > >
> >  >  >
> >  >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  >  > error: treating warnings as errors
> >  >  >  > > > clang-6.0: error: linker command failed with
> > exit code
> >  > 1 (use
> >  >  > -v to see invocation)
> >  >  >  > > >
> >  >  >  > > > Fixes: 20294dc ("mesa: Enable asm
> > unconditionally, now
> >  > that
> >  >  > gen_matypes is gone.")
> >  >  >  > > > Signed-off-by: Mauro Rossi
> > mailto:issor.or...@gmail.com>
> >  > >
> >  >  >  >   >  >  >  >  > > > ---
> >  >  >  > > > Android.common.mk 
> > 
> >  > 
> >  >  >   | 3 +++
> >  >  >  > > >  Android.mk  | 7 +++
> >  >  >  > > >  src/mesa/Android.libmesa_dricore.mk
> > 
> >  > 
> >  >  >  | 2 ++
> >  >  >  > > >  src/mesa/Android.libmesa_st_mesa.mk
> > 
> >  > 
> >  >  >

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-14 Thread Tapani Pälli 


On 8/13/19 9:55 PM, Mauro Rossi wrote:

Hi,

On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli > wrote:



On 8/13/19 3:32 PM, Mauro Rossi wrote:
 > Hi,
 >
 > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli
mailto:tapani.pa...@intel.com>
 > >>
wrote:
 >
 >     Hi;
 >
 >     On 8/13/19 2:43 PM, Mauro Rossi wrote:
 >      > Hi Tapani,
 >      >
 >      > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
 >     mailto:issor.or...@gmail.com>
>
 >      >        >
 >      >     On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
 >     mailto:issor.or...@gmail.com>
>
 >      >     
 >           >      >
 >      >      > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
 >      >     mailto:cwhu...@android-x86.org> >
 >           wrote:
 >      >      > >
 >      >      > > Mauro Rossi mailto:issor.or...@gmail.com>
 >     >
 >      >     
 >           >      > > >
 >      >      > > > This patch partially reverts 20294dc ("mesa:
Enable asm
 >      >     unconditionally, ...")
 >      >      > > >
 >      >      > > > Android makefile build logic needs to disable
assembler
 >      >     optimization
 >      >      > > > in 32bit builds to avoid text relocations for
 >     libglapi.so shared
 >      >      > > >
 >      >      > > > Fixes the following build error with Android
x86 32bit
 >     target:
 >      >      > > >
 >      >      > > > [  0% 4/477] target SharedLib: libglapi
 >      >
 > 
  (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)

 >      >      > > > FAILED:
 >      >
 > 
  out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so

 >      >      > > > ...
 >      >      > > >
 >      >
 > 
  prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:

 >      >     warning: shared library text segment is not shareable
 >      >      > > >
 >      >
 > 
  prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:

 >      >     error: treating warnings as errors
 >      >      > > > clang-6.0: error: linker command failed with
exit code
 >     1 (use
 >      >     -v to see invocation)
 >      >      > > >
 >      >      > > > Fixes: 20294dc ("mesa: Enable asm
unconditionally, now
 >     that
 >      >     gen_matypes is gone.")
 >      >      > > > Signed-off-by: Mauro Rossi
mailto:issor.or...@gmail.com>
 >     >
 >      >            >      > > > ---
 >      >      > > > Android.common.mk 

 >     
 >      >       | 3 +++
 >      >      > > >  Android.mk                          | 7 +++
 >      >      > > >  src/mesa/Android.libmesa_dricore.mk

 >     
 >      >      | 2 ++
 >      >      > > >  src/mesa/Android.libmesa_st_mesa.mk

 >     
 >      >      | 2 ++
 >      >      > > >  4 files changed, 14 insertions(+)
 >      >      > > >
 >      >      > > > diff --git a/Android.common.mk

 >      
 >      >     b/Android.common.mk 

 >     
 >      >      > > > index 8a1c734353..209654bb75 100644
 >      >      > > > --- a/Android.common.mk

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-13 Thread Mauro Rossi 
Hi,

On Tue, Aug 13, 2019 at 3:51 PM Tapani Pälli  wrote:

>
> On 8/13/19 3:32 PM, Mauro Rossi wrote:
> > Hi,
> >
> > On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli  > > wrote:
> >
> > Hi;
> >
> > On 8/13/19 2:43 PM, Mauro Rossi wrote:
> >  > Hi Tapani,
> >  >
> >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> > mailto:issor.or...@gmail.com>
> >  > >>
> wrote:
> >  >
> >  > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
> > mailto:issor.or...@gmail.com>
> >  >  > >> wrote:
> >  >  >
> >  >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
> >  > mailto:cwhu...@android-x86.org>
> > >>
> > wrote:
> >  >  > >
> >  >  > > Mauro Rossi  > 
> >  >  > >> 於 2019年7月14日 週日 下午5:17寫道：
> >  >  > > >
> >  >  > > > This patch partially reverts 20294dc ("mesa: Enable asm
> >  > unconditionally, ...")
> >  >  > > >
> >  >  > > > Android makefile build logic needs to disable assembler
> >  > optimization
> >  >  > > > in 32bit builds to avoid text relocations for
> > libglapi.so shared
> >  >  > > >
> >  >  > > > Fixes the following build error with Android x86 32bit
> > target:
> >  >  > > >
> >  >  > > > [  0% 4/477] target SharedLib: libglapi
> >  >
> >
>  
> (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> >  >  > > > FAILED:
> >  >
> >
>  
> out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> >  >  > > > ...
> >  >  > > >
> >  >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  > warning: shared library text segment is not shareable
> >  >  > > >
> >  >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  > error: treating warnings as errors
> >  >  > > > clang-6.0: error: linker command failed with exit code
> > 1 (use
> >  > -v to see invocation)
> >  >  > > >
> >  >  > > > Fixes: 20294dc ("mesa: Enable asm unconditionally, now
> > that
> >  > gen_matypes is gone.")
> >  >  > > > Signed-off-by: Mauro Rossi  > 
> >  >  >>>
> >  >  > > > ---
> >  >  > > > Android.common.mk 
> > 
> >  >   | 3 +++
> >  >  > > >  Android.mk  | 7 +++
> >  >  > > >  src/mesa/Android.libmesa_dricore.mk
> > 
> >  >  | 2 ++
> >  >  > > >  src/mesa/Android.libmesa_st_mesa.mk
> > 
> >  >  | 2 ++
> >  >  > > >  4 files changed, 14 insertions(+)
> >  >  > > >
> >  >  > > > diff --git a/Android.common.mk
> >  
> >  > b/Android.common.mk 
> > 
> >  >  > > > index 8a1c734353..209654bb75 100644
> >  >  > > > --- a/Android.common.mk 
> > 
> >  >  > > > +++ b/Android.common.mk 
> > 
> >  >  > > > @@ -106,9 +106,12 @@ ifeq ($(shell test
> >  > $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
> >  >  > > >  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
> >  >  > > >  endif
> >  >  > > >
> >  >  > > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  >  > > >  ifeq ($(TARGET_ARCH),x86)
> >  >  > > >  LOCAL_CFLAGS += \
> >  >  > > > -DUSE_X86_ASM
> >  >  > > > +
> >  >  > > > +endif
> >  >  > > >  endif
> >  >  > > >  ifeq ($(ARCH_ARM_HAVE_NEON),true)
> >  >  > > >  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> >  >  > > > diff --git a/Android.mk b/Android.mk
> >  >  > > > index 57613eccfc..4a2a003ea3 100644
> >  >  > > > --- a/Android.mk
> >  >  > > > +++ b/Android.mk
> >  >  > > > @@ -83,6 +83,13 @@ endif
> >  >  > > >
> >  >  > > >  $(foreach d, $(MESA_BUILD_CLASSIC)
> $(MESA_BUILD_GALLIUM),
> >  > $(eval $(d) := true))
> >  >  > > >
> >  >  > > > +# host and target must be the same arch to generate
> > matypes.h
> >

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-13 Thread Tapani Pälli 


On 8/13/19 3:32 PM, Mauro Rossi wrote:

Hi,

On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli > wrote:


Hi;

On 8/13/19 2:43 PM, Mauro Rossi wrote:
 > Hi Tapani,
 >
 > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
mailto:issor.or...@gmail.com>
 > >> wrote:
 >
 >     On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi
mailto:issor.or...@gmail.com>
 >     >> wrote:
 >      >
 >      > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
 >     mailto:cwhu...@android-x86.org>
>>
wrote:
 >      > >
 >      > > Mauro Rossi mailto:issor.or...@gmail.com>
 >     >> 於 2019年7月14日 週日 下午5:17寫道：
 >      > > >
 >      > > > This patch partially reverts 20294dc ("mesa: Enable asm
 >     unconditionally, ...")
 >      > > >
 >      > > > Android makefile build logic needs to disable assembler
 >     optimization
 >      > > > in 32bit builds to avoid text relocations for
libglapi.so shared
 >      > > >
 >      > > > Fixes the following build error with Android x86 32bit
target:
 >      > > >
 >      > > > [  0% 4/477] target SharedLib: libglapi
 >   
  (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)

 >      > > > FAILED:
 >   
  out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so

 >      > > > ...
 >      > > >
 >   
  prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:

 >     warning: shared library text segment is not shareable
 >      > > >
 >   
  prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:

 >     error: treating warnings as errors
 >      > > > clang-6.0: error: linker command failed with exit code
1 (use
 >     -v to see invocation)
 >      > > >
 >      > > > Fixes: 20294dc ("mesa: Enable asm unconditionally, now
that
 >     gen_matypes is gone.")
 >      > > > Signed-off-by: Mauro Rossi mailto:issor.or...@gmail.com>
 >     >>
 >      > > > ---
 >      > > > Android.common.mk 

 >       | 3 +++
 >      > > >  Android.mk                          | 7 +++
 >      > > >  src/mesa/Android.libmesa_dricore.mk

 >      | 2 ++
 >      > > >  src/mesa/Android.libmesa_st_mesa.mk

 >      | 2 ++
 >      > > >  4 files changed, 14 insertions(+)
 >      > > >
 >      > > > diff --git a/Android.common.mk
 
 >     b/Android.common.mk 

 >      > > > index 8a1c734353..209654bb75 100644
 >      > > > --- a/Android.common.mk 

 >      > > > +++ b/Android.common.mk 

 >      > > > @@ -106,9 +106,12 @@ ifeq ($(shell test
 >     $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
 >      > > >  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
 >      > > >  endif
 >      > > >
 >      > > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 >      > > >  ifeq ($(TARGET_ARCH),x86)
 >      > > >  LOCAL_CFLAGS += \
 >      > > >         -DUSE_X86_ASM
 >      > > > +
 >      > > > +endif
 >      > > >  endif
 >      > > >  ifeq ($(ARCH_ARM_HAVE_NEON),true)
 >      > > >  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
 >      > > > diff --git a/Android.mk b/Android.mk
 >      > > > index 57613eccfc..4a2a003ea3 100644
 >      > > > --- a/Android.mk
 >      > > > +++ b/Android.mk
 >      > > > @@ -83,6 +83,13 @@ endif
 >      > > >
 >      > > >  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM),
 >     $(eval $(d) := true))
 >      > > >
 >      > > > +# host and target must be the same arch to generate
matypes.h
 >      > > > +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
 >      > > > +MESA_ENABLE_ASM := true
 >      > > > +else
 >      > > > +MESA_ENABLE_ASM := false
 >      > > > +endif
 >      > > > +
 >      > > >  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
 >      > > >  MESA_ENABLE_LLVM := true
 >      > > >  endif
 >      > > > diff --git a/src/mesa/Android.libmesa_dricore.mk

 >     
 > 

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-08-13 Thread Mauro Rossi 
Hi,

On Tue, Aug 13, 2019 at 2:03 PM Tapani Pälli  wrote:

> Hi;
>
> On 8/13/19 2:43 PM, Mauro Rossi wrote:
> > Hi Tapani,
> >
> > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi  > > wrote:
> >
> > On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi  > > wrote:
> >  >
> >  > On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang
> > mailto:cwhu...@android-x86.org>> wrote:
> >  > >
> >  > > Mauro Rossi  > > 於 2019年7月14日 週日 下午5:17寫道：
> >  > > >
> >  > > > This patch partially reverts 20294dc ("mesa: Enable asm
> > unconditionally, ...")
> >  > > >
> >  > > > Android makefile build logic needs to disable assembler
> > optimization
> >  > > > in 32bit builds to avoid text relocations for libglapi.so
> shared
> >  > > >
> >  > > > Fixes the following build error with Android x86 32bit target:
> >  > > >
> >  > > > [  0% 4/477] target SharedLib: libglapi
> >
>  
> (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> >  > > > FAILED:
> >
>  
> out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> >  > > > ...
> >  > > >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> > warning: shared library text segment is not shareable
> >  > > >
> >
>  
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> > error: treating warnings as errors
> >  > > > clang-6.0: error: linker command failed with exit code 1 (use
> > -v to see invocation)
> >  > > >
> >  > > > Fixes: 20294dc ("mesa: Enable asm unconditionally, now that
> > gen_matypes is gone.")
> >  > > > Signed-off-by: Mauro Rossi  > >
> >  > > > ---
> >  > > > Android.common.mk 
> >   | 3 +++
> >  > > >  Android.mk  | 7 +++
> >  > > >  src/mesa/Android.libmesa_dricore.mk
> >  | 2 ++
> >  > > >  src/mesa/Android.libmesa_st_mesa.mk
> >  | 2 ++
> >  > > >  4 files changed, 14 insertions(+)
> >  > > >
> >  > > > diff --git a/Android.common.mk 
> > b/Android.common.mk 
> >  > > > index 8a1c734353..209654bb75 100644
> >  > > > --- a/Android.common.mk 
> >  > > > +++ b/Android.common.mk 
> >  > > > @@ -106,9 +106,12 @@ ifeq ($(shell test
> > $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
> >  > > >  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
> >  > > >  endif
> >  > > >
> >  > > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  > > >  ifeq ($(TARGET_ARCH),x86)
> >  > > >  LOCAL_CFLAGS += \
> >  > > > -DUSE_X86_ASM
> >  > > > +
> >  > > > +endif
> >  > > >  endif
> >  > > >  ifeq ($(ARCH_ARM_HAVE_NEON),true)
> >  > > >  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> >  > > > diff --git a/Android.mk b/Android.mk
> >  > > > index 57613eccfc..4a2a003ea3 100644
> >  > > > --- a/Android.mk
> >  > > > +++ b/Android.mk
> >  > > > @@ -83,6 +83,13 @@ endif
> >  > > >
> >  > > >  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM),
> > $(eval $(d) := true))
> >  > > >
> >  > > > +# host and target must be the same arch to generate matypes.h
> >  > > > +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
> >  > > > +MESA_ENABLE_ASM := true
> >  > > > +else
> >  > > > +MESA_ENABLE_ASM := false
> >  > > > +endif
> >  > > > +
> >  > > >  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
> >  > > >  MESA_ENABLE_LLVM := true
> >  > > >  endif
> >  > > > diff --git a/src/mesa/Android.libmesa_dricore.mk
> > 
> > b/src/mesa/Android.libmesa_dricore.mk
> > 
> >  > > > index 8eb6aabe83..792117767b 100644
> >  > > > --- a/src/mesa/Android.libmesa_dricore.mk
> > 
> >  > > > +++ b/src/mesa/Android.libmesa_dricore.mk
> > 
> >  > > > @@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> >  > > >  LOCAL_SRC_FILES := \
> >  > > > $(MESA_FILES)
> >  > > >
> >  > > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  > > >  ifeq ($(TARGET_ARCH),x86)
> >  > > > LOCAL_SRC_FILES += $(X86_FILES)
> >  > > >  endif # x86
> >  > > > +endif # MESA_ENABLE_ASM
> >  > > >
> >  > > >  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
> >  > > >  LOCAL_WHOLE_STATIC_LIBRARIES := \
> >  > > > diff --git a/src/mesa/Android.libmesa_st_mesa.mk
> > 
> > b/src/mesa/Android.libmesa_st_mesa.mk
> >

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-07-27 Thread Mauro Rossi 
On Sat, Jul 27, 2019 at 2:56 PM Mauro Rossi  wrote:
>
> On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang  
> wrote:
> >
> > Mauro Rossi  於 2019年7月14日 週日 下午5:17寫道：
> > >
> > > This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, 
> > > ...")
> > >
> > > Android makefile build logic needs to disable assembler optimization
> > > in 32bit builds to avoid text relocations for libglapi.so shared
> > >
> > > Fixes the following build error with Android x86 32bit target:
> > >
> > > [  0% 4/477] target SharedLib: libglapi 
> > > (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> > > FAILED: 
> > > out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> > > ...
> > > prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> > >  warning: shared library text segment is not shareable
> > > prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> > >  error: treating warnings as errors
> > > clang-6.0: error: linker command failed with exit code 1 (use -v to see 
> > > invocation)
> > >
> > > Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes 
> > > is gone.")
> > > Signed-off-by: Mauro Rossi 
> > > ---
> > >  Android.common.mk   | 3 +++
> > >  Android.mk  | 7 +++
> > >  src/mesa/Android.libmesa_dricore.mk | 2 ++
> > >  src/mesa/Android.libmesa_st_mesa.mk | 2 ++
> > >  4 files changed, 14 insertions(+)
> > >
> > > diff --git a/Android.common.mk b/Android.common.mk
> > > index 8a1c734353..209654bb75 100644
> > > --- a/Android.common.mk
> > > +++ b/Android.common.mk
> > > @@ -106,9 +106,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && 
> > > echo true),true)
> > >  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
> > >  endif
> > >
> > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> > >  ifeq ($(TARGET_ARCH),x86)
> > >  LOCAL_CFLAGS += \
> > > -DUSE_X86_ASM
> > > +
> > > +endif
> > >  endif
> > >  ifeq ($(ARCH_ARM_HAVE_NEON),true)
> > >  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> > > diff --git a/Android.mk b/Android.mk
> > > index 57613eccfc..4a2a003ea3 100644
> > > --- a/Android.mk
> > > +++ b/Android.mk
> > > @@ -83,6 +83,13 @@ endif
> > >
> > >  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := 
> > > true))
> > >
> > > +# host and target must be the same arch to generate matypes.h
> > > +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
> > > +MESA_ENABLE_ASM := true
> > > +else
> > > +MESA_ENABLE_ASM := false
> > > +endif
> > > +
> > >  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
> > >  MESA_ENABLE_LLVM := true
> > >  endif
> > > diff --git a/src/mesa/Android.libmesa_dricore.mk 
> > > b/src/mesa/Android.libmesa_dricore.mk
> > > index 8eb6aabe83..792117767b 100644
> > > --- a/src/mesa/Android.libmesa_dricore.mk
> > > +++ b/src/mesa/Android.libmesa_dricore.mk
> > > @@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> > >  LOCAL_SRC_FILES := \
> > > $(MESA_FILES)
> > >
> > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> > >  ifeq ($(TARGET_ARCH),x86)
> > > LOCAL_SRC_FILES += $(X86_FILES)
> > >  endif # x86
> > > +endif # MESA_ENABLE_ASM
> > >
> > >  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
> > >  LOCAL_WHOLE_STATIC_LIBRARIES := \
> > > diff --git a/src/mesa/Android.libmesa_st_mesa.mk 
> > > b/src/mesa/Android.libmesa_st_mesa.mk
> > > index 16153a3c5b..ddfd03059c 100644
> > > --- a/src/mesa/Android.libmesa_st_mesa.mk
> > > +++ b/src/mesa/Android.libmesa_st_mesa.mk
> > > @@ -42,9 +42,11 @@ LOCAL_GENERATED_SOURCES := \
> > > $(MESA_GEN_GLSL_H) \
> > > $(MESA_GEN_NIR_H)
> > >
> > > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> > >  ifeq ($(TARGET_ARCH),x86)
> > > LOCAL_SRC_FILES += $(X86_FILES)
> > >  endif # x86
> > > +endif # MESA_ENABLE_ASM
> > >
> > >  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
> > >  LOCAL_WHOLE_STATIC_LIBRARIES := \
> > > --
> >
> > Looks good to me.
> >
> > Review-by: Chih-Wei Huang 
>
> Added Tapani who should one of the users of 32bit mesa,
> please provide feedback to proceed.
> Mauro

Tapani added now
M.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-07-27 Thread Mauro Rossi 
On Thu, Jul 18, 2019 at 1:07 PM Chih-Wei Huang  wrote:
>
> Mauro Rossi  於 2019年7月14日 週日 下午5:17寫道：
> >
> > This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, 
> > ...")
> >
> > Android makefile build logic needs to disable assembler optimization
> > in 32bit builds to avoid text relocations for libglapi.so shared
> >
> > Fixes the following build error with Android x86 32bit target:
> >
> > [  0% 4/477] target SharedLib: libglapi 
> > (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> > FAILED: 
> > out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> > ...
> > prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  warning: shared library text segment is not shareable
> > prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
> >  error: treating warnings as errors
> > clang-6.0: error: linker command failed with exit code 1 (use -v to see 
> > invocation)
> >
> > Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes is 
> > gone.")
> > Signed-off-by: Mauro Rossi 
> > ---
> >  Android.common.mk   | 3 +++
> >  Android.mk  | 7 +++
> >  src/mesa/Android.libmesa_dricore.mk | 2 ++
> >  src/mesa/Android.libmesa_st_mesa.mk | 2 ++
> >  4 files changed, 14 insertions(+)
> >
> > diff --git a/Android.common.mk b/Android.common.mk
> > index 8a1c734353..209654bb75 100644
> > --- a/Android.common.mk
> > +++ b/Android.common.mk
> > @@ -106,9 +106,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && 
> > echo true),true)
> >  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
> >  endif
> >
> > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  ifeq ($(TARGET_ARCH),x86)
> >  LOCAL_CFLAGS += \
> > -DUSE_X86_ASM
> > +
> > +endif
> >  endif
> >  ifeq ($(ARCH_ARM_HAVE_NEON),true)
> >  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> > diff --git a/Android.mk b/Android.mk
> > index 57613eccfc..4a2a003ea3 100644
> > --- a/Android.mk
> > +++ b/Android.mk
> > @@ -83,6 +83,13 @@ endif
> >
> >  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := 
> > true))
> >
> > +# host and target must be the same arch to generate matypes.h
> > +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
> > +MESA_ENABLE_ASM := true
> > +else
> > +MESA_ENABLE_ASM := false
> > +endif
> > +
> >  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
> >  MESA_ENABLE_LLVM := true
> >  endif
> > diff --git a/src/mesa/Android.libmesa_dricore.mk 
> > b/src/mesa/Android.libmesa_dricore.mk
> > index 8eb6aabe83..792117767b 100644
> > --- a/src/mesa/Android.libmesa_dricore.mk
> > +++ b/src/mesa/Android.libmesa_dricore.mk
> > @@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> >  LOCAL_SRC_FILES := \
> > $(MESA_FILES)
> >
> > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  ifeq ($(TARGET_ARCH),x86)
> > LOCAL_SRC_FILES += $(X86_FILES)
> >  endif # x86
> > +endif # MESA_ENABLE_ASM
> >
> >  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
> >  LOCAL_WHOLE_STATIC_LIBRARIES := \
> > diff --git a/src/mesa/Android.libmesa_st_mesa.mk 
> > b/src/mesa/Android.libmesa_st_mesa.mk
> > index 16153a3c5b..ddfd03059c 100644
> > --- a/src/mesa/Android.libmesa_st_mesa.mk
> > +++ b/src/mesa/Android.libmesa_st_mesa.mk
> > @@ -42,9 +42,11 @@ LOCAL_GENERATED_SOURCES := \
> > $(MESA_GEN_GLSL_H) \
> > $(MESA_GEN_NIR_H)
> >
> > +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
> >  ifeq ($(TARGET_ARCH),x86)
> > LOCAL_SRC_FILES += $(X86_FILES)
> >  endif # x86
> > +endif # MESA_ENABLE_ASM
> >
> >  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
> >  LOCAL_WHOLE_STATIC_LIBRARIES := \
> > --
>
> Looks good to me.
>
> Review-by: Chih-Wei Huang 

Added Tapani who should one of the users of 32bit mesa,
please provide feedback to proceed.
Mauro
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-07-18 Thread Chih-Wei Huang 
Mauro Rossi  於 2019年7月14日 週日 下午5:17寫道：
>
> This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, ...")
>
> Android makefile build logic needs to disable assembler optimization
> in 32bit builds to avoid text relocations for libglapi.so shared
>
> Fixes the following build error with Android x86 32bit target:
>
> [  0% 4/477] target SharedLib: libglapi 
> (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> FAILED: 
> out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> ...
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
>  warning: shared library text segment is not shareable
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
>  error: treating warnings as errors
> clang-6.0: error: linker command failed with exit code 1 (use -v to see 
> invocation)
>
> Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes is 
> gone.")
> Signed-off-by: Mauro Rossi 
> ---
>  Android.common.mk   | 3 +++
>  Android.mk  | 7 +++
>  src/mesa/Android.libmesa_dricore.mk | 2 ++
>  src/mesa/Android.libmesa_st_mesa.mk | 2 ++
>  4 files changed, 14 insertions(+)
>
> diff --git a/Android.common.mk b/Android.common.mk
> index 8a1c734353..209654bb75 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -106,9 +106,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && 
> echo true),true)
>  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
>  endif
>
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
>  LOCAL_CFLAGS += \
> -DUSE_X86_ASM
> +
> +endif
>  endif
>  ifeq ($(ARCH_ARM_HAVE_NEON),true)
>  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> diff --git a/Android.mk b/Android.mk
> index 57613eccfc..4a2a003ea3 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -83,6 +83,13 @@ endif
>
>  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := 
> true))
>
> +# host and target must be the same arch to generate matypes.h
> +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
> +MESA_ENABLE_ASM := true
> +else
> +MESA_ENABLE_ASM := false
> +endif
> +
>  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
>  MESA_ENABLE_LLVM := true
>  endif
> diff --git a/src/mesa/Android.libmesa_dricore.mk 
> b/src/mesa/Android.libmesa_dricore.mk
> index 8eb6aabe83..792117767b 100644
> --- a/src/mesa/Android.libmesa_dricore.mk
> +++ b/src/mesa/Android.libmesa_dricore.mk
> @@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>  LOCAL_SRC_FILES := \
> $(MESA_FILES)
>
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
> LOCAL_SRC_FILES += $(X86_FILES)
>  endif # x86
> +endif # MESA_ENABLE_ASM
>
>  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
>  LOCAL_WHOLE_STATIC_LIBRARIES := \
> diff --git a/src/mesa/Android.libmesa_st_mesa.mk 
> b/src/mesa/Android.libmesa_st_mesa.mk
> index 16153a3c5b..ddfd03059c 100644
> --- a/src/mesa/Android.libmesa_st_mesa.mk
> +++ b/src/mesa/Android.libmesa_st_mesa.mk
> @@ -42,9 +42,11 @@ LOCAL_GENERATED_SOURCES := \
> $(MESA_GEN_GLSL_H) \
> $(MESA_GEN_NIR_H)
>
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
> LOCAL_SRC_FILES += $(X86_FILES)
>  endif # x86
> +endif # MESA_ENABLE_ASM
>
>  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
>  LOCAL_WHOLE_STATIC_LIBRARIES := \
> --

Looks good to me.

Review-by: Chih-Wei Huang 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-07-14 Thread Eric Engestrom 
See also this MR which reverts the other half of that commit:
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1283

On 2019-07-14 at 11:17, Mauro Rossi  wrote:
> This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, ...")
> 
> Android makefile build logic needs to disable assembler optimization
> in 32bit builds to avoid text relocations for libglapi.so shared
> 
> Fixes the following build error with Android x86 32bit target:
> 
> [  0% 4/477] target SharedLib: libglapi 
> (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
> FAILED: 
> out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
> ...
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
>  warning: shared library text segment is not shareable
> prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
>  error: treating warnings as errors
> clang-6.0: error: linker command failed with exit code 1 (use -v to see 
> invocation)
> 
> Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes 
> is gone.")
> Signed-off-by: Mauro Rossi 
> ---
>  Android.common.mk   | 3 +++
>  Android.mk  | 7 +++
>  src/mesa/Android.libmesa_dricore.mk | 2 ++
>  src/mesa/Android.libmesa_st_mesa.mk | 2 ++
>  4 files changed, 14 insertions(+)
> 
> diff --git a/Android.common.mk b/Android.common.mk
> index 8a1c734353..209654bb75 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -106,9 +106,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 
> && echo true),true)
>  LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
>  endif
>  
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
>  LOCAL_CFLAGS += \
>   -DUSE_X86_ASM
> +
> +endif
>  endif
>  ifeq ($(ARCH_ARM_HAVE_NEON),true)
>  LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
> diff --git a/Android.mk b/Android.mk
> index 57613eccfc..4a2a003ea3 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -83,6 +83,13 @@ endif
>  
>  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := 
> true))
>  
> +# host and target must be the same arch to generate matypes.h
> +ifeq ($(TARGET_ARCH),$(HOST_ARCH))
> +MESA_ENABLE_ASM := true
> +else
> +MESA_ENABLE_ASM := false
> +endif
> +
>  ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
>  MESA_ENABLE_LLVM := true
>  endif
> diff --git a/src/mesa/Android.libmesa_dricore.mk 
> b/src/mesa/Android.libmesa_dricore.mk
> index 8eb6aabe83..792117767b 100644
> --- a/src/mesa/Android.libmesa_dricore.mk
> +++ b/src/mesa/Android.libmesa_dricore.mk
> @@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>  LOCAL_SRC_FILES := \
>   $(MESA_FILES)
>  
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
>   LOCAL_SRC_FILES += $(X86_FILES)
>  endif # x86
> +endif # MESA_ENABLE_ASM
>  
>  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
>  LOCAL_WHOLE_STATIC_LIBRARIES := \
> diff --git a/src/mesa/Android.libmesa_st_mesa.mk 
> b/src/mesa/Android.libmesa_st_mesa.mk
> index 16153a3c5b..ddfd03059c 100644
> --- a/src/mesa/Android.libmesa_st_mesa.mk
> +++ b/src/mesa/Android.libmesa_st_mesa.mk
> @@ -42,9 +42,11 @@ LOCAL_GENERATED_SOURCES := \
>   $(MESA_GEN_GLSL_H) \
>   $(MESA_GEN_NIR_H)
>  
> +ifeq ($(strip $(MESA_ENABLE_ASM)),true)
>  ifeq ($(TARGET_ARCH),x86)
>   LOCAL_SRC_FILES += $(X86_FILES)
>  endif # x86
> +endif # MESA_ENABLE_ASM
>  
>  ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
>  LOCAL_WHOLE_STATIC_LIBRARIES := \
> -- 
> 2.20.1
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] android: mesa: revert "Enable asm unconditionally"

2019-07-14 Thread Mauro Rossi 
This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, ...")

Android makefile build logic needs to disable assembler optimization
in 32bit builds to avoid text relocations for libglapi.so shared

Fixes the following build error with Android x86 32bit target:

[  0% 4/477] target SharedLib: libglapi 
(out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
FAILED: 
out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
...
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
 warning: shared library text segment is not shareable
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld:
 error: treating warnings as errors
clang-6.0: error: linker command failed with exit code 1 (use -v to see 
invocation)

Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes is 
gone.")
Signed-off-by: Mauro Rossi 
---
 Android.common.mk   | 3 +++
 Android.mk  | 7 +++
 src/mesa/Android.libmesa_dricore.mk | 2 ++
 src/mesa/Android.libmesa_st_mesa.mk | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/Android.common.mk b/Android.common.mk
index 8a1c734353..209654bb75 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -106,9 +106,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo 
true),true)
 LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
 endif
 
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-DUSE_X86_ASM
+
+endif
 endif
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
diff --git a/Android.mk b/Android.mk
index 57613eccfc..4a2a003ea3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -83,6 +83,13 @@ endif
 
 $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
 
+# host and target must be the same arch to generate matypes.h
+ifeq ($(TARGET_ARCH),$(HOST_ARCH))
+MESA_ENABLE_ASM := true
+else
+MESA_ENABLE_ASM := false
+endif
+
 ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
 MESA_ENABLE_LLVM := true
 endif
diff --git a/src/mesa/Android.libmesa_dricore.mk 
b/src/mesa/Android.libmesa_dricore.mk
index 8eb6aabe83..792117767b 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -39,9 +39,11 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_SRC_FILES := \
$(MESA_FILES)
 
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
 endif # x86
+endif # MESA_ENABLE_ASM
 
 ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
 LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/src/mesa/Android.libmesa_st_mesa.mk 
b/src/mesa/Android.libmesa_st_mesa.mk
index 16153a3c5b..ddfd03059c 100644
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -42,9 +42,11 @@ LOCAL_GENERATED_SOURCES := \
$(MESA_GEN_GLSL_H) \
$(MESA_GEN_NIR_H)
 
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
 endif # x86
+endif # MESA_ENABLE_ASM
 
 ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
 LOCAL_WHOLE_STATIC_LIBRARIES := \
-- 
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev