aboutsummaryrefslogtreecommitdiff
path: root/emulators/tpm-emulator
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-08-18 23:24:55 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-08-18 23:24:55 +0000
commit043e647c78edee405bd07aa3d24e8fdd618058a5 (patch)
tree81c08a727dc4dfc69ccba5dcaf7c1b116f8fbba0 /emulators/tpm-emulator
parent7671dd5ccb2e735ec6bf154e8ac29fd98ae1483a (diff)
downloadports-043e647c78edee405bd07aa3d24e8fdd618058a5.tar.gz
ports-043e647c78edee405bd07aa3d24e8fdd618058a5.zip
emulators/tpm-emulator: Fix -fno-common
Fix the build with -fno-common, which is the default in llvm 11. MFH: 2020Q3
Notes
Notes: svn path=/head/; revision=545265
Diffstat (limited to 'emulators/tpm-emulator')
-rw-r--r--emulators/tpm-emulator/files/patch-tpm_tpm__emulator__extern.h47
1 files changed, 47 insertions, 0 deletions
diff --git a/emulators/tpm-emulator/files/patch-tpm_tpm__emulator__extern.h b/emulators/tpm-emulator/files/patch-tpm_tpm__emulator__extern.h
new file mode 100644
index 000000000000..dee707421f24
--- /dev/null
+++ b/emulators/tpm-emulator/files/patch-tpm_tpm__emulator__extern.h
@@ -0,0 +1,47 @@
+--- tpm/tpm_emulator_extern.h.orig 2020-08-18 22:10:53 UTC
++++ tpm/tpm_emulator_extern.h
+@@ -29,7 +29,7 @@ enum {
+ TPM_LOG_ERROR
+ };
+
+-void (*tpm_log)(int priority, const char *fmt, ...);
++extern void (*tpm_log)(int priority, const char *fmt, ...);
+
+ #if defined(_WIN32) || defined(_WIN64)
+ #define __BFILE__ ((strrchr(__FILE__, '\\') ? : __FILE__ - 1) + 1)
+@@ -44,27 +44,27 @@ void (*tpm_log)(int priority, const char *fmt, ...);
+ #define error(fmt, ...) tpm_log(TPM_LOG_ERROR, "%s:%d: Error: " fmt "\n", \
+ __BFILE__, __LINE__, ## __VA_ARGS__)
+ /* initialization */
+-int (*tpm_extern_init)(void);
+-void (*tpm_extern_release)(void);
++extern int (*tpm_extern_init)(void);
++extern void (*tpm_extern_release)(void);
+
+ /* memory allocation */
+
+-void* (*tpm_malloc)(size_t size);
++extern void* (*tpm_malloc)(size_t size);
+
+-void (*tpm_free)(/*const*/ void *ptr);
++extern void (*tpm_free)(/*const*/ void *ptr);
+
+ /* random numbers */
+
+-void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes);
++extern void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes);
+
+ /* usec since last call */
+
+-uint64_t (*tpm_get_ticks)(void);
++extern uint64_t (*tpm_get_ticks)(void);
+
+ /* file handling */
+
+-int (*tpm_write_to_storage)(uint8_t *data, size_t data_length);
+-int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length);
++extern int (*tpm_write_to_storage)(uint8_t *data, size_t data_length);
++extern int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length);
+
+ #endif /* _TPM_EMULATOR_EXTERN_H_ */
+