History

configure: pass CONFIG_xxxDIR/PATH options via commandline

- except for CONFIG_SYSROOT and CONFIG_TCCDIR Strictly neccessary it is only for CONFIG_MULTIARCHDIR because otherwise if it's in config.h it is impossible to leave it undefined. But it is also nicer not to use these definitions for cross-compilers. - Also: lib/Makefile : include ../Makefile for CFLAGS lib/libtcc1.c : fix an issue compiling tcc with tcc on x64

grischka committed 13 years ago

Commit 762a4381 parent 99b801d6 files · +30 −38Browse files

Showing the changes to lib (2 of 6 files). Show all

Unified · Split

2 files
  1. lib/Makefile +2 −2
  2. lib/libtcc1.c +6 −1
lib/Makefile+2−2
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #
44
55 TOP = ..
6−include $(TOP)/config.mak
6+include $(TOP)/Makefile
77 VPATH = $(top_srcdir)/lib $(top_srcdir)/win32/lib
88
99 ifndef TARGET
@@ -91,7 +91,7 @@ $(DIR)/%.o : %.c · 81 unmodified lines
9191 $(DIR)/%.o : %.S
9292 $(XCC) -c $< -o $@ $(XFLAGS)
9393 $(DIR)/%$(EXESUF) : $(TOP)/win32/tools/%.c
94− $(CC) -Os -s -o $@ $< $(XFLAGS) $(LDFLAGS)
94+ $(CC) -o $@ $< $(XFLAGS) $(LDFLAGS)
9595
9696 $(OBJ) $(XAR) : $(DIR)/exists
9797 $(DIR)/exists :
lib/libtcc1.c+6−1
@@ -609,8 +609,11 @@ unsigned long long __fixunsxfdi (long double a1) · 608 unmodified lines
609609
610610 /* helper functions for stdarg.h */
611611
612−#include <stdio.h>
613612 #include <stdlib.h>
613+#ifndef __TINYC__
614+/* gives "incompatible types for redefinition of __va_arg" below */
615+#include <stdio.h>
616+#endif
614617
615618 enum __va_arg_type {
616619 __va_gen_reg, __va_float_reg, __va_stack
@@ -665,7 +668,9 @@ void *__va_arg(struct __va_list_struct *ap, · 48 unmodified lines
665668 return ap->overflow_arg_area - size;
666669
667670 default:
671+#ifndef __TINYC__
668672 fprintf(stderr, "unknown ABI type for __va_arg\n");
673+#endif
669674 abort();
670675 }
671676 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t