* Makefile.in: Use ${nostdlib} variable.

* fhandler_proc.cc (format_proc_cpuinfo): Change /proc/cpuinfo "vendor id"
string to "vendor_id" to conform with Linux systems.
This commit is contained in:
Christopher Faylor 2003-04-19 01:03:16 +00:00
parent b128dd21af
commit 4e0d877875
3 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,12 @@
2003-04-18 Christopher Faylor <cgf@redhat.com>
* Makefile.in: Use ${nostdlib} variable.
2003-04-18 Diego Biurrun <diego@biurrun.de>
* fhandler_proc.cc (format_proc_cpuinfo): Change /proc/cpuinfo "vendor
id" string to "vendor_id" to conform with Linux systems.
2003-04-17 Christopher Faylor <cgf@redhat.com> 2003-04-17 Christopher Faylor <cgf@redhat.com>
* syscalls.cc (setsid): Don't call FreeConsole if ctty is already < 0. * syscalls.cc (setsid): Don't call FreeConsole if ctty is already < 0.

View File

@ -340,7 +340,7 @@ maintainer-clean realclean: clean
# Rule to build cygwin.dll # Rule to build cygwin.dll
$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
$(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ $(CXX) $(CXXFLAGS) $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
$(MALLOC_OBJ) $(LIBM) $(LIBC) \ $(MALLOC_OBJ) $(LIBM) $(LIBC) \
-lgcc $(DLL_IMPORTS) -lgcc $(DLL_IMPORTS)

View File

@ -606,7 +606,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
{ {
bufptr += __small_sprintf (bufptr, "processor : %d\n", cpu_number); bufptr += __small_sprintf (bufptr, "processor : %d\n", cpu_number);
read_value ("VendorIdentifier", REG_SZ); read_value ("VendorIdentifier", REG_SZ);
bufptr += __small_sprintf (bufptr, "vendor id : %s\n", szBuffer); bufptr += __small_sprintf (bufptr, "vendor_id : %s\n", szBuffer);
read_value ("Identifier", REG_SZ); read_value ("Identifier", REG_SZ);
bufptr += __small_sprintf (bufptr, "identifier : %s\n", szBuffer); bufptr += __small_sprintf (bufptr, "identifier : %s\n", szBuffer);
if (wincap.is_winnt ()) if (wincap.is_winnt ())
@ -640,7 +640,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0); cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0);
maxf &= 0xffff; maxf &= 0xffff;
vendor_id[3] = 0; vendor_id[3] = 0;
bufptr += __small_sprintf (bufptr, "vendor id : %s\n", (char *)vendor_id); bufptr += __small_sprintf (bufptr, "vendor_id : %s\n", (char *)vendor_id);
unsigned cpu_mhz = 0; unsigned cpu_mhz = 0;
if (wincap.is_winnt ()) if (wincap.is_winnt ())
{ {