-
Notifications
You must be signed in to change notification settings - Fork 29.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make opensslconf.h include depending on target archs #1377
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
PERL = perl | ||
CONFIGURE = ./Configure | ||
COPT = no-shared no-symlinks | ||
|
||
ARCHS = BSD-x86 BSD-x86_64 VC-WIN32 VC-WIN64A darwin64-x86_64-cc \ | ||
darwin-i386-cc linux-armv4 linux-elf linux-x86_64 solaris-x86-gcc \ | ||
solaris64-x86_64-gcc | ||
|
||
CFG = opensslconf.h | ||
SRC_CFG = ../openssl/crypto/$(CFG) | ||
BACKUP_FILES = ../openssl/Makefile ../openssl/Makefile.bak $(SRC_CFG) | ||
BACKUP_EXT = iojsbackup | ||
|
||
# OPENSSL_CPUID_OBJ is defined in openssl.gypi for use --openssl-no-asm | ||
CPUIDFIX = 's/\#define OPENSSL_CPUID_OBJ$$//;' | ||
|
||
X32FIX = 's/\#define OPENSSL_CPUID_OBJ$$//;\ | ||
s/RC4_CHUNK unsigned long$$/RC4_CHUNK unsigned long long/;\ | ||
s/define SIXTY_FOUR_BIT_LONG$$/undef SIXTY_FOUR_BIT_LONG/;\ | ||
s/undef SIXTY_FOUR_BIT$$/define SIXTY_FOUR_BIT/;' | ||
|
||
MACFIX ='s/define RC4_INT unsigned char$$/define RC4_INT unsigned int/;' | ||
|
||
WINFIX = 'if(/ifndef OPENSSL_DOING_MAKEDEPEND$$/){\ | ||
print "\n\#ifndef OPENSSL_NO_DYNAMIC_ENGINE\n";\ | ||
print "\# define OPENSSL_NO_DYNAMIC_ENGINE\n";\ | ||
print "\#endif\n";\ | ||
print "\#ifndef OPENSSL_NO_CAPIENG\n";\ | ||
print "\# define OPENSSL_NO_CAPIENG\n";\ | ||
print "\#endif\n\n";}' | ||
|
||
PHONY = all clean backup restore | ||
.PHONY: $(PHONY) | ||
|
||
all: backup $(ARCHS) linux-x32 cleanconf fixdarwin64 fixwin restore | ||
|
||
$(ARCHS): | ||
cd ../openssl; $(PERL) $(CONFIGURE) $(COPT) $@ > /dev/null | ||
$(PERL) -p -e $(CPUIDFIX) $(SRC_CFG) > ./archs/$@/$(CFG) | ||
|
||
# linux-x32 was made by comparing define values of opensslconf.h which | ||
# was generated `Configure linux-x32' in openssl-1.0.2a | ||
linux-x32: | ||
cd ../openssl; $(PERL) $(CONFIGURE) $(COPT) linux-x86_64 > /dev/null; | ||
$(PERL) -p -e $(X32FIX) $(SRC_CFG) > ./archs/$@/$(CFG) | ||
|
||
# The current openssl release does not use RC4 asm since it explicitly | ||
# specified as `$asm=~s/rc4\-[^:]+//;` in | ||
# https://github.com/openssl/openssl/blob/OpenSSL_1_0_1-stable/Configure#L584 | ||
# But iojs has used RC4 asm on MacOS for long time. Fix type of RC4_INT | ||
# into `unsigned int` in opensslconf.h of darwin64-x86_64-cc to work on | ||
# the RC4 asm. | ||
fixdarwin64: | ||
$(PERL) -pi -e $(MACFIX) ./archs/darwin64-x86_64-cc/$(CFG) | ||
|
||
|
||
# OPENSSL_NO_DYNAMIC_ENGINE is needed for building static | ||
# library. OPENSSL_NO_CAPIENG is needed to avoid build errors on | ||
# Win. See the comments in `deps/openssl/openssl/engines/e_capi.c` for | ||
# detail. | ||
fixwin: | ||
$(PERL) -pi -e $(WINFIX) ./archs/VC-WIN32/$(CFG) ./archs/VC-WIN64A/$(CFG) | ||
|
||
# backup files to avoid to be overwritten | ||
backup: | ||
@for f in $(BACKUP_FILES); do \ | ||
mv $$f $$f.$(BACKUP_EXT); \ | ||
done | ||
|
||
restore: | ||
@for f in $(BACKUP_FILES); do \ | ||
mv $$f.$(BACKUP_EXT) $$f ; \ | ||
done | ||
|
||
# remove unnecessary files create by Configure | ||
cleanconf: | ||
@rm ../openssl/crypto/$(CFG) | ||
@rm ../openssl/Makefile | ||
@rm ../openssl/apps/CA.pl.bak | ||
@rm ../openssl/crypto/buildinf.h | ||
@rm ../openssl/crypto/$(CFG).bak | ||
@rm ../openssl/ms/version32.rc | ||
@rm ../openssl/tools/c_rehash.bak | ||
|
||
clean: | ||
find archs -name $(CFG) -exec rm "{}" \; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,246 @@ | ||
/* opensslconf.h */ | ||
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */ | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
/* OpenSSL was configured with the following options: */ | ||
#ifndef OPENSSL_DOING_MAKEDEPEND | ||
|
||
|
||
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
# define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
#endif | ||
#ifndef OPENSSL_NO_GMP | ||
# define OPENSSL_NO_GMP | ||
#endif | ||
#ifndef OPENSSL_NO_JPAKE | ||
# define OPENSSL_NO_JPAKE | ||
#endif | ||
#ifndef OPENSSL_NO_KRB5 | ||
# define OPENSSL_NO_KRB5 | ||
#endif | ||
#ifndef OPENSSL_NO_MD2 | ||
# define OPENSSL_NO_MD2 | ||
#endif | ||
#ifndef OPENSSL_NO_RC5 | ||
# define OPENSSL_NO_RC5 | ||
#endif | ||
#ifndef OPENSSL_NO_RFC3779 | ||
# define OPENSSL_NO_RFC3779 | ||
#endif | ||
#ifndef OPENSSL_NO_SCTP | ||
# define OPENSSL_NO_SCTP | ||
#endif | ||
#ifndef OPENSSL_NO_STORE | ||
# define OPENSSL_NO_STORE | ||
#endif | ||
#ifndef OPENSSL_NO_UNIT_TEST | ||
# define OPENSSL_NO_UNIT_TEST | ||
#endif | ||
|
||
#endif /* OPENSSL_DOING_MAKEDEPEND */ | ||
|
||
#ifndef OPENSSL_THREADS | ||
# define OPENSSL_THREADS | ||
#endif | ||
#ifndef OPENSSL_NO_DYNAMIC_ENGINE | ||
# define OPENSSL_NO_DYNAMIC_ENGINE | ||
#endif | ||
|
||
/* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
asks for it. This is a transient feature that is provided for those | ||
who haven't had the time to do the appropriate changes in their | ||
applications. */ | ||
#ifdef OPENSSL_ALGORITHM_DEFINES | ||
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
# define NO_EC_NISTP_64_GCC_128 | ||
# endif | ||
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
# define NO_GMP | ||
# endif | ||
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
# define NO_JPAKE | ||
# endif | ||
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
# define NO_KRB5 | ||
# endif | ||
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
# define NO_MD2 | ||
# endif | ||
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
# define NO_RC5 | ||
# endif | ||
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
# define NO_RFC3779 | ||
# endif | ||
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
# define NO_SCTP | ||
# endif | ||
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
# define NO_STORE | ||
# endif | ||
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) | ||
# define NO_UNIT_TEST | ||
# endif | ||
#endif | ||
|
||
|
||
|
||
/* crypto/opensslconf.h.in */ | ||
|
||
/* Generate 80386 code? */ | ||
#undef I386_ONLY | ||
|
||
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ | ||
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | ||
#define ENGINESDIR "/usr/local/ssl/lib/engines" | ||
#define OPENSSLDIR "/usr/local/ssl" | ||
#endif | ||
#endif | ||
|
||
#undef OPENSSL_UNISTD | ||
#define OPENSSL_UNISTD <unistd.h> | ||
|
||
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION | ||
|
||
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
#define IDEA_INT unsigned int | ||
#endif | ||
|
||
#if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
#define MD2_INT unsigned int | ||
#endif | ||
|
||
#if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
/* I need to put in a mod for the alpha - eay */ | ||
#define RC2_INT unsigned int | ||
#endif | ||
|
||
#if defined(HEADER_RC4_H) | ||
#if !defined(RC4_INT) | ||
/* using int types make the structure larger but make the code faster | ||
* on most boxes I have tested - up to %20 faster. */ | ||
/* | ||
* I don't know what does "most" mean, but declaring "int" is a must on: | ||
* - Intel P6 because partial register stalls are very expensive; | ||
* - elder Alpha because it lacks byte load/store instructions; | ||
*/ | ||
#define RC4_INT unsigned int | ||
#endif | ||
#if !defined(RC4_CHUNK) | ||
/* | ||
* This enables code handling data aligned at natural CPU word | ||
* boundary. See crypto/rc4/rc4_enc.c for further details. | ||
*/ | ||
#undef RC4_CHUNK | ||
#endif | ||
#endif | ||
|
||
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
* %20 speed up (longs are 8 bytes, int's are 4). */ | ||
#ifndef DES_LONG | ||
#define DES_LONG unsigned long | ||
#endif | ||
#endif | ||
|
||
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
#define CONFIG_HEADER_BN_H | ||
#define BN_LLONG | ||
|
||
/* Should we define BN_DIV2W here? */ | ||
|
||
/* Only one for the following should be defined */ | ||
#undef SIXTY_FOUR_BIT_LONG | ||
#undef SIXTY_FOUR_BIT | ||
#define THIRTY_TWO_BIT | ||
#endif | ||
|
||
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) | ||
#define CONFIG_HEADER_RC4_LOCL_H | ||
/* if this is defined data[i] is used instead of *data, this is a %20 | ||
* speedup on x86 */ | ||
#define RC4_INDEX | ||
#endif | ||
|
||
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
#define CONFIG_HEADER_BF_LOCL_H | ||
#undef BF_PTR | ||
#endif /* HEADER_BF_LOCL_H */ | ||
|
||
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
#define CONFIG_HEADER_DES_LOCL_H | ||
#ifndef DES_DEFAULT_OPTIONS | ||
/* the following is tweaked from a config script, that is why it is a | ||
* protected undef/define */ | ||
#ifndef DES_PTR | ||
#define DES_PTR | ||
#endif | ||
|
||
/* This helps C compiler generate the correct code for multiple functional | ||
* units. It reduces register dependancies at the expense of 2 more | ||
* registers */ | ||
#ifndef DES_RISC1 | ||
#define DES_RISC1 | ||
#endif | ||
|
||
#ifndef DES_RISC2 | ||
#undef DES_RISC2 | ||
#endif | ||
|
||
#if defined(DES_RISC1) && defined(DES_RISC2) | ||
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
#endif | ||
|
||
/* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
* Very mucy CPU dependant */ | ||
#ifndef DES_UNROLL | ||
#define DES_UNROLL | ||
#endif | ||
|
||
/* These default values were supplied by | ||
* Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
* They are only used if nothing else has been defined */ | ||
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
/* Special defines which change the way the code is built depending on the | ||
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
even newer MIPS CPU's, but at the moment one size fits all for | ||
optimization options. Older Sparc's work better with only UNROLL, but | ||
there's no way to tell at compile time what it is you're running on */ | ||
|
||
#if defined( sun ) /* Newer Sparc's */ | ||
# define DES_PTR | ||
# define DES_RISC1 | ||
# define DES_UNROLL | ||
#elif defined( __ultrix ) /* Older MIPS */ | ||
# define DES_PTR | ||
# define DES_RISC2 | ||
# define DES_UNROLL | ||
#elif defined( __osf1__ ) /* Alpha */ | ||
# define DES_PTR | ||
# define DES_RISC2 | ||
#elif defined ( _AIX ) /* RS6000 */ | ||
/* Unknown */ | ||
#elif defined( __hpux ) /* HP-PA */ | ||
/* Unknown */ | ||
#elif defined( __aux ) /* 68K */ | ||
/* Unknown */ | ||
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
# define DES_UNROLL | ||
#elif defined( __sgi ) /* Newer MIPS */ | ||
# define DES_PTR | ||
# define DES_RISC2 | ||
# define DES_UNROLL | ||
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
# define DES_PTR | ||
# define DES_RISC1 | ||
# define DES_UNROLL | ||
#endif /* Systems-specific speed defines */ | ||
#endif | ||
|
||
#endif /* DES_DEFAULT_OPTIONS */ | ||
#endif /* HEADER_DES_LOCL_H */ | ||
#ifdef __cplusplus | ||
} | ||
#endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't ARCHS (ARCS) be PHONY as well?
EDIT: And linux-32, fixdarwin64, fixwin and cleanconf.