Skip to content

Comments

Move asm source file specifications to their respective build.info#9166

Closed
levitte wants to merge 24 commits intoopenssl:masterfrom
levitte:move-asm-source-specs
Closed

Move asm source file specifications to their respective build.info#9166
levitte wants to merge 24 commits intoopenssl:masterfrom
levitte:move-asm-source-specs

Conversation

@levitte
Copy link
Member

@levitte levitte commented Jun 16, 2019

Now that we have variables in build.info files, it's easier to specify CPU architecture specific files to be compiled conditionally. There are a few minor adjustments needed to variable processing (i.e. the ability to use variables in conditions, and to expand variable in values for variables.

This way, we have all source files consistently presented in the build.info files they belong with, so we don't have some information in Configurations/00-base-templates.conf (or Configurations/10-main.conf for c64xplus), some in Configure but their generators in the respective build.info files.

@levitte levitte added the branch: master Applies to master branch label Jun 16, 2019
@levitte levitte requested a review from mattcaswell June 16, 2019 21:13
@levitte
Copy link
Member Author

levitte commented Jun 16, 2019

This looks massive if you look at all changes at the same time. I recommend looking at this a commit at a time.

@levitte
Copy link
Member Author

levitte commented Jun 16, 2019

@MouriNaruto, you may be interested in this, as it solves the problem with having uplink and asm in the UWP disable config attribute.

(asm is still not ideal, but worth testing for the sake of this PR)

@richsalz
Copy link
Contributor

That was big but fairly straightforward to understand. Nice job cleaning this up!

@levitte levitte force-pushed the move-asm-source-specs branch 2 times, most recently from 98b5948 to b464a09 Compare June 17, 2019 04:39
@levitte
Copy link
Member Author

levitte commented Jun 17, 2019

Some of the Travis failure are not relevant for this PR. Fixing PR is:

#9168

(more may come)

@levitte levitte force-pushed the move-asm-source-specs branch 3 times, most recently from 99ec5a5 to 2b8d086 Compare June 17, 2019 09:17
@levitte
Copy link
Member Author

levitte commented Jun 17, 2019

CIs are happy, and with #9169#9164, so is the s390x build.

levitte added 13 commits June 17, 2019 11:58
…rences

This will allow building variables on other variables, and to have
conditions based on variable contents.
As preparation for moving uplink file specs to build.info files, we
must make sure there is still some base information to help select the
correct files.
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from.  With build.info variables, the task became much easier.

We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.
As preparation for moving asm file specs to build.info files, we must
make sure there is still some base information to help select the
correct files.
Also took away the internal 'debug-linux-ia32-aes' config target, as
it's broken (refers to files that no longer exist).

- UWP targets only support building the static and dynamic libraries.

- The "no-uplink" must be given in the "Configure" script.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed the bit where you disable uplink for UWP. Where is it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's actually already in place:

disable => [ 'ui-console', 'stdio', 'async', 'uplink' ],

disable => [ 'ui-console', 'stdio', 'async', 'uplink' ],

disable => [ 'ui-console', 'stdio', 'async', 'uplink' ],

disable => [ 'ui-console', 'stdio', 'async', 'uplink' ],

So I really didn't have to do anything with that, just ensure that it actually works.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Ok!

Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks a lot nicer.

@levitte
Copy link
Member Author

levitte commented Jun 17, 2019

Merged.

30478c9 Configure: final cleanup of asm related things
3a561b0 Move padlock_asm_src file information to build.info files
8c0098a Move keccak1600_asm_src file information to build.info files
246b506 Move poly1305_asm_src file information to build.info files
bcb7afe Move chacha_asm_src file information to build.info files
a9bb7e9 Move modes_asm_src file information to build.info files
94707b0 Move cmll_asm_src file information to build.info files
681c7e9 Move wp_asm_src file information to build.info files
6fe56d8 Move rc5_asm_src file information to build.info files
2ffea44 Move rmd160_asm_src file information to build.info files
6b90902 Move rc4_asm_src file information to build.info files
e698cfe Move cast_asm_src file information to build.info files
edc7851 Move sha1_asm_src file information to build.info files
792ea00 Move md5_asm_src file information to build.info files
053d0b2 Move bf_asm_src file information to build.info files
cd42b9e Move aes_asm_src file information to build.info files
d67d04f Move des_asm_src file information to build.info files
aa76ff2 Move ec_asm_src file information to build.info files
6e1ba47 Move cpuid_asm_src file information to build.info files
d9dfeb9 Move bn_asm_src file information to build.info files
e6f98ae Configure: add mechanism to specify asm target architecture
989b2ad Move uplink file information to build.info files
b19fe71 Configure: add mechanism to specify uplink target architecture
0ee7b9f Configure: allow conditions and variable values to have variable references

@levitte levitte closed this Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
…rences

This will allow building variables on other variables, and to have
conditions based on variable contents.

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
levitte added a commit that referenced this pull request Jun 17, 2019
As preparation for moving uplink file specs to build.info files, we
must make sure there is still some base information to help select the
correct files.

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
levitte added a commit that referenced this pull request Jun 17, 2019
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from.  With build.info variables, the task became much easier.

We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
levitte added a commit that referenced this pull request Jun 17, 2019
As preparation for moving asm file specs to build.info files, we must
make sure there is still some base information to help select the
correct files.

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
Also took away the internal 'debug-linux-ia32-aes' config target, as
it's broken (refers to files that no longer exist).

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
levitte added a commit that referenced this pull request Jun 17, 2019
Remove the *_asm templates in Configurations/00-base-templates.conf,
all attempts to inherit them, and the asm() perl function.

[extended tests]

Reviewed-by: Matt Caswell <[email protected]>
(Merged from #9166)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants