diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-02 09:34:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 14:45:02 +0100 |
| commit | b756967d28f2ee726d947ca7a6e1075df616b300 (patch) | |
| tree | 5badb5e0012ebc534e8b2c900dd7ee3ef5af6429 /crypto | |
| parent | dc22d6b37e8058a4334e6f98932c2623cd3d8d0d (diff) | |
Make uplink auxiliary source separate from cpuid source
There are cases, for example when configuring no-asm, that the added
uplink source files got in the way of the cpuid ones. The best way to
solve this is to separate the two.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.in | 3 | ||||
| -rw-r--r-- | crypto/build.info | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/Makefile.in b/crypto/Makefile.in index c29d44c7d3..9e407df3d0 100644 --- a/crypto/Makefile.in +++ b/crypto/Makefile.in @@ -25,6 +25,7 @@ CFLAGS= $(INCLUDE) $(CFLAG) $(SHARED_CFLAG) ASFLAGS= $(INCLUDE) $(ASFLAG) AFLAGS=$(ASFLAGS) CPUID_OBJ=mem_clr.o +UPLINK_OBJ= LIBS= @@ -39,7 +40,7 @@ LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o \ threads_pthread.o threads_win.o threads_none.o \ - o_init.o o_fips.o mem_sec.o init.o $(CPUID_OBJ) + o_init.o o_fips.o mem_sec.o init.o $(CPUID_OBJ) $(UPLINK_OBJ) SRC= $(LIBSRC) diff --git a/crypto/build.info b/crypto/build.info index 24a009a475..471a9fd2f8 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -4,7 +4,8 @@ SOURCE[../libcrypto]=\ cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c \ threads_pthread.c threads_win.c threads_none.c \ - o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} + o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} \ + {- $target{uplink_aux_src} -} EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ x86cpuid.pl x86_64cpuid.pl ia64cpuid.S \ ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl |